diff --git a/src/middleware.js b/src/middleware.js index cce035bc14..30e95ca5c6 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -197,7 +197,6 @@ var getUserLanguage = function(req, callback){ var acceptable = _(req.acceptedLanguages).map(function(lang){ return lang.slice(0, 2); }).uniq().value(); - var matches = _.intersection(acceptable, langCodes); return matches.length > 0 ? matches[0] : 'en'; }; @@ -209,10 +208,13 @@ var getUserLanguage = function(req, callback){ return callback(null, _.find(avalaibleLanguages, {code: user.preferences.language})); }else{ var langCode = getFromBrowser(); - if(user && translations[langCode]){ - user.preferences.language = langCode; - user.save(); //callback? - } + // Because english is usually always avalaible as an acceptable language for the browser, + // if the user visit the page when his own language is not avalaible yet + // he'll have english set in his preferences, which is not good. + //if(user && translations[langCode]){ + //user.preferences.language = langCode; + //user.save(); //callback? + //} return callback(null, _.find(avalaibleLanguages, {code: langCode})) } });