From 82a5da61df9879799c1dfa056da35ae95ac1af70 Mon Sep 17 00:00:00 2001 From: Felix Michels Date: Wed, 19 Oct 2016 15:44:24 +0200 Subject: Use the navigator's language properties even if a user exists but the user has not yet choosen a profile language. If the browser provides multiple preferred languages via `navigator.languages`, select the most-preferred one. WKN-47 --- client/lib/i18n.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client/lib/i18n.js b/client/lib/i18n.js index a03fb398..e49a0001 100644 --- a/client/lib/i18n.js +++ b/client/lib/i18n.js @@ -7,8 +7,14 @@ Tracker.autorun(() => { let language; if (currentUser) { language = currentUser.profile && currentUser.profile.language; - } else { - language = navigator.language || navigator.userLanguage; + } + + if (!language) { + if(navigator.languages) { + language = navigator.languages[0]; + } else { + language = navigator.language || navigator.userLanguage; + } } if (language) { -- cgit v1.2.3-1-g7c22