polynux
/
tarteauxmyrtilles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #329 from InfinityWebMe/patch-1 

FIX - ForceLanguage when !navigator
This commit is contained in:
Amauri CHAMPEAUX 2019-06-13 08:57:35 +02:00 committed by GitHub
parent 6029ea3d78 42cee81cea
commit dbc2830123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tarteaucitron.js
View File

@ -1236,13 +1236,9 @@ var tarteaucitron = {
},
"getLanguage": function () {
"use strict";
if (!navigator) { return 'en'; }
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 (availableLanguages.indexOf(tarteaucitronForceLanguage) !== -1) {
@ -1250,6 +1246,12 @@ var tarteaucitron = {
}
}
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) {
return defaultLanguage;
}