Mercurial > gemma

changeset 1543:240bd1db49c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Translation: improve language detection code
author Fadi Abbud <fadi.abbud@intevation.de>
date Mon, 10 Dec 2018 13:16:23 +0100
parents 31c6c7bd6190
children 5f80ec319a4f
files client/src/main.js
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/main.js	Mon Dec 10 12:48:37 2018 +0100
+++ b/client/src/main.js	Mon Dec 10 13:16:23 2018 +0100
@@ -149,12 +149,16 @@
   ro_RO: "Română"
 };
 
-const isAvailableLanguage = Object.keys(supportedLanguages).filter(language => {
-  return browserLanguage === language
-    ? language
-    : browserLanguage.substr(0, 2) === language.substr(0, 2);
+let isAvailableLanguage = Object.keys(supportedLanguages).filter(language => {
+  return browserLanguage.replace("-", "_") === language;
 });
 
+if (isAvailableLanguage.length === 0) {
+  isAvailableLanguage = Object.keys(supportedLanguages).filter(language => {
+    return language.substr(0, 2) === browserLanguage.substr(0, 2);
+  });
+}
+
 let defaultLanguage =
   isAvailableLanguage.length > 0 ? isAvailableLanguage[0] : "en_GB";