Merge pull request #1635 from session-foundation/fix-locale-underscore-pos

fix: use first part of the locale with _/- in it as a full locale

Author: Bilb

ts/mains/main_node.ts

@@ -189,7 +189,7 @@ import { setLatestRelease } from '../node/latest_desktop_release';
 import { isDevProd, isTestIntegration } from '../shared/env_vars';
 import { classicDark } from '../themes';
 
-import { isSessionLocaleSet, getCrowdinLocale } from '../util/i18n/shared';
+import { isSessionLocaleSet, getCrowdinLocale, keepFullLocalePart } from '../util/i18n/shared';
 import { loadLocalizedDictionary } from '../node/locale';
 import { simpleDictionaryNoArgs } from '../localization/locales';
 import LIBSESSION_CONSTANTS from '../session/utils/libsession/libsession_constants';
@@ -774,7 +774,7 @@ app.on('ready', async () => {
   );
 
   if (!isSessionLocaleSet()) {
-    const appLocale = process.env.LANGUAGE || app.getLocale() || 'en';
+    const appLocale = keepFullLocalePart(process.env.LANGUAGE || app.getLocale() || 'en');
     const loadedLocale = loadLocalizedDictionary({ appLocale });
     console.log(`appLocale is ${appLocale}`);
     console.log(`crowdin locale is ${loadedLocale.crowdinLocale}`);

ts/node/locale.ts

@@ -1,8 +1,9 @@
 import { setupI18n } from '../util/i18n/i18n';
 import { CrowdinLocale, isCrowdinLocale } from '../localization/constants';
+import { keepFullLocalePart } from '../util/i18n/shared';
 
 export function normalizeLocaleName(locale: string) {
-  const dashedLocale = locale.replaceAll('_', '-');
+  const dashedLocale = keepFullLocalePart(locale).replaceAll('_', '-');
 
   // Note: this is a pain, but we somehow needs to keep in sync this logic and the LOCALE_PATH_MAPPING from
   // https://github.com/session-foundation/session-shared-scripts/blob/main/crowdin/generate_desktop_strings.py

ts/node/spell_check.ts

@@ -1,16 +1,15 @@
 import { type BrowserWindow, Menu } from 'electron';
 import { sync as osLocaleSync } from 'os-locale';
 import { tr } from '../localization/localeTools';
+import { keepFullLocalePart } from '../util/i18n/shared';
 
 export const setup = (browserWindow: BrowserWindow) => {
   const { session } = browserWindow.webContents;
   // NOTE: we do not rely on the locale parsed by node here because we want
   // to support a broader list of spell checks than what the app is localised for.
   // For instance: en_AU is not a supported language on crowdin, but we still want the user to
   // - if they have the dictionary installed for it - we should be able to spell check "esky", "arvo" or "bogan"
-  const userLocale = process.env.LANGUAGE
-    ? process.env.LANGUAGE
-    : osLocaleSync().replace(/_/g, '-');
+  const userLocale = keepFullLocalePart(process.env.LANGUAGE || osLocaleSync().replace(/_/g, '-'));
   const userLocales = [userLocale, userLocale.split('-')[0], userLocale.split('_')[0]];
 
   const available = session.availableSpellCheckerLanguages;

ts/util/i18n/shared.ts

@@ -20,6 +20,29 @@ export function getTimeLocaleDictionary() {
   return (timeLocaleMap as Record<string, Locale>)[getBrowserLocale()] || timeLocaleMap.en;
 }
 
+/**
+ * Some users have a locale setup with a ':' in it.
+ * When this happens, the full locale (i.e. the part with the "_") can sometimes be on the left, sometimes on the right.
+ * This function will always return the part with the "_" if found, otherwise the full locale.
+ */
+export function keepFullLocalePart(locale: string) {
+  const firstUnderscore = locale.indexOf('_');
+  const firstDash = locale.indexOf('-');
+  const firstSemiColon = locale.indexOf(':');
+  if (firstSemiColon === -1) {
+    return locale;
+  }
+  const firstUnderscoreOrDash = Math.max(firstUnderscore, firstDash);
+
+  if (firstSemiColon > firstUnderscoreOrDash) {
+    // the semicolon is after the underscore, so we return the start of the string (de_DE:en we return de_DE)
+    return locale.substring(0, firstSemiColon);
+  }
+
+  // the semicolon is before the underscore, so we return the end of the string (in en:de_DE wew return de_DE)
+  return locale.substring(firstSemiColon + 1);
+}
+
 /**
  * Returns the current locale as supported by Session (i.e. one generated by crowdin)
  */
@@ -36,7 +59,7 @@ export function getCrowdinLocale(): CrowdinLocale {
  * Returns the closest supported locale by the browser.
  */
 export function getBrowserLocale() {
-  const browserLocale = process.env.LANGUAGE || getCrowdinLocale() || 'en';
+  const browserLocale = keepFullLocalePart(process.env.LANGUAGE || getCrowdinLocale() || 'en');
 
   // supportedLocalesOf will throw if the locales has a '_' instead of a '-' in it.
   const userLocaleDashed = browserLocale.replaceAll('_', '-');