From b901f5148d1aa6dea12f8ee43e51c45cfab4e900 Mon Sep 17 00:00:00 2001
From: Eli Grey <~@eligrey.com>
Date: Fri, 18 Oct 2024 04:37:55 +0000
Subject: [PATCH 1/3] Improved UI language matching

---
 package.json             | 2 +-
 src/hooks/useLanguage.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e285ac1..e59747d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/transcend-io/consent-manager-ui.git"
   },
   "homepage": "https://github.com/transcend-io/consent-manager-ui",
-  "version": "4.19.1",
+  "version": "4.19.2",
   "license": "MIT",
   "main": "build/ui",
   "files": [
diff --git a/src/hooks/useLanguage.ts b/src/hooks/useLanguage.ts
index 36d495a..8da8984 100644
--- a/src/hooks/useLanguage.ts
+++ b/src/hooks/useLanguage.ts
@@ -90,7 +90,7 @@ export function pickDefaultLanguage(
 
   const preferredLanguages = getUserLanguages();
   return (
-    getNearestSupportedLanguage(preferredLanguages, supportedLanguages) ||
+    getNearestSupportedLanguage(preferredLanguages, sortSupportedLanguagesByPreference(supportedLanguages)) ||
     ConsentManagerLanguageKey.En
   );
 }

From 4bda86ba2c3765e927534ee38a3658b627cfdef8 Mon Sep 17 00:00:00 2001
From: Eli Grey <~@eligrey.com>
Date: Fri, 18 Oct 2024 04:39:35 +0000
Subject: [PATCH 2/3] reorder

---
 src/hooks/useLanguage.ts | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/hooks/useLanguage.ts b/src/hooks/useLanguage.ts
index 8da8984..0437986 100644
--- a/src/hooks/useLanguage.ts
+++ b/src/hooks/useLanguage.ts
@@ -75,26 +75,6 @@ export const getNearestSupportedLanguage = (
     ),
   );
 
-/**
- * Picks a default language for the user
- *
- * @param supportedLanguages - Set of supported languages
- * @returns the language key of the best default language for this user
- */
-export function pickDefaultLanguage(
-  supportedLanguages: ConsentManagerLanguageKey[],
-): ConsentManagerLanguageKey {
-  if (settings.locale && supportedLanguages.includes(settings.locale)) {
-    return settings.locale;
-  }
-
-  const preferredLanguages = getUserLanguages();
-  return (
-    getNearestSupportedLanguage(preferredLanguages, sortSupportedLanguagesByPreference(supportedLanguages)) ||
-    ConsentManagerLanguageKey.En
-  );
-}
-
 /**
  * Sorts the supported languages by the user's preferences
  *
@@ -120,6 +100,26 @@ export const sortSupportedLanguagesByPreference = (
     return rank(a) - rank(b);
   });
 
+/**
+ * Picks a default language for the user
+ *
+ * @param supportedLanguages - Set of supported languages
+ * @returns the language key of the best default language for this user
+ */
+export function pickDefaultLanguage(
+  supportedLanguages: ConsentManagerLanguageKey[],
+): ConsentManagerLanguageKey {
+  if (settings.locale && supportedLanguages.includes(settings.locale)) {
+    return settings.locale;
+  }
+
+  const preferredLanguages = getUserLanguages();
+  return (
+    getNearestSupportedLanguage(preferredLanguages, sortSupportedLanguagesByPreference(supportedLanguages)) ||
+    ConsentManagerLanguageKey.En
+  );
+}
+
 /**
  * Fetch message translations
  *

From 7715e74b7992aabb75938b3e586c4d5d5dcc6506 Mon Sep 17 00:00:00 2001
From: Eli Grey <~@eligrey.com>
Date: Mon, 21 Oct 2024 18:19:26 +0000
Subject: [PATCH 3/3] prettier

---
 src/hooks/useLanguage.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/hooks/useLanguage.ts b/src/hooks/useLanguage.ts
index 0437986..b119c21 100644
--- a/src/hooks/useLanguage.ts
+++ b/src/hooks/useLanguage.ts
@@ -115,8 +115,10 @@ export function pickDefaultLanguage(
 
   const preferredLanguages = getUserLanguages();
   return (
-    getNearestSupportedLanguage(preferredLanguages, sortSupportedLanguagesByPreference(supportedLanguages)) ||
-    ConsentManagerLanguageKey.En
+    getNearestSupportedLanguage(
+      preferredLanguages,
+      sortSupportedLanguagesByPreference(supportedLanguages),
+    ) || ConsentManagerLanguageKey.En
   );
 }