@eui/tools 6.11.22 → 6.11.24

package/.version.properties

@@ -1 +1 @@
-6.11.22
+6.11.24

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.11.24 (2023-06-01)
+
+##### Bug Fixes
+
+* **other:**
+  * eUI not taken into account in i18n compilation pre-build - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([02b06f1c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/02b06f1c4346060dead95958c16d5c6d0232e72a))
+
+* * *
+* * *
+## 6.11.23 (2023-05-31)
+
+##### Chores
+
+* **other:**
+  * adapted pre-build translations compilation tool for handling additional folders through config - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([183da80a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/183da80a893ec264306290f754aa65c2945e9fd8))
+
+* * *
+* * *
 ## 6.11.22 (2023-05-15)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.11.22",
+    "version": "6.11.24",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/utils/pre-build/translations/elements.js

@@ -72,7 +72,7 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
       tools.logInfo(`langs: ${langs}`);
       tools.logInfo(`dest folder: ${destFolder}`);
       tools.logInfo(`total packages: ${packages.length}`);
-      tools.logInfo(packages);
+      tools.logInfo(JSON.stringify(packages, null, 1));
     })
 
     .then(() => {
@@ -88,25 +88,16 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
             addTranslation(file, lang);
 
             // Add module translations
-            packages.forEach((pkg) => {
+            packages.forEach((pkgDeps) => {
                 let baseI18nPath = 'i18n';
-                if (pkg.scope === '@eui') {
+                if (pkgDeps.scope === '@eui') {
                   baseI18nPath = 'i18n-eui';
                 }
-                file = path.join(pkg.folder, `assets/${baseI18nPath}/${lang}.json`);
-
-                tools.logInfo(`Adding translations from ${pkg.folder}`);
-                if (tools.isFileExists(file)) {
-                  tools.logInfo(`${file} found...adding`);
-                  addTranslation(file, lang)
-                } else {
-                  file = path.join(pkg.folder, `assets/i18n/${lang}.json`);
-                  if (tools.isFileExists(file)) {
-                    tools.logInfo(`${file} found...adding`);
-                    addTranslation(file, lang)
-                  } else {
-                    tools.logInfo(`${file} not found...skipping`);
-                  }
+                processTranslationsFolder(pkgDeps, baseI18nPath, lang);
+
+                // process additional translation folders if set as option in config
+                if (pkg.build && pkg.build.translationAdditionalFolders) {
+                  processTranslationsFolder(pkgDeps, pkg.build.translationAdditionalFolders, lang);
                 }
             });
 
@@ -138,6 +129,26 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
                 }
             }
         }
+
+        function processTranslationsFolder(pkg, folder, lang) {
+          tools.logInfo(`------>Scanning ${folder}`);
+
+          let file = path.join(pkg.folder, `assets/${folder}/${lang}.json`);
+
+          tools.logInfo(`Adding translations from ${pkg.folder}`);
+          if (tools.isFileExists(file)) {
+            tools.logInfo(`${file} found...adding`);
+            addTranslation(file, lang)
+          } else {
+            file = path.join(pkg.folder, `assets/i18n/${lang}.json`);
+            if (tools.isFileExists(file)) {
+              tools.logInfo(`${file} found...adding`);
+              addTranslation(file, lang)
+            } else {
+              tools.logInfo(`${file} not found...skipping`);
+            }
+          }
+        }
     })
     .catch((e) => {
       throw e;