浏览代码

FIX - ForceLanguage when !navigator

Yannik 6 年之前
父节点
当前提交
42cee81cea
共有 1 个文件被更改,包括 8 次插入6 次删除
  1. 8 6
      tarteaucitron.js

+ 8 - 6
tarteaucitron.js

@@ -1236,19 +1236,21 @@ var tarteaucitron = {
     },
     },
     "getLanguage": function () {
     "getLanguage": function () {
         "use strict";
         "use strict";
-        if (!navigator) { return 'en'; }
 
 
         var availableLanguages = 'cs,en,fr,es,it,de,nl,pt,pl,ru,el',
         var availableLanguages = 'cs,en,fr,es,it,de,nl,pt,pl,ru,el',
-            defaultLanguage = 'en',
-            lang = navigator.language || navigator.browserLanguage ||
-                navigator.systemLanguage || navigator.userLang || null,
-            userLanguage = lang ? lang.substr(0, 2) : null;
-
+            defaultLanguage = 'en';
+        
         if (tarteaucitronForceLanguage !== '') {
         if (tarteaucitronForceLanguage !== '') {
             if (availableLanguages.indexOf(tarteaucitronForceLanguage) !== -1) {
             if (availableLanguages.indexOf(tarteaucitronForceLanguage) !== -1) {
                 return tarteaucitronForceLanguage;
                 return tarteaucitronForceLanguage;
             }
             }
         }
         }
+        
+        if (!navigator) { return 'en'; }
+        
+        var lang = navigator.language || navigator.browserLanguage ||
+                navigator.systemLanguage || navigator.userLang || null,
+            userLanguage = lang ? lang.substr(0, 2) : null;
 
 
         if (availableLanguages.indexOf(userLanguage) === -1) {
         if (availableLanguages.indexOf(userLanguage) === -1) {
             return defaultLanguage;
             return defaultLanguage;