krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(language): prefer session data over request data"

Browse Source 
This reverts commit 86d6580ffb.
This commit is contained in:
SabreCat
2021-11-17 10:46:46 -06:00
parent 79033af36e
commit b943f4bc7f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/server/middlewares/language.js
View File

@@ -19,6 +19,12 @@ export function attachTranslateFunction (req, res, next) {
} }
export function getUserLanguage (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 the request is authenticated, use the user's preferred language
if (res.locals && res.locals.user) { if (res.locals && res.locals.user) {
req.language = getLanguageFromUser(res.locals.user, req); req.language = getLanguageFromUser(res.locals.user, req);
@@ -39,12 +45,6 @@ export function getUserLanguage (req, res, next) {
.catch(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 // Otherwise get from browser
req.language = getLanguageFromBrowser(req); req.language = getLanguageFromBrowser(req);
return next(); return next();