diff --git a/website/server/middlewares/language.js b/website/server/middlewares/language.js index bb9bbacb0e..bef28a75dc 100644 --- a/website/server/middlewares/language.js +++ b/website/server/middlewares/language.js @@ -19,12 +19,6 @@ export function attachTranslateFunction (req, res, next) { } export function getUserLanguage (req, res, next) { - // In case the language is specified in the request url, use intersection - if (req.query.lang) { - req.language = translations[req.query.lang] ? req.query.lang : 'en'; - return next(); - } - // If the request is authenticated, use the user's preferred language if (res.locals && res.locals.user) { req.language = getLanguageFromUser(res.locals.user, req); @@ -45,6 +39,12 @@ export function getUserLanguage (req, res, next) { .catch(next); } + // In case the language is specified in the request url, use intersection + if (req.query.lang) { + req.language = translations[req.query.lang] ? req.query.lang : 'en'; + return next(); + } + // Otherwise get from browser req.language = getLanguageFromBrowser(req); return next();