Dependency updates. Implemented en kiosk.json translations. Updated locale middleware config. Implemented translations within kiosk.ejs

This commit is contained in:
Glenn de Haan
2025-05-09 17:32:25 +02:00
parent bfb2802269
commit 25d429a22b
5 changed files with 155 additions and 109 deletions

View File

@@ -21,6 +21,7 @@ const print = require('./modules/print');
const mail = require('./modules/mail');
const oidc = require('./modules/oidc');
const qr = require('./modules/qr');
const translation = require('./modules/translation');
/**
* Import own middlewares
@@ -99,14 +100,6 @@ if(!variables.authDisabled && variables.authOidcEnabled) {
oidc.init(app);
}
/**
* Enable locale
*/
app.use(locale({
"priority": ["accept-language", "default"],
"default": "en-GB"
}));
/**
* Enable JSON
*/
@@ -122,6 +115,14 @@ app.use(multer().none());
*/
app.use(cookieParser());
/**
* Enable locale
*/
app.use(locale({
'priority': ['query', 'accept-language', 'default'],
'default': 'en-GB'
}));
/**
* Enable flash-message
*/
@@ -148,6 +149,9 @@ if(variables.serviceWeb) {
}
res.render('kiosk', {
t: translation('kiosk', req.locale.language),
languages,
language: req.locale.language,
baseUrl: req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : '',
error: req.flashMessage.type === 'error',
error_text: req.flashMessage.message || ''
@@ -180,6 +184,9 @@ if(variables.serviceWeb) {
if(emailResult) {
res.render('kiosk', {
t: translation('kiosk', req.locale.language),
languages,
language: req.locale.language,
baseUrl: req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : '',
error: req.flashMessage.type === 'error',
error_text: req.flashMessage.message || '',
@@ -225,6 +232,9 @@ if(variables.serviceWeb) {
}
res.render('kiosk', {
t: translation('kiosk', req.locale.language),
languages,
language: req.locale.language,
baseUrl: req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : '',
error: req.flashMessage.type === 'error',
error_text: req.flashMessage.message || '',