Merge branch 'integration' into FIX_ICONS

LiteFarmOrg · Sep 25, 2024 · 7c9873d · 7c9873d
2 parents 57835af + d575242
commit 7c9873d
Show file tree

Hide file tree

Showing 170 changed files with 32,830 additions and 13,425 deletions.
diff --git a/.github/workflows/automated_tests.yml b/.github/workflows/automated_tests.yml
@@ -4,12 +4,13 @@ on:
   pull_request:
     branches:
       - integration
+      - "patch/**"
 
 jobs:
   api_unit_tests:
     name: API Unit Tests
     runs-on: ubuntu-20.04
-    container: node:16.15.0
+    container: node:18.16.1
     services:
       postgres:
         image: postgres:13

diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
@@ -11,18 +11,30 @@ jobs:
       max-parallel: 1 # Should be 1 to avoid parallel builds
       matrix:
         locales: [
-            # Frontend core translations
+            # Frontend core i18n public translations
             {
               name: webapp_locales,
               source: packages/webapp/public/locales/en/*.json,
               translation: packages/webapp/public/locales/%two_letters_code%/%original_file_name%,
             },
+            # Frontend compiled translations
+            {
+              name: webapp_compiled_locales,
+              source: packages/webapp/src/locales/en/*.json,
+              translation: packages/webapp/src/locales/%two_letters_code%/%original_file_name%,
+            },
             # Consent Forms
             {
               name: webapp_consent,
               source: packages/webapp/src/containers/Consent/locales/en/*.md,
               translation: packages/webapp/src/containers/Consent/locales/%two_letters_code%/%original_file_name%,
             },
+            # Shared translations
+            {
+              name: shared_locales,
+              source: packages/shared/locales/en/*.json,
+              translation: packages/shared/locales/%two_letters_code%/%original_file_name%,
+            },
             # Backend tranlsations - skipping pdf (crop.json is copied jobs scheduler init during build)
             {
               name: api_job_locales,

diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml
@@ -20,16 +20,26 @@ jobs:
       max-parallel: 1 # Should be 1 to avoid parallel builds
       matrix:
         locales: [
-            # Frontend core translations
+            # Frontend core i18n public translations
             {
               source: packages/webapp/public/locales/en/*.json,
               translation: packages/webapp/public/locales/%two_letters_code%/%original_file_name%,
             },
+            # Frontend compiled translations
+            {
+              source: packages/webapp/src/locales/en/*.json,
+              translation: packages/webapp/src/locales/%two_letters_code%/%original_file_name%,
+            },
             # Consent Forms
             {
               source: packages/webapp/src/containers/Consent/locales/en/*.md,
               translation: packages/webapp/src/containers/Consent/locales/%two_letters_code%/%original_file_name%,
             },
+            # Shared translations
+            {
+              source: packages/shared/locales/en/*.json,
+              translation: packages/shared/locales/%two_letters_code%/%original_file_name%,
+            },
             # Backend tranlsations - skipping pdf (crop.json is copied jobs scheduler init during build)
             {
               source: packages/api/src/jobs/locales/en/*.json,

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/api/babel.config.cjs b/packages/api/babel.config.cjs
@@ -10,6 +10,7 @@ module.exports = {
   ],
   "plugins": [
     "transform-es2015-modules-commonjs",
-    "babel-plugin-transform-import-meta"
+    "babel-plugin-transform-import-meta",
+    "@babel/plugin-syntax-import-assertions"
   ]
 }
diff --git a/packages/api/dev.export.sh b/packages/api/dev.export.sh
@@ -7,6 +7,10 @@ cp ../webapp/public/locales/en/crop.json src/jobs/locales/en
 cp ../webapp/public/locales/es/crop.json src/jobs/locales/es
 cp ../webapp/public/locales/pt/crop.json src/jobs/locales/pt
 cp ../webapp/public/locales/fr/crop.json src/jobs/locales/fr
+cp ../webapp/public/locales/de/crop.json src/jobs/locales/de
+cp ../webapp/public/locales/hi/crop.json src/jobs/locales/hi
+cp ../webapp/public/locales/pa/crop.json src/jobs/locales/pa
+cp ../webapp/public/locales/ml/crop.json src/jobs/locales/ml
 
 # Give nodemon time to restart the API
 sleep 10