diff options
Diffstat (limited to 'web/load.js')
| -rw-r--r-- | web/load.js | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/web/load.js b/web/load.js index c84a4a3..cd012f1 100644 --- a/web/load.js +++ b/web/load.js @@ -78,26 +78,17 @@ localeParameter = window.location.search.match(/locale=([^&#]+)/); locale.language = localeParameter && localeParameter[1]; if (!(locale.language in locale.languages)) { - if (window.navigator.languages !== undefined) { - for (var i = 0; i < window.navigator.languages.length; i ++) { - var language = window.navigator.languages[i].replace("-", "_"); - if (language in locale.languages) { - locale.language = language; - break; - } - } - } - } - if (!(locale.language in locale.languages)) { + var languages = window.navigator.languages !== undefined ? window.navigator.languages.slice() : []; var language = window.navigator.userLanguage || window.navigator.language; - if (language in locale.languages) { - locale.language = language; - } else if (language.replace("-", "_") in locale.languages) { - locale.language = language.replace("-", "_"); - } else if (language.substr(0, 2) in locale.languages) { - locale.language = language.substr(0, 2); - } else { - locale.language = "en"; // default + languages.push(language); + languages.push(language.substr(0,2)); + languages.push("en"); //default + for (var i = 0; i < languages.length; i ++) { + var language = languages[i].replace("-", "_"); + if (language in locale.languages) { + locale.language = language; + break; + } } } @@ -126,7 +117,7 @@ extjsVersion = '6.2.0'; fontAwesomeVersion = '4.7.0'; - olVersion = '3.19.1'; + olVersion = '3.20.0'; if (debugMode) { addScriptFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/ext-all-debug.js'); |