From 2a185350bb2e039256c000d5735615ceed4b7af5 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Thu, 26 Sep 2024 17:20:54 +1000
Subject: [PATCH] fix: getBrowserLocale: strip to semicolon if found

---
 ts/util/i18n/shared.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ts/util/i18n/shared.ts b/ts/util/i18n/shared.ts
index 6c0f9392c..cffdc3da7 100644
--- a/ts/util/i18n/shared.ts
+++ b/ts/util/i18n/shared.ts
@@ -73,7 +73,19 @@ export function getBrowserLocale() {
   const userLocaleDashed = browserLocale.replaceAll('_', '-');
 
   try {
-    const matchingLocales = Intl.DateTimeFormat.supportedLocalesOf(userLocaleDashed);
+    let matchingLocales: Array<string> = [];
+    try {
+      matchingLocales = Intl.DateTimeFormat.supportedLocalesOf(userLocaleDashed);
+    } catch (innerError) {
+      // some users have a locale setup with a ':' in it.
+      // see https://github.com/oxen-io/session-desktop/issues/3221
+      const semiColonIndex = userLocaleDashed.indexOf(':');
+      if (semiColonIndex > -1) {
+        matchingLocales = Intl.DateTimeFormat.supportedLocalesOf(
+          userLocaleDashed.substring(0, semiColonIndex)
+        );
+      }
+    }
 
     const mappingTo = matchingLocales?.[0] || 'en';