Mark more strings for translation.

andersk · andersk · commit 9dd5fd2aa513 · 2025-08-06T14:04:43.000-07:00
Fixes #1128 among many other things. Signed-off-by: Anders Kaseorg <anders@zulip.com>
diff --git a/app/common/link-util.ts b/app/common/link-util.ts
@@ -3,7 +3,8 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 
-import {html} from "./html.ts";
+import {Html, html} from "./html.ts";
+import * as t from "./translation-util.ts";
 
 export async function openBrowser(url: URL): Promise<void> {
   if (["http:", "https:", "mailto:"].includes(url.protocol)) {
@@ -21,15 +22,21 @@ export async function openBrowser(url: URL): Promise<void> {
           <head>
             <meta charset="UTF-8" />
             <meta http-equiv="Refresh" content="0; url=${url.href}" />
-            <title>Redirecting</title>
+            <title>${t.__("Redirecting")}</title>
             <style>
               html {
                 font-family: menu, "Helvetica Neue", sans-serif;
               }
             </style>
           </head>
           <body>
-            <p>Opening <a href="${url.href}">${url.href}</a>…</p>
+            <p>
+              ${new Html({
+                html: t.__("Opening {{{link}}}…", {
+                  link: html`<a href="${url.href}">${url.href}</a>`.html,
+                }),
+              })}
+            </p>
           </body>
         </html>
       `.html,
diff --git a/app/common/messages.ts b/app/common/messages.ts
@@ -1,3 +1,5 @@
+import * as t from "./translation-util.ts";
+
 type DialogBoxError = {
   title: string;
   content: string;
@@ -13,26 +15,24 @@ export function invalidZulipServerError(domain: string): string {
  https://zulip.readthedocs.io/en/stable/production/ssl-certificates.html`;
 }
 
-export function enterpriseOrgError(
-  length: number,
-  domains: string[],
-): DialogBoxError {
+export function enterpriseOrgError(domains: string[]): DialogBoxError {
   let domainList = "";
   for (const domain of domains) {
     domainList += `• ${domain}\n`;
   }
 
   return {
-    title: `Could not add the following ${
-      length === 1 ? "organization" : "organizations"
-    }`,
-    content: `${domainList}\nPlease contact your system administrator.`,
+    title: t.__mf(
+      "{number, plural, one {Could not add # organization} other {Could not add # organizations}}",
+      {number: domains.length},
+    ),
+    content: `${domainList}\n${t.__("Please contact your system administrator.")}`,
   };
 }
 
 export function orgRemovalError(url: string): DialogBoxError {
   return {
-    title: `Removing ${url} is a restricted operation.`,
-    content: "Please contact your system administrator.",
+    title: t.__("Removing {{{url}}} is a restricted operation.", {url}),
+    content: t.__("Please contact your system administrator."),
   };
 }
diff --git a/app/common/translation-util.ts b/app/common/translation-util.ts
@@ -13,4 +13,4 @@ i18n.configure({
 /* Fetches the current appLocale from settings.json */
 i18n.setLocale(ConfigUtil.getConfigItem("appLanguage", "en") ?? "en");
 
-export {__} from "i18n";
+export {__, __mf} from "i18n";
diff --git a/app/main/handle-external-link.ts b/app/main/handle-external-link.ts
@@ -11,6 +11,7 @@ import path from "node:path";
 
 import * as ConfigUtil from "../common/config-util.ts";
 import * as LinkUtil from "../common/link-util.ts";
+import * as t from "../common/translation-util.ts";
 
 import {send} from "./typed-ipc-main.ts";
 
@@ -125,8 +126,8 @@ export default function handleExternalLink(
       downloadPath,
       async completed(filePath: string, fileName: string) {
         const downloadNotification = new Notification({
-          title: "Download Complete",
-          body: `Click to show ${fileName} in folder`,
+          title: t.__("Download Complete"),
+          body: t.__("Click to show {{{fileName}}} in folder", {fileName}),
           silent: true, // We'll play our own sound - ding.ogg
         });
         downloadNotification.on("click", () => {
@@ -149,8 +150,8 @@ export default function handleExternalLink(
         if (state !== "cancelled") {
           if (ConfigUtil.getConfigItem("promptDownload", false)) {
             new Notification({
-              title: "Download Complete",
-              body: "Download failed",
+              title: t.__("Download Complete"),
+              body: t.__("Download failed"),
             }).show();
           } else {
             contents.downloadURL(url.href);
diff --git a/app/main/linuxupdater.ts b/app/main/linuxupdater.ts
@@ -5,6 +5,7 @@ import {z} from "zod";
 
 import * as ConfigUtil from "../common/config-util.ts";
 import Logger from "../common/logger-util.ts";
+import * as t from "../common/translation-util.ts";
 
 import * as LinuxUpdateUtil from "./linux-update-util.ts";
 
@@ -34,8 +35,11 @@ export async function linuxUpdateNotification(session: Session): Promise<void> {
       const notified = LinuxUpdateUtil.getUpdateItem(latestVersion);
       if (notified === null) {
         new Notification({
-          title: "Zulip Update",
-          body: `A new version ${latestVersion} is available. Please update using your package manager.`,
+          title: t.__("Zulip Update"),
+          body: t.__(
+            "A new version {{{version}}} is available. Please update using your package manager.",
+            {version: latestVersion},
+          ),
         }).show();
         LinuxUpdateUtil.setUpdateItem(latestVersion, true);
       }
diff --git a/app/renderer/js/main.ts b/app/renderer/js/main.ts
@@ -80,7 +80,6 @@ export class ServerManagerView {
   $dndTooltip: HTMLElement;
   $sidebar: Element;
   $fullscreenPopup: Element;
-  $fullscreenEscapeKey: string;
   loading: Set<string>;
   activeTabIndex: number;
   tabs: ServerOrFunctionalTab[];
@@ -121,8 +120,10 @@ export class ServerManagerView {
     this.$sidebar = document.querySelector("#sidebar")!;
 
     this.$fullscreenPopup = document.querySelector("#fullscreen-popup")!;
-    this.$fullscreenEscapeKey = process.platform === "darwin" ? "^⌘F" : "F11";
-    this.$fullscreenPopup.textContent = `Press ${this.$fullscreenEscapeKey} to exit full screen`;
+    this.$fullscreenPopup.textContent = t.__(
+      "Press {{{exitKey}}} to exit full screen",
+      {exitKey: process.platform === "darwin" ? "^⌘F" : "F11"},
+    );
 
     this.loading = new Set();
     this.activeTabIndex = -1;
@@ -261,7 +262,10 @@ export class ServerManagerView {
     } catch (error: unknown) {
       logger.error(error);
       logger.error(
-        `Could not add ${domain}. Please contact your system administrator.`,
+        t.__(
+          "Could not add {{{domain}}}. Please contact your system administrator.",
+          {domain},
+        ),
       );
       return false;
     }
@@ -311,10 +315,7 @@ export class ServerManagerView {
         failedDomains.push(org);
       }
 
-      const {title, content} = Messages.enterpriseOrgError(
-        domainsAdded.length,
-        failedDomains,
-      );
+      const {title, content} = Messages.enterpriseOrgError(failedDomains);
       dialog.showErrorBox(title, content);
       if (DomainUtil.getDomains().length === 0) {
         // No orgs present, stop showing loading gif
@@ -795,8 +796,9 @@ export class ServerManagerView {
 
   // Toggles the dnd button icon.
   toggleDndButton(alert: boolean): void {
-    this.$dndTooltip.textContent =
-      (alert ? "Disable" : "Enable") + " Do Not Disturb";
+    this.$dndTooltip.textContent = alert
+      ? t.__("Disable Do Not Disturb")
+      : t.__("Enable Do Not Disturb");
     const $dndIcon = this.$dndButton.querySelector("i")!;
     $dndIcon.textContent = alert ? "notifications_off" : "notifications";
 
diff --git a/app/renderer/js/pages/preference/base-section.ts b/app/renderer/js/pages/preference/base-section.ts
@@ -1,4 +1,5 @@
 import {type Html, html} from "../../../../common/html.ts";
+import * as t from "../../../../common/translation-util.ts";
 import {generateNodeFromHtml} from "../../components/base.ts";
 import {ipcRenderer} from "../../typed-ipc-renderer.ts";
 
@@ -31,7 +32,7 @@ export function generateOptionHtml(
   const labelHtml = disabled
     ? html`<label
         class="disallowed"
-        title="Setting locked by system administrator."
+        title="${t.__("Setting locked by system administrator.")}"
       ></label>`
     : html`<label></label>`;
   if (settingOption) {
diff --git a/app/renderer/js/pages/preference/general-section.ts b/app/renderer/js/pages/preference/general-section.ts
@@ -561,8 +561,9 @@ export function initGeneralSection({$root}: GeneralSectionProperties): void {
   }
 
   async function factoryResetSettings(): Promise<void> {
-    const clearAppDataMessage =
-      "When the application restarts, it will be as if you have just downloaded Zulip app.";
+    const clearAppDataMessage = t.__(
+      "When the application restarts, it will be as if you have just downloaded the Zulip app.",
+    );
     const getAppPath = path.join(app.getPath("appData"), app.name);
 
     const {response} = await dialog.showMessageBox({
@@ -609,7 +610,7 @@ export function initGeneralSection({$root}: GeneralSectionProperties): void {
       spellDiv.innerHTML += html`
         <div class="setting-description">${t.__("Spellchecker Languages")}</div>
         <div id="spellcheck-langs-value">
-          <input name="spellcheck" placeholder="Enter Languages" />
+          <input name="spellcheck" placeholder="${t.__("Enter Languages")}" />
         </div>
       `.html;
 
diff --git a/app/renderer/js/pages/preference/network-section.ts b/app/renderer/js/pages/preference/network-section.ts
@@ -28,7 +28,7 @@ export function initNetworkSection({$root}: NetworkSectionProperties): void {
         </div>
         <div class="manual-proxy-block">
           <div class="setting-row" id="proxy-pac-option">
-            <span class="setting-input-key">PAC ${t.__("script")}</span>
+            <span class="setting-input-key">${t.__("PAC script")}</span>
             <input
               class="setting-input-value"
               placeholder="e.g. foobar.com/pacfile.js"
diff --git a/app/renderer/js/pages/preference/new-server-form.ts b/app/renderer/js/pages/preference/new-server-form.ts
@@ -23,7 +23,9 @@ export function initNewServerForm({
         <input
           class="setting-input-value"
           autofocus
-          placeholder="your-organization.zulipchat.com or zulip.your-organization.com"
+          placeholder="${t.__(
+            "your-organization.zulipchat.com or zulip.your-organization.com",
+          )}"
         />
       </div>
       <div class="server-center">
@@ -60,12 +62,12 @@ export function initNewServerForm({
   )!;
 
   async function submitFormHandler(): Promise<void> {
-    $saveServerButton.textContent = "Connecting...";
+    $saveServerButton.textContent = t.__("Connecting…");
     let serverConfig;
     try {
       serverConfig = await DomainUtil.checkDomain($newServerUrl.value.trim());
     } catch (error: unknown) {
-      $saveServerButton.textContent = "Connect";
+      $saveServerButton.textContent = t.__("Connect");
       await dialog.showMessageBox({
         type: "error",
         message:
diff --git a/app/renderer/js/tray.ts b/app/renderer/js/tray.ts
@@ -7,6 +7,7 @@ import {BrowserWindow, Menu, Tray} from "@electron/remote";
 
 import * as ConfigUtil from "../../common/config-util.ts";
 import {publicPath} from "../../common/paths.ts";
+import * as t from "../../common/translation-util.ts";
 import type {RendererMessage} from "../../common/typed-ipc.ts";
 
 import type {ServerManagerView} from "./main.ts";
@@ -147,13 +148,13 @@ function sendAction<Channel extends keyof RendererMessage>(
 const createTray = function (): void {
   const contextMenu = Menu.buildFromTemplate([
     {
-      label: "Zulip",
+      label: t.__("Zulip"),
       click() {
         ipcRenderer.send("focus-app");
       },
     },
     {
-      label: "Settings",
+      label: t.__("Settings"),
       click() {
         ipcRenderer.send("focus-app");
         sendAction("open-settings");
@@ -163,7 +164,7 @@ const createTray = function (): void {
       type: "separator",
     },
     {
-      label: "Quit",
+      label: t.__("Quit"),
       click() {
         ipcRenderer.send("quit-app");
       },
@@ -202,12 +203,17 @@ export function initializeTray(serverManagerView: ServerManagerView) {
       if (argument === 0) {
         unread = argument;
         tray.setImage(iconPath());
-        tray.setToolTip("No unread messages");
+        tray.setToolTip(t.__("No unread messages"));
       } else {
         unread = argument;
         const image = renderNativeImage(argument);
         tray.setImage(image);
-        tray.setToolTip(`${argument} unread messages`);
+        tray.setToolTip(
+          t.__mf(
+            "{number, plural, one {# unread message} other {# unread messages}}",
+            {number: `${argument}`},
+          ),
+        );
       }
     }
   });
diff --git a/app/renderer/js/utils/reconnect-util.ts b/app/renderer/js/utils/reconnect-util.ts
@@ -2,6 +2,7 @@ import * as backoff from "backoff";
 
 import {html} from "../../../common/html.ts";
 import Logger from "../../../common/logger-util.ts";
+import * as t from "../../../common/translation-util.ts";
 import type WebView from "../components/webview.ts";
 import {ipcRenderer} from "../typed-ipc-renderer.ts";
 
@@ -55,8 +56,10 @@ export default class ReconnectUtil {
     const errorMessageHolder = document.querySelector("#description");
     if (errorMessageHolder) {
       errorMessageHolder.innerHTML = html`
-        <div>Your internet connection doesn't seem to work properly!</div>
-        <div>Verify that it works and then click try again.</div>
+        <div>
+          ${t.__("Your internet connection doesn't seem to work properly!")}
+        </div>
+        <div>${t.__("Verify that it works and then click Reconnect.")}</div>
       `.html;
     }
 
diff --git a/i18next-parser.config.ts b/i18next-parser.config.ts
@@ -8,7 +8,7 @@ const config: UserConfig = {
   input: ["app/**/*.ts"],
   keySeparator: false,
   lexers: {
-    ts: [{lexer: "JavascriptLexer", functions: ["t.__"]}],
+    ts: [{lexer: "JavascriptLexer", functions: ["t.__", "t.__mf"]}],
   },
   locales: ["en"],
   namespaceSeparator: false,
diff --git a/public/translations/en.json b/public/translations/en.json
