Merge branch 'fix-reverting-translations'

3 files changed, 6 insertions, 6 deletions

diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 8cacf4a7b7..54ea32932f 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -425,7 +425,7 @@ class ApplicationMain {
     // Blocks navigation since it's not needed.
     this.blockNavigation();
 
-    this.translations = this.updateCurrentLocale();
+    this.updateCurrentLocale();
 
     this.daemonRpc.addConnectionObserver(
       new ConnectionObserver(this.onDaemonConnected, this.onDaemonDisconnected),
@@ -1064,7 +1064,6 @@ class ApplicationMain {
 
   private registerIpcListeners() {
     IpcMainEventChannel.state.handleGet(() => ({
-      locale: this.locale,
       isConnected: this.connectedToDaemon,
       autoStart: getOpenAtLogin(),
       accountData: this.accountData,
@@ -1153,7 +1152,8 @@ class ApplicationMain {
 
     IpcMainEventChannel.guiSettings.handleSetPreferredLocale((locale: string) => {
       this.guiSettings.preferredLocale = locale;
-      return Promise.resolve(this.updateCurrentLocale());
+      this.updateCurrentLocale();
+      return Promise.resolve(this.translations);
     });
 
     IpcMainEventChannel.account.handleCreate(() => this.createNewAccount());
@@ -1526,7 +1526,8 @@ class ApplicationMain {
 
     const messagesTranslations = loadTranslations(this.locale, messages);
     const relayLocationsTranslations = loadTranslations(this.locale, relayLocations);
-    return {
+
+    this.translations = {
       locale: this.locale,
       messages: messagesTranslations,
       relayLocations: relayLocationsTranslations,
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index 5b4f4be972..5d4d957da4 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -208,7 +208,7 @@ export default class AppRenderer {
     // Request the initial state from the main process
     const initialState = IpcRendererEventChannel.state.get();
 
-    this.setLocale(initialState.locale);
+    this.setLocale(initialState.translations.locale);
     loadTranslations(
       messages,
       initialState.translations.locale,
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index f463765a32..1053ecf4e8 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -40,7 +40,6 @@ export interface IRelayListPair {
 export type LaunchApplicationResult = { success: true } | { error: string };
 
 export interface IAppStateSnapshot {
-  locale: string;
   isConnected: boolean;
   autoStart: boolean;
   accountData?: IAccountData;