Merge pull request CyberTimon#1390 from VailElla/codex/i18n-plural-sync

fix(i18n): synchronize locale plural forms

Author: CyberTimon

i18next.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig } from 'i18next-cli';
 
 export default defineConfig({
-  locales: ['en', 'de', 'pl', 'zh-CN', 'zh-TW', 'es', 'fr', 'it', 'pt', 'ja', 'ru'],
+  locales: ['en', 'de', 'pl', 'zh-CN', 'zh-TW', 'es', 'fr', 'it', 'pt', 'ja', 'ko', 'ru'],
   extract: {
     input: ['src/**/*.{ts,tsx}'],
     output: 'src/i18n/locales/{{language}}.json',

package.json

@@ -13,7 +13,8 @@
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "i18n:extract": "i18next-cli extract",
-    "i18n:check": "i18next-cli extract --ci --dry-run",
+    "i18n:check": "i18next-cli extract --ci --dry-run && npm run i18n:runtime-check",
+    "i18n:runtime-check": "node src/i18n/check-runtime.mjs",
     "i18n:lint": "i18next-cli lint"
   },
   "dependencies": {

src/i18n/check-runtime.mjs

@@ -0,0 +1,116 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import i18next from 'i18next';
+
+const scriptDir = path.dirname(fileURLToPath(import.meta.url));
+const localeDir = path.resolve(scriptDir, 'locales');
+const pluralSuffix = /_(zero|one|two|few|many|other)$/;
+const countCandidates = [
+  ...Array.from({ length: 201 }, (_, count) => count),
+  0.1,
+  1.1,
+  2.1,
+  5.1,
+  10.1,
+  1_000,
+  1_000_000,
+];
+
+const flatten = (object, prefix = '', leaves = new Map()) => {
+  for (const [key, value] of Object.entries(object)) {
+    const fullKey = prefix ? `${prefix}.${key}` : key;
+    if (value && typeof value === 'object' && !Array.isArray(value)) {
+      flatten(value, fullKey, leaves);
+    } else {
+      leaves.set(fullKey, value);
+    }
+  }
+  return leaves;
+};
+
+const localeFiles = fs
+  .readdirSync(localeDir)
+  .filter((filename) => filename.endsWith('.json'))
+  .sort();
+const resources = {};
+const pluralKeysByLocale = new Map();
+const failures = [];
+
+for (const filename of localeFiles) {
+  const locale = path.basename(filename, '.json');
+  const translations = JSON.parse(fs.readFileSync(path.join(localeDir, filename), 'utf8'));
+  const leaves = flatten(translations);
+  const pluralKeys = new Set();
+
+  for (const [key, value] of leaves) {
+    if (value === '') {
+      failures.push(`${locale}:${key} is empty`);
+    }
+    if (pluralSuffix.test(key)) {
+      pluralKeys.add(key.replace(pluralSuffix, ''));
+    }
+  }
+
+  resources[locale] = { translation: translations };
+  pluralKeysByLocale.set(locale, pluralKeys);
+}
+
+const i18n = i18next.createInstance();
+await i18n.init({
+  resources,
+  lng: 'en',
+  fallbackLng: 'en',
+  returnEmptyString: false,
+  interpolation: {
+    escapeValue: false,
+  },
+});
+
+let checkedResolutions = 0;
+
+for (const filename of localeFiles) {
+  const locale = path.basename(filename, '.json');
+  const pluralRules = new Intl.PluralRules(locale);
+  const sampleByCategory = new Map();
+
+  for (const count of countCandidates) {
+    const category = pluralRules.select(count);
+    if (!sampleByCategory.has(category)) {
+      sampleByCategory.set(category, count);
+    }
+  }
+
+  for (const category of pluralRules.resolvedOptions().pluralCategories) {
+    if (!sampleByCategory.has(category)) {
+      failures.push(`${locale}: no test count found for plural category ${category}`);
+    }
+  }
+
+  for (const key of pluralKeysByLocale.get(locale)) {
+    for (const [category, count] of sampleByCategory) {
+      const details = i18n.t(key, { lng: locale, count, returnDetails: true });
+      const expectedKey = `${key}_${category}`;
+      checkedResolutions += 1;
+
+      if (details.usedLng !== locale) {
+        failures.push(`${locale}:${expectedKey} resolved through ${details.usedLng}`);
+      }
+      if (details.exactUsedKey !== expectedKey) {
+        failures.push(`${locale}:${expectedKey} resolved as ${details.exactUsedKey}`);
+      }
+      if (typeof details.res !== 'string' || details.res.trim() === '') {
+        failures.push(`${locale}:${expectedKey} resolved to an empty value`);
+      }
+    }
+  }
+}
+
+if (failures.length > 0) {
+  console.error(`i18n runtime validation failed with ${failures.length} issue(s):`);
+  failures.forEach((failure) => console.error(`- ${failure}`));
+  process.exitCode = 1;
+} else {
+  console.log(`Validated ${checkedResolutions} plural resolutions across ${localeFiles.length} locales.`);
+}

src/i18n/index.ts

@@ -31,6 +31,7 @@ i18n.use(initReactI18next).init({
   },
   lng: 'en',
   fallbackLng: 'en',
+  returnEmptyString: false,
   interpolation: {
     escapeValue: false,
   },

src/i18n/locales/de.json

@@ -66,13 +66,13 @@
       "whiteBalance": "Weißabgleich"
     },
     "curves": {
-      "channelTitle": "{{channel}}-Kanal",
       "channels": {
         "blue": "Blau",
         "green": "Grün",
         "luma": "Luma",
         "red": "Rot"
       },
+      "channelTitle": "{{channel}}-Kanal",
       "copyParametric": "Parametrische {{channel}}-Kurve kopieren",
       "copyPoint": "Punktkurve ({{channel}}) kopieren",
       "curveDataUnavailable": "Kurvendaten nicht verfügbar.",
@@ -365,7 +365,11 @@
         "aiEdit_one": "KI-Bearbeitung {{count}}",
         "aiEdit_other": "KI-Bearbeitung {{count}}",
         "clone": "Klonen {{count}}",
+        "clone_one": "Klonen {{count}}",
+        "clone_other": "Klonen {{count}}",
         "heal": "Reparieren {{count}}",
+        "heal_one": "Reparieren {{count}}",
+        "heal_other": "Reparieren {{count}}",
         "invertedName": "{{name}} umgekehrt",
         "quickErase": "Schnelles Löschen {{count}}",
         "quickErase_one": "Schnelles Löschen {{count}}",
@@ -636,8 +640,8 @@
       "organization": {
         "addTagPlaceholder": "Tag hinzufügen...",
         "colorLabel": "Farbmarkierung",
-        "noTags": "Keine Tags",
         "none": "Keine",
+        "noTags": "Keine Tags",
         "rating": "Bewertung",
         "ratingLabels": "Bewertung & Markierungen",
         "tags": "Tags",
@@ -780,12 +784,12 @@
       "estimatedSize": "Geschätzte Dateigröße: ~{{size}}",
       "estimatedTotalSize": "Geschätzte Gesamtgröße: ~{{size}}",
       "estimatingSize": "Größe wird geschätzt...",
+      "exporting": "Wird exportiert…",
+      "exportingProgress": "Wird exportiert… ({{current}}/{{total}})",
       "exportMultiple": "Exportiere {{count}} {{label}}",
       "exportMultiple_one": "Exportiere {{count}} {{label}}",
       "exportMultiple_other": "Exportiere {{count}} {{label}}",
       "exportSingle": "{{label}} exportieren",
-      "exporting": "Wird exportiert…",
-      "exportingProgress": "Wird exportiert… ({{current}}/{{total}})",
       "failed": "Export fehlgeschlagen",
       "noImageSelected": "Kein Bild zum Exportieren ausgewählt.",
       "noImagesSelected": "Keine Bilder ausgewählt.",
@@ -1126,9 +1130,9 @@
       "applyButton_one": "Auf 1 Bild anwenden",
       "applyButton_other": "Auf {{count}} Bilder anwenden",
       "bestImage": "Bestes Bild",
+      "blurryImagesTab": "Unscharfe Bilder",
       "blurThreshold": "Unschärfe-Schwellenwert",
       "blurThresholdDesc": "Bilder mit einem Schärfewert unter diesem Wert werden markiert. Höher ist strenger.",
-      "blurryImagesTab": "Unscharfe Bilder",
       "cancel": "Abbrechen",
       "close": "Schließen",
       "cullingFailed": "Aussortieren fehlgeschlagen",
@@ -1649,8 +1653,8 @@
     "tagging": {
       "addCustomPlaceholder": "Benutzerdefinierte KI-Tags hinzufügen (kommagetrennt)...",
       "addCustomTooltip": "KI-Tag hinzufügen",
-      "addShortcutTooltip": "Shortcut hinzufügen",
       "addShortcutsPlaceholder": "Shortcuts hinzufügen (kommagetrennt)...",
+      "addShortcutTooltip": "Shortcut hinzufügen",
       "aiTagging": "KI-Tagging",
       "aiTaggingDesc": "Aktiviert automatisches Bild-Tagging mit einem KI-Modell (CLIP). Dies lädt ein zusätzliches Modell herunter und beeinträchtigt die Leistung beim Durchsuchen.",
       "amount": "Betrag",

src/i18n/locales/en.json

@@ -66,13 +66,13 @@
       "whiteBalance": "White Balance"
     },
     "curves": {
-      "channelTitle": "{{channel}} Channel",
       "channels": {
         "blue": "Blue",
         "green": "Green",
         "luma": "Luma",
         "red": "Red"
       },
+      "channelTitle": "{{channel}} Channel",
       "copyParametric": "Copy {{channel}} Parametric Curve",
       "copyPoint": "Copy {{channel}} Point Curve",
       "curveDataUnavailable": "Curve data not available.",
@@ -365,7 +365,11 @@
         "aiEdit_one": "AI Edit {{count}}",
         "aiEdit_other": "AI Edit {{count}}",
         "clone": "Clone {{count}}",
+        "clone_one": "Clone {{count}}",
+        "clone_other": "Clone {{count}}",
         "heal": "Heal {{count}}",
+        "heal_one": "Heal {{count}}",
+        "heal_other": "Heal {{count}}",
         "invertedName": "{{name}} Inverted",
         "quickErase": "Quick Erase {{count}}",
         "quickErase_one": "Quick Erase {{count}}",
@@ -636,8 +640,8 @@
       "organization": {
         "addTagPlaceholder": "Add tag...",
         "colorLabel": "Color Label",
-        "noTags": "No tags",
         "none": "None",
+        "noTags": "No tags",
         "rating": "Rating",
         "ratingLabels": "Rating & Labels",
         "tags": "Tags",
@@ -780,12 +784,12 @@
       "estimatedSize": "Estimated file size: ~{{size}}",
       "estimatedTotalSize": "Estimated total size: ~{{size}}",
       "estimatingSize": "Estimating size...",
+      "exporting": "Exporting…",
+      "exportingProgress": "Exporting… ({{current}}/{{total}})",
       "exportMultiple": "Export {{count}} {{label}}",
       "exportMultiple_one": "Export {{count}} {{label}}",
       "exportMultiple_other": "Export {{count}} {{label}}",
       "exportSingle": "Export {{label}}",
-      "exporting": "Exporting…",
-      "exportingProgress": "Exporting… ({{current}}/{{total}})",
       "failed": "Export failed",
       "noImageSelected": "No image selected for export.",
       "noImagesSelected": "No images selected.",
@@ -1126,9 +1130,9 @@
       "applyButton_one": "Apply to 1 image",
       "applyButton_other": "Apply to {{count}} images",
       "bestImage": "Best Image",
+      "blurryImagesTab": "Blurry Images",
       "blurThreshold": "Blur Threshold",
       "blurThresholdDesc": "Images with a sharpness score below this value are flagged. Higher is stricter.",
-      "blurryImagesTab": "Blurry Images",
       "cancel": "Cancel",
       "close": "Close",
       "cullingFailed": "Culling Failed",
@@ -1649,8 +1653,8 @@
     "tagging": {
       "addCustomPlaceholder": "Add custom AI tags (comma separated)...",
       "addCustomTooltip": "Add AI tag",
-      "addShortcutTooltip": "Add Shortcut",
       "addShortcutsPlaceholder": "Add shortcuts (comma separated)...",
+      "addShortcutTooltip": "Add Shortcut",
       "aiTagging": "AI Tagging",
       "aiTaggingDesc": "Enables automatic image tagging using an AI (CLIP) model. This will download an additional model and impact performance while browsing folders. Tags are used for searching a folder.",
       "amount": "Amount",