Fix plural forms structure in POEditor scripts

- Add restructurePluralForms() to downloader: converts POEditor export format to correct structure
- Add defensive restructurePluralForms() to uploader: handles malformed files automatically
- Ensures batch files are saved with proper plural nesting: { term: { one: ..., other: ... } }
- Fixes issue where POEditor's export returns { one: { terms }, other: { terms } } format

Author: DawoudIO

locale/scripts/poeditor-downloader.js

@@ -139,11 +139,39 @@ async function fetchUntranslatedTerms(poEditorLocale) {
     });
 }
 
+/**
+ * Restructure POEditor export from malformed to correct format for upload.
+ * POEditor returns: { "one": { term1: "...", term2: "..." }, "other": { ... } }
+ * We need: { "term1": { "one": "...", "other": "..." }, "term2": { ... } }
+ */
+function restructurePluralForms(data) {
+    if (!data.one && !data.other) return data;
+    if (typeof data.one === 'object' && typeof data.other === 'object') {
+        const restructured = {};
+        for (const [key, value] of Object.entries(data)) {
+            if (key !== 'one' && key !== 'other' && typeof value === 'string') {
+                restructured[key] = value;
+            }
+        }
+        const termKeys = new Set([...Object.keys(data.one || {}), ...Object.keys(data.other || {})]);
+        for (const term of termKeys) {
+            const pluralForms = {};
+            if (data.one && data.one[term]) pluralForms.one = data.one[term];
+            if (data.other && data.other[term]) pluralForms.other = data.other[term];
+            if (Object.keys(pluralForms).length > 0) restructured[term] = pluralForms;
+        }
+        return restructured;
+    }
+    return data;
+}
+
 /**
  * Save missing terms in batched JSON files under MISSING_OUTPUT_DIR/{poEditorCode}/
  * Returns array of written file paths.
  */
 function saveBatchedMissingTerms(poEditorCode, missingTerms) {
+    missingTerms = restructurePluralForms(missingTerms);
+
     const localeOutDir = path.join(MISSING_OUTPUT_DIR, poEditorCode);
 
     if (!fs.existsSync(localeOutDir)) {

locale/scripts/poeditor-upload-missing.js

@@ -188,6 +188,33 @@ function loadEnglishOkAllowlist() {
     }
 }
 
+// ── Plural form restructuring ───────────────────────────────────────────────
+
+/**
+ * Defensive restructure for malformed plural forms from POEditor export.
+ * If batch file has top-level "one"/"other", fixes to proper nesting.
+ */
+function restructurePluralForms(data) {
+    if (!data.one && !data.other) return data;
+    if (typeof data.one === 'object' && typeof data.other === 'object') {
+        const restructured = {};
+        for (const [key, value] of Object.entries(data)) {
+            if (key !== 'one' && key !== 'other' && typeof value === 'string') {
+                restructured[key] = value;
+            }
+        }
+        const termKeys = new Set([...Object.keys(data.one || {}), ...Object.keys(data.other || {})]);
+        for (const term of termKeys) {
+            const pluralForms = {};
+            if (data.one && data.one[term]) pluralForms.one = data.one[term];
+            if (data.other && data.other[term]) pluralForms.other = data.other[term];
+            if (Object.keys(pluralForms).length > 0) restructured[term] = pluralForms;
+        }
+        return restructured;
+    }
+    return data;
+}
+
 // ── Term analysis ────────────────────────────────────────────────────────────
 
 /**
@@ -229,7 +256,8 @@ function isNotIdenticalToKey(termKey, value) {
  * @param {Set<string>} [englishOkSet] - optional set of terms safe to upload as-is
  */
 function analyzeFile(filePath, englishOkSet = new Set()) {
-    const raw = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    let raw = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    raw = restructurePluralForms(raw); // Defensive: fix malformed plural structure if present
     const localizedTerms = {};
     const suspectTerms = {};
     const emptyTerms = {};