2 files changed, 9 insertions, 63 deletions
diff --git a/gui/src/shared/gettext.ts b/gui/src/shared/gettext.ts
index 3283269c70..0416e8b1ce 100644
--- a/gui/src/shared/gettext.ts
+++ b/gui/src/shared/gettext.ts
@@ -1,67 +1,8 @@
-import fs from 'fs';
-import { po } from 'gettext-parser';
 import Gettext from 'node-gettext';
-import path from 'path';
 import { LocalizationContexts } from './localization-contexts';
 import log from './logging';
 
 const SOURCE_LANGUAGE = 'en';
-const LOCALES_DIR = path.resolve(__dirname, '../../locales');
-
-export function loadTranslations(currentLocale: string, catalogue: Gettext) {
-  // First look for exact match of the current locale
-  const preferredLocales = [];
-
-  if (currentLocale !== SOURCE_LANGUAGE) {
-    preferredLocales.push(currentLocale);
-  }
-
-  // In case of region bound locale like en-US, fallback to en.
-  const language = Gettext.getLanguageCode(currentLocale);
-  if (currentLocale !== language) {
-    preferredLocales.push(language);
-  }
-
-  const domain = catalogue.domain;
-  for (const locale of preferredLocales) {
-    if (parseTranslation(locale, domain, catalogue)) {
-      log.info(`Loaded translations ${locale}/${domain}`);
-      catalogue.setLocale(locale);
-      return;
-    }
-  }
-
-  // Reset the locale to source language if we couldn't load the catalogue for the requested locale
-  // Add empty translations to suppress some of the warnings produces by node-gettext
-  catalogue.addTranslations(SOURCE_LANGUAGE, domain, {});
-  catalogue.setLocale(SOURCE_LANGUAGE);
-}
-
-function parseTranslation(locale: string, domain: string, catalogue: Gettext): boolean {
-  const filename = path.join(LOCALES_DIR, locale, `${domain}.po`);
-  let contents: string;
-
-  try {
-    contents = fs.readFileSync(filename, { encoding: 'utf8' });
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      log.error(`Cannot read the gettext file "${filename}": ${error.message}`);
-    }
-    return false;
-  }
-
-  let translations: ReturnType<typeof po.parse>;
-  try {
-    translations = po.parse(contents);
-  } catch (error) {
-    log.error(`Cannot parse the gettext file "${filename}": ${error.message}`);
-    return false;
-  }
-
-  catalogue.addTranslations(locale, domain, translations);
-
-  return true;
-}
 
 function setErrorHandler(catalogue: Gettext) {
   catalogue.on('error', (error) => {
diff --git a/gui/src/shared/ipc-event-channel.ts b/gui/src/shared/ipc-event-channel.ts
index 19c11f85ab..59304e3678 100644
--- a/gui/src/shared/ipc-event-channel.ts
+++ b/gui/src/shared/ipc-event-channel.ts
@@ -1,3 +1,4 @@
+import { GetTextTranslations } from 'gettext-parser';
 import { ICurrentAppVersionInfo } from '../main/index';
 import { IWindowShapeParameters } from '../main/window-controller';
 import { ILinuxSplitTunnelingApplication } from '../shared/application-types';
@@ -33,6 +34,12 @@ interface ILogEntry {
   message: string;
 }
 
+export interface ITranslations {
+  locale: string;
+  messages?: GetTextTranslations;
+  relayLocations?: GetTextTranslations;
+}
+
 export interface IRelayListPair {
   relays: IRelayList;
   bridges: IRelayList;
@@ -52,6 +59,7 @@ export interface IAppStateSnapshot {
   upgradeVersion: IAppVersionInfo;
   guiSettings: IGuiSettingsState;
   wireguardPublicKey?: IWireguardPublicKey;
+  translations: ITranslations;
 }
 
 // The different types of requests are:
@@ -97,9 +105,6 @@ const ipc = {
   state: {
     get: invokeSync<void, IAppStateSnapshot>(),
   },
-  locale: {
-    '': notifyRenderer<string>(),
-  },
   windowShape: {
     '': notifyRenderer<IWindowShapeParameters>(),
   },
@@ -155,7 +160,7 @@ const ipc = {
     setAutoConnect: send<boolean>(),
     setStartMinimized: send<boolean>(),
     setMonochromaticIcon: send<boolean>(),
-    setPreferredLocale: send<string>(),
+    setPreferredLocale: invoke<string, ITranslations>(),
     setUnpinnedWindow: send<boolean>(),
   },
   account: {