fix terms/aliases not being expanded for en.json (#280)

Co-authored-by: Martin Raifer <martin@raifer.tech>

Author: k-yle

lib/build.js

@@ -9,7 +9,7 @@ import marky from 'marky';
 import { createRequire } from 'module';
 import { compile, toSafeIdentifier } from 'json-schema-to-typescript-lite';
 
-import fetchTranslations, { sortObject } from './translations.js';
+import fetchTranslations, { expandTStrings, sortObject } from './translations.js';
 
 const require = createRequire(import.meta.url);
 
@@ -177,6 +177,7 @@ function processData(options, type) {
   if (deprecated) fs.writeFileSync(distDir + '/deprecated.json', JSON.stringify(deprecated, null, 4));
   if (discarded) fs.writeFileSync(distDir + '/discarded.json', JSON.stringify(discarded, null, 4));
 
+  expandTStrings(tstrings);
   let translationsForJson = {};
   translationsForJson[sourceLocale] = { presets: tstrings };
 

lib/translations.js

@@ -4,6 +4,72 @@ import fetch from 'node-fetch';
 import YAML from 'js-yaml';
 import { transifexApi } from '@transifex/api';
 
+export function expandTStrings(tstrings) {
+  const presets = tstrings.presets || {};
+  for (const key of Object.keys(presets)) {
+    let preset = presets[key];
+
+    if (preset.name) {
+        let names = preset.name.split('\n').map(s => s.trim()).filter(Boolean);
+        preset.name = names[0];
+        if (names.length > 1) {
+            preset.aliases = names.slice(1);
+        }
+    }
+    if (typeof preset.aliases === 'string') {
+      preset.aliases = preset.aliases.split('\n');
+    }
+
+    if (!preset.terms) continue;
+
+    // remove duplicates
+    preset.terms = Array.from(new Set(
+        // remove translation message if it was included somehow
+        preset.terms.replace(/<.*>/, '')
+          // convert to an array
+          .split(',')
+          // make everything lowercase and remove whitespace
+          .map(s => s.toLowerCase().trim())
+          // remove empty strings
+          .filter(Boolean)
+      ));
+
+    if (!preset.terms.length) {
+      // no need to include empty terms
+      delete preset.terms;
+      if (!Object.keys(preset).length) {
+        delete presets[key];
+      }
+    }
+  }
+
+  const fields = tstrings.fields || {};
+  for (const key of Object.keys(fields)) {
+    let field = fields[key];
+    if (!field.terms) continue;
+
+    // remove duplicates
+    field.terms = Array.from(new Set(
+      // remove translation message if it was included somehow
+      field.terms.replace(/\[.*\]/, '')
+      // convert to an array
+      .split(/[,،]/)
+      // make everything lowercase and remove whitespace
+      .map(s => s.toLowerCase().trim())
+      // remove empty strings
+      .filter(Boolean)
+    ));
+
+    if (!field.terms.length) {
+      // no need to include empty terms
+      delete field.terms;
+      if (!Object.keys(field).length) {
+        delete fields[key];
+      }
+    }
+  }
+}
+
 /**
  * Sorts the keys of an object alphabetically
  * @template {object} T @param {T} original @returns {T}
@@ -124,67 +190,7 @@ function fetchTranslations(options) {
 
         let locale = {};
         results.forEach((result, i) => {
-          let presets = (result.presets && result.presets.presets) || {};
-          for (const key of Object.keys(presets)) {
-            let preset = presets[key];
-
-            if (preset.name) {
-                let names = preset.name.split('\n').map(s => s.trim()).filter(Boolean);
-                preset.name = names[0];
-                if (names.length > 1) {
-                    preset.aliases = names.slice(1);
-                }
-            }
-
-            if (!preset.terms) continue;
-
-            // remove duplicates
-            preset.terms = Array.from(new Set(
-                // remove translation message if it was included somehow
-                preset.terms.replace(/<.*>/, '')
-                  // convert to an array
-                  .split(',')
-                  // make everything lowercase and remove whitespace
-                  .map(s => s.toLowerCase().trim())
-                  // remove empty strings
-                  .filter(Boolean)
-              ));
-
-            if (!preset.terms.length) {
-              // no need to include empty terms
-              delete preset.terms;
-              if (!Object.keys(preset).length) {
-                delete presets[key];
-              }
-            }
-          }
-
-          let fields = (result.presets && result.presets.fields) || {};
-          for (const key of Object.keys(fields)) {
-            let field = fields[key];
-            if (!field.terms) continue;
-
-            // remove duplicates
-            field.terms = Array.from(new Set(
-              // remove translation message if it was included somehow
-              field.terms.replace(/\[.*\]/, '')
-              // convert to an array
-              .split(/[,،]/)
-              // make everything lowercase and remove whitespace
-              .map(s => s.toLowerCase().trim())
-              // remove empty strings
-              .filter(Boolean)
-            ));
-
-            if (!field.terms.length) {
-              // no need to include empty terms
-              delete field.terms;
-              if (!Object.keys(field).length) {
-                delete fields[key];
-              }
-            }
-          }
-
+          expandTStrings(result.presets || {});
           locale[codes[i]] = result;
         });