From 84986e4eefbcd501b48e17d9d545599ed5a6a39f Mon Sep 17 00:00:00 2001
From: schlagmichdoch <schlagmichdoch@users.noreply.github.com>
Date: Fri, 20 Oct 2023 19:27:15 +0200
Subject: [PATCH] try the generalized version of a language code before
 resorting to the default language (es-US -> es)

---
 public/scripts/localization.js                      | 8 +++++++-
 public_included_ws_fallback/scripts/localization.js | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

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) {