Fixed missing translations in archiving popup, when triggered from navigation and the single rows in grid

Author: ransome1

src/main/i18n.ts

@@ -1,16 +1,30 @@
 import i18n from "i18next";
+import { app } from "electron";
 import { SettingsStore } from "./Stores";
 import { i18nextOptions } from "../i18n.config";
 import { File } from "../@types";
 
-function setupI18n() {
+async function setupI18n() {
   i18n.init(i18nextOptions);
 
-  const language = SettingsStore.get("language") || "en";
-  i18n.changeLanguage(language);
+  const language = SettingsStore.get("language");
+  if (!language) {
+    const systemLocale = app.getLocale();
+    const normalizedLocale = systemLocale.split("-")[0];
+    const supportedLanguages = i18nextOptions.resources
+      ? Object.keys(i18nextOptions.resources)
+      : [];
+    const detectedLanguage = supportedLanguages.includes(normalizedLocale)
+      ? normalizedLocale
+      : "en";
+    SettingsStore.set("language", detectedLanguage);
+    await i18n.changeLanguage(detectedLanguage);
+  } else {
+    await i18n.changeLanguage(language);
+  }
 
   SettingsStore.onDidChange("language", async (newLanguage) => {
-    i18n.changeLanguage(newLanguage);
+    await i18n.changeLanguage(newLanguage);
     // Lazy import to avoid circular dependency
     const { UpdateTrayMenu } = await import("./Tray");
     const { CreateMenu } = await import("./Menu");

src/main/index.ts

@@ -235,8 +235,8 @@ if (!gotTheLock) {
 
   app
     .whenReady()
-    .then(() => {
-      setupI18n();
+    .then(async () => {
+      await setupI18n();
       registerAllHandlers();
       const tray = SettingsStore.get("tray");
       const startMinimized = SettingsStore.get("startMinimized");

src/renderer/Archive.tsx

@@ -18,20 +18,6 @@ const ArchiveComponent: React.FC<ArchiveComponentProps> = ({
     number | undefined
   >(undefined);
 
-  const handleTriggerArchiving = (
-    doneFileAvailable: boolean,
-    lineNumber?: number,
-  ): void => {
-    setArchiveLineNumber(lineNumber);
-    setPromptItem(
-      doneFileAvailable
-        ? lineNumber
-          ? promptItemArchivingSingle
-          : promptItemArchivingAll
-        : promptItemChooseChangeFile,
-    );
-  };
-
   const handleArchiveAllConfirm = (): void => {
     ipcRenderer.send("archiveTodos");
   };
@@ -48,30 +34,46 @@ const ArchiveComponent: React.FC<ArchiveComponentProps> = ({
     ipcRenderer.send("createFile", true, archiveLineNumber);
   };
 
-  const promptItemArchivingAll = {
-    id: "archive",
-    headline: t("prompt.archive.headline"),
-    text: t("prompt.archive.text"),
-    button1: t("archive"),
-    onButton1: handleArchiveAllConfirm,
-  };
+  const handleTriggerArchiving = (
+    doneFileAvailable: boolean,
+    lineNumber?: number,
+  ): void => {
+    setArchiveLineNumber(lineNumber);
 
-  const promptItemArchivingSingle = {
-    id: "archive",
-    headline: t("prompt.archive.headline.single"),
-    text: t("prompt.archive.text.single"),
-    button1: t("archive"),
-    onButton1: handleArchiveSingleConfirm,
-  };
+    // Define prompt items here to get fresh translations every time
+    const promptItemArchivingAll = {
+      id: "archive",
+      headline: t("prompt.archive.headline"),
+      text: t("prompt.archive.text"),
+      button1: t("archive"),
+      onButton1: handleArchiveAllConfirm,
+    };
+
+    const promptItemArchivingSingle = {
+      id: "archive",
+      headline: t("prompt.archive.headline.single"),
+      text: t("prompt.archive.text.single"),
+      button1: t("archive"),
+      onButton1: handleArchiveSingleConfirm,
+    };
+
+    const promptItemChooseChangeFile = {
+      id: "changeFile",
+      headline: t("prompt.archive.changeFile.headline"),
+      text: t("prompt.archive.changeFile.text"),
+      button1: t("openFile"),
+      onButton1: handleOpenDoneFile,
+      button2: t("createFile"),
+      onButton2: handleCreateDoneFile,
+    };
 
-  const promptItemChooseChangeFile = {
-    id: "changeFile",
-    headline: t("prompt.archive.changeFile.headline"),
-    text: t("prompt.archive.changeFile.text"),
-    button1: t("openFile"),
-    onButton1: handleOpenDoneFile,
-    button2: t("createFile"),
-    onButton2: handleCreateDoneFile,
+    setPromptItem(
+      doneFileAvailable
+        ? lineNumber
+          ? promptItemArchivingSingle
+          : promptItemArchivingAll
+        : promptItemChooseChangeFile,
+    );
   };
 
   useEffect((): void => {
@@ -85,7 +87,7 @@ const ArchiveComponent: React.FC<ArchiveComponentProps> = ({
     return (): void => {
       ipcRenderer.off("triggerArchiving", handleTriggerArchiving);
     };
-  }, []);
+  }, [handleTriggerArchiving]);
 
   return <></>;
 };