1 files changed, 36 insertions, 20 deletions

diff --git a/packages/main/src/initReactions.ts b/packages/main/src/initReactions.ts
index b6a8502..cbc0265 100644
--- a/packages/main/src/initReactions.ts
+++ b/packages/main/src/initReactions.ts
@@ -20,43 +20,59 @@
 
 import { app, session } from 'electron';
 
-import ConfigFile from './infrastructure/config/impl/ConfigFile';
-import UserAgents from './infrastructure/electron/UserAgents';
-import ElectronViewFactory from './infrastructure/electron/impl/ElectronViewFactory';
-import { installDevToolsExtensions } from './infrastructure/electron/impl/devTools';
-import hardenSession from './infrastructure/electron/impl/hardenSession';
-import getDistResources from './infrastructure/resources/impl/getDistResources';
-import loadServices from './reactions/loadServices';
-import synchronizeConfig from './reactions/synchronizeConfig';
-import synchronizeNativeTheme from './reactions/synchronizeNativeTheme';
-import type MainStore from './stores/MainStore';
-import type Disposer from './utils/Disposer';
+import LocalizationFiles from './i18n/impl/LocaltizationFiles.js';
+import loadLocalization from './i18n/loadLocalization.js';
+import ConfigFile from './infrastructure/config/impl/ConfigFile.js';
+import UserAgents from './infrastructure/electron/UserAgents.js';
+import ElectronViewFactory from './infrastructure/electron/impl/ElectronViewFactory.js';
+import { installDevToolsExtensions } from './infrastructure/electron/impl/devTools.js';
+import hardenSession from './infrastructure/electron/impl/hardenSession.js';
+import setApplicationMenu from './infrastructure/electron/impl/setApplicationMenu.js';
+import getDistResources from './infrastructure/resources/impl/getDistResources.js';
+import loadServices from './reactions/loadServices.js';
+import synchronizeConfig from './reactions/synchronizeConfig.js';
+import synchronizeNativeTheme from './reactions/synchronizeNativeTheme.js';
+import type MainStore from './stores/MainStore.js';
+import type Disposer from './utils/Disposer.js';
 
 export default async function initReactions(
   store: MainStore,
   devMode: boolean,
+  isMac: boolean,
 ): Promise<Disposer> {
   const configRepository = new ConfigFile(app.getPath('userData'));
   const disposeConfigController = await synchronizeConfig(
     store.shared,
     configRepository,
   );
+  const resources = getDistResources(devMode);
+  // Ideally, we would the the chromium `--lang` according to the settings store here,
+  // but `app.isReady()` is often already `true`, so we're too late to do that.
   await app.whenReady();
+  const localizationFiles = new LocalizationFiles(resources);
+  const localizationLoaded = loadLocalization(
+    store,
+    app.getLocale(),
+    import.meta.env.SUPPORTED_LOCALES,
+    localizationFiles,
+    devMode,
+  );
   const disposeNativeThemeController = synchronizeNativeTheme(store.shared);
-  const resources = getDistResources(devMode);
   hardenSession(resources, devMode, session.defaultSession);
-  if (devMode) {
-    await installDevToolsExtensions();
-  }
   const userAgents = new UserAgents(app.userAgentFallback);
   app.userAgentFallback = userAgents.fallbackUserAgent(devMode);
+  const devToolsLoaded = devMode
+    ? installDevToolsExtensions()
+    : Promise.resolve();
   const viewFactory = new ElectronViewFactory(userAgents, resources, devMode);
-  const [mainWindow] = await Promise.all([
-    viewFactory.createMainWindow(store),
-    viewFactory.loadServiceInject(),
-  ]);
-  store.setMainWindow(mainWindow);
+  const mainWindow = (async () => {
+    await localizationLoaded;
+    setApplicationMenu(store, devMode, isMac);
+    await devToolsLoaded;
+    return viewFactory.createMainWindow(store);
+  })();
   loadServices(store, viewFactory);
+  store.setMainWindow(await mainWindow);
   return () => {
     disposeNativeThemeController();
     disposeConfigController();