Bläddra i källkod

Merge branch 'navigator-preferred-language' of https://github.com/umbertooo/wekan into umbertooo-navigator-preferred-language

Lauri Ojansivu 8 år sedan
förälder
incheckning
3ce4615975
1 ändrade filer med 10 tillägg och 4 borttagningar
  1. 10 4
      client/lib/i18n.js

+ 10 - 4
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) {