6 files changed, 54 insertions, 6 deletions

diff --git a/packages/main/src/i18n/I18nStore.ts b/packages/main/src/i18n/I18nStore.ts
index d833e8a..c364f0e 100644
--- a/packages/main/src/i18n/I18nStore.ts
+++ b/packages/main/src/i18n/I18nStore.ts
@@ -82,7 +82,12 @@ export default class I18nStore {
     };
 
     const loadAsync = async () => {
-      await this.i18next.loadNamespaces([ns]);
+      try {
+        await this.i18next.loadNamespaces([ns]);
+      } catch (error) {
+        setImmediate(loaded);
+        throw error;
+      }
       if (this.i18next.isInitialized) {
         setImmediate(loaded);
         return;
@@ -98,7 +103,14 @@ export default class I18nStore {
 
     loadAsync().catch((error) => {
       log.error('Failed to load translations for namespace', ns, error);
-      setImmediate(loaded);
     });
   }
+
+  async reloadTranslations(): Promise<void> {
+    await this.i18next.reloadResources();
+    setImmediate(() => {
+      this.languageChangedAtom.reportChanged();
+    });
+    log.debug('Reloaded translations');
+  }
 }
diff --git a/packages/main/src/stores/MainStore.ts b/packages/main/src/stores/MainStore.ts
index 873f998..93cabb9 100644
--- a/packages/main/src/stores/MainStore.ts
+++ b/packages/main/src/stores/MainStore.ts
@@ -96,6 +96,13 @@ const MainStore = types
         case 'reload-all-services':
           self.services.forEach((service) => service.reload());
           break;
+        case 'reload-all-translations':
+          if (self.i18n !== undefined) {
+            self.i18n.reloadTranslations().catch((error) => {
+              log.error('Failed to reload translations', error);
+            });
+          }
+          break;
         case 'dispatch-service-action': {
           const { serviceId, serviceAction } = action;
           const service = self.shared.servicesById.get(serviceId);
diff --git a/packages/renderer/src/devTools.ts b/packages/renderer/src/devTools.ts
index cb695c3..1fe39f7 100644
--- a/packages/renderer/src/devTools.ts
+++ b/packages/renderer/src/devTools.ts
@@ -52,13 +52,18 @@ export async function exposeToReduxDevtools(
 }
 
 /**
- * Sends a message to the main process to reload all services when
+ * Sends a message to the main process to reload all services or translations when
  * `build/watch.js` sends a reload event on bundle write.
  */
-export function hotReloadServices(): void {
+export function hotReload(): void {
   import.meta.hot?.on('sophie:reload-services', () => {
     window.sophieRenderer.dispatchAction({
       action: 'reload-all-services',
     });
   });
+  import.meta.hot?.on('sophie:reload-translations', () => {
+    window.sophieRenderer.dispatchAction({
+      action: 'reload-all-translations',
+    });
+  });
 }
diff --git a/packages/renderer/src/index.tsx b/packages/renderer/src/index.tsx
index e87ab8b..54e157c 100644
--- a/packages/renderer/src/index.tsx
+++ b/packages/renderer/src/index.tsx
@@ -30,7 +30,7 @@ import { render } from 'react-dom';
 import App from './components/App';
 import StoreProvider from './components/StoreProvider';
 import ThemeProvider from './components/ThemeProvider';
-import { exposeToReduxDevtools, hotReloadServices } from './devTools';
+import { exposeToReduxDevtools, hotReload } from './devTools';
 import { createAndConnectRendererStore } from './stores/RendererStore';
 import { getLogger } from './utils/log';
 
@@ -39,7 +39,7 @@ const isDevelopment = import.meta.env.MODE === 'development';
 const log = getLogger('index');
 
 if (isDevelopment) {
-  hotReloadServices();
+  hotReload();
 }
 
 const store = createAndConnectRendererStore(window.sophieRenderer);
diff --git a/packages/shared/src/schemas/Action.ts b/packages/shared/src/schemas/Action.ts
index d5d0a8d..8d6ca3a 100644
--- a/packages/shared/src/schemas/Action.ts
+++ b/packages/shared/src/schemas/Action.ts
@@ -46,6 +46,9 @@ export const Action = /* @__PURE__ */ (() =>
       action: z.literal('reload-all-services'),
     }),
     z.object({
+      action: z.literal('reload-all-translations'),
+    }),
+    z.object({
       action: z.literal('dispatch-service-action'),
       serviceId: z.string(),
       serviceAction: ServiceAction,
diff --git a/scripts/watch.js b/scripts/watch.js
index 8ea5f29..be05f2b 100644
--- a/scripts/watch.js
+++ b/scripts/watch.js
@@ -191,6 +191,25 @@ function setupMainPackageWatcher(viteDevServer) {
 }
 
 /**
+ * @param {(event: import('vite').HMRPayload) => void} sendEvent
+ */
+function setupTranslationsWatcher(sendEvent) {
+  const localesDir = path.join(thisDir, '../locales');
+  const watcher = watch(localesDir, {
+    ignored: /\.missing\.json$/,
+    ignoreInitial: true,
+    persistent: true,
+  });
+  watcher.on('change', () => {
+    console.log(`\u26A1 Reloading translations`);
+    sendEvent({
+      type: 'custom',
+      event: 'sophie:reload-translations',
+    });
+  });
+}
+
+/**
  * @returns {Promise<void>}
  */
 async function setupDevEnvironment() {
@@ -246,6 +265,8 @@ async function setupDevEnvironment() {
     return;
   }
 
+  setupTranslationsWatcher(sendEvent);
+
   console.log('\uD83C\uDF80 Sophie is starting up');
   await setupMainPackageWatcher(viteDevServer);
 }