diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-03-30 08:14:05 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-03-30 08:14:05 +0300 |
| commit | ee06948074a0a50bd00cedf3969a5a80064e46d5 (patch) | |
| tree | 0f600d207c1d476755bff737fdb3c253982e396e | |
| parent | 9d95a7ed4d103804b916326039a4d94bd0041c9d (diff) | |
| parent | 3ce46159750ea41f0ca689afd340bbfde6f698e9 (diff) | |
| download | wekan-ee06948074a0a50bd00cedf3969a5a80064e46d5.tar.gz wekan-ee06948074a0a50bd00cedf3969a5a80064e46d5.tar.bz2 wekan-ee06948074a0a50bd00cedf3969a5a80064e46d5.zip | |
Merge branch 'umbertooo-navigator-preferred-language' into devel
| -rw-r--r-- | client/lib/i18n.js | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/client/lib/i18n.js b/client/lib/i18n.js index 34a789e1..4c02211a 100644 --- a/client/lib/i18n.js +++ b/client/lib/i18n.js @@ -6,10 +6,16 @@ Meteor.startup(() => { Tracker.autorun(() => { const currentUser = Meteor.user(); let language; - if (currentUser && currentUser.profile && currentUser.profile.language) { - language = currentUser.profile.language; - } else { - language = navigator.language || navigator.userLanguage; + if (currentUser) { + language = currentUser.profile && currentUser.profile.language; + } + + if (!language) { + if(navigator.languages) { + language = navigator.languages[0]; + } else { + language = navigator.language || navigator.userLanguage; + } } if (language) { |