diff --git a/public/scripts/localization.js b/public/scripts/localization.js index 8fd7942..62b11aa 100644 --- a/public/scripts/localization.js +++ b/public/scripts/localization.js @@ -31,7 +31,13 @@ class Localization { } static getSupportedOrDefault(locales) { - return locales.find(Localization.isSupported) || Localization.defaultLocale; + let localesGeneric = locales + .map(locale => locale.split("-")[0]) + .filter(locale => locales.indexOf(locale) === -1); + + return locales.find(Localization.isSupported) + || localesGeneric.find(Localization.isSupported) + || Localization.defaultLocale; } static async setTranslation(locale) { diff --git a/public_included_ws_fallback/scripts/localization.js b/public_included_ws_fallback/scripts/localization.js index 8fd7942..62b11aa 100644 --- a/public_included_ws_fallback/scripts/localization.js +++ b/public_included_ws_fallback/scripts/localization.js @@ -31,7 +31,13 @@ class Localization { } static getSupportedOrDefault(locales) { - return locales.find(Localization.isSupported) || Localization.defaultLocale; + let localesGeneric = locales + .map(locale => locale.split("-")[0]) + .filter(locale => locales.indexOf(locale) === -1); + + return locales.find(Localization.isSupported) + || localesGeneric.find(Localization.isSupported) + || Localization.defaultLocale; } static async setTranslation(locale) {