# HG changeset patch # User Fadi Abbud # Date 1544178076 -3600 # Node ID 3cc3b739080539a27644a6d9c1bc363a1edb1f81 # Parent 4f62e261074036e37539760dbefc2025b8f08789# Parent 4dbed34f873828eae53b38511a6cdca90812b7ac merge diff -r 4dbed34f8738 -r 3cc3b7390805 client/src/main.js --- a/client/src/main.js Fri Dec 07 11:15:40 2018 +0100 +++ b/client/src/main.js Fri Dec 07 11:21:16 2018 +0100 @@ -135,50 +135,25 @@ let browserLanguage = locale2; -// planned also SK, HU, HR, RS, BiH, BG, RO, UA +// planned also RS, BiH, UA const supportedLanguages = { en_GB: "British English", de_AT: "Deutsch", sk_SK: "slovenčina", - hu_HU: "Magyat", + hu_HU: "Magyar", hr_HR: "Hrvatska", bg_BG: "български", ro_RO: "Română" }; -if ( - browserLanguage === "de-DE" || - browserLanguage === "de-LI" || - browserLanguage === "de-LU" || - browserLanguage === "de-CH" || - browserLanguage === "de" -) { - browserLanguage = "de-AT"; // map german,liechtenstein,luxenburg and switzerland to austrian variant for now -} - -if (browserLanguage === "sk") { - browserLanguage = "sk_SK"; -} +const isAvailableLanguage = Object.keys(supportedLanguages).filter(language => { + return browserLanguage === language + ? language + : browserLanguage.substr(0, 2) === language.substr(0, 2); +}); -if (browserLanguage === "hu") { - browserLanguage = "hu_HU"; -} - -if (browserLanguage === "hr") { - browserLanguage = "hr_HR"; -} - -if (browserLanguage === "bg") { - browserLanguage = "bg_BG"; -} - -if (browserLanguage === "ro") { - browserLanguage = "ro_RO"; -} - -const language = browserLanguage.replace("-", "_"); -const isLanguageAvailable = supportedLanguages[language]; -let defaultLanguage = isLanguageAvailable ? language : "en_GB"; +let defaultLanguage = + isAvailableLanguage.length > 0 ? isAvailableLanguage[0] : "en_GB"; Vue.use(GetTextPlugin, { translations: translations,