Merge pull request #3508 from LiteFarmOrg/patch/translations

Patch/3.6.8
LiteFarmOrg · Oct 24, 2024 · b1b7843 · b1b7843
2 parents 191024b + 22adeb8
commit b1b7843
Show file tree

Hide file tree

Showing 142 changed files with 9,169 additions and 2,485 deletions.
diff --git a/.github/workflows/automated_tests.yml b/.github/workflows/automated_tests.yml
@@ -4,11 +4,12 @@ on:
   pull_request:
     branches:
       - integration
+      - "patch/**"
 
 jobs:
   automated_tests:
     runs-on: ubuntu-20.04
-    container: node:16.15.0
+    container: node:18.16.1
     services:
       postgres:
         image: postgres:13

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/package-lock.json b/packages/api/package-lock.json
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "litefarm-api",
-  "version": "3.6.7",
+  "version": "3.6.8",
   "description": "LiteFarm API server",
   "main": "./api/src/server.js",
   "type": "module",

diff --git a/packages/api/src/controllers/managementPlanController.js b/packages/api/src/controllers/managementPlanController.js
@@ -58,7 +58,7 @@ const managementPlanController = {
         const managementPlanGraph = await ManagementPlanModel.query(trx)
           .where('management_plan_id', management_plan_id)
           .withGraphFetched(
-            'crop_management_plan.[planting_management_plans.[managementTasks.[task.[pest_control_task, irrigation_task, scouting_task, soil_task, soil_amendment_task, soil_amendment_task_products.[purpose_relationships], field_work_task, harvest_task, cleaning_task, locationTasks]], plant_task.[task.[locationTasks]], transplant_task.[task.[locationTasks]], bed_method, container_method, broadcast_method, row_method]]',
+            'crop_management_plan.[planting_management_plans.[managementTasks.[task.[pest_control_task, irrigation_task, scouting_task, soil_task, soil_amendment_task, soil_amendment_task_products(filterDeleted).[purpose_relationships], field_work_task, harvest_task, cleaning_task, locationTasks]], plant_task.[task.[locationTasks]], transplant_task.[task.[locationTasks]], bed_method, container_method, broadcast_method, row_method]]',
           )
           .modifyGraph(
             'crop_management_plan.[planting_management_plans.managementTasks]',

diff --git a/packages/api/src/controllers/sensorController.js b/packages/api/src/controllers/sensorController.js
@@ -43,11 +43,17 @@ import knex from '../util/knex.js';
 const getSensorTranslations = async (language) => {
   // Remove country identifier from language preference
   const parsedLanguage = language.includes('-') ? language.split('-')[0] : language;
-  let translations = await import(`../../../shared/locales/${parsedLanguage}/sensorCSV.json`, {
-    assert: { type: 'json' },
-  });
-  // Default to english in case where user language not supported
-  if (!translations) {
+  let translations;
+  try {
+    translations = await import(`../../../shared/locales/${parsedLanguage}/sensorCSV.json`, {
+      assert: { type: 'json' },
+    });
+    // Default to english in case where user language not supported
+    if (!translations) {
+      throw 'Translations not found';
+    }
+  } catch (error) {
+    console.log(error);
     translations = await import(`../../../shared/locales/en/sensorCSV.json`, {
       assert: { type: 'json' },
     });

diff --git a/packages/api/src/jobs/locales/i18n.js b/packages/api/src/jobs/locales/i18n.js
@@ -4,14 +4,7 @@ import Backend from 'i18next-fs-backend';
 i18n.use(Backend).init(
   {
     fallbackLng: 'en',
-    preload: [
-      'en',
-      'es',
-      'pt',
-      'fr',
-      'de',
-      // 'hi', 'pa', 'ml'
-    ],
+    preload: ['en', 'es', 'pt', 'fr', 'de', 'hi', 'pa', 'ml'],
     ns: ['translation', 'crop'],
     defaultNS: 'translation',
     nsSeparator: ':',

diff --git a/packages/api/src/jobs/locales/i18next-parser.config.js b/packages/api/src/jobs/locales/i18next-parser.config.js
@@ -2,12 +2,5 @@ export default {
   output: 'src/jobs/locales/$LOCALE/$NAMESPACE.json',
   sort: true,
   defaultValue: 'MISSING',
-  locales: [
-    'en',
-    'es',
-    'pt',
-    'fr',
-    'de',
-    // 'hi', 'pa', 'ml'
-  ],
+  locales: ['en', 'es', 'pt', 'fr', 'de', 'hi', 'pa', 'ml'],
 };
diff --git a/packages/api/src/jobs/locales/ml/readme.pdf b/packages/api/src/jobs/locales/ml/readme.pdf
diff --git a/packages/api/src/jobs/locales/ml/translation.json b/packages/api/src/jobs/locales/ml/translation.json
@@ -1,5 +1,5 @@
 {
-  "EXPORT_README_TITLE": "നിങ്ങളുടെ സർട്ടിഫിക്കേഷൻ എക്സ്പോർറ്റ് മനസ്സിലാക്കുന്നു",
+  "EXPORT_README_TITLE": "നിങ്ങളുടെ സർട്ടിഫിക്കേഷൻ എക്സ്‌പോർട്ട് മനസ്സിലാക്കുന്നു",
   "N": "ഇല്ല",
   "N/A": "ബാധകമല്ല",
   "NO": "ഇല്ല",

diff --git a/packages/api/src/server.js b/packages/api/src/server.js
@@ -39,7 +39,7 @@ if (process.env.SENTRY_DSN && environment !== 'development') {
       // Automatically instrument Node.js libraries and frameworks
       ...Sentry.autoDiscoverNodePerformanceMonitoringIntegrations(),
     ],
-    release: '3.6.7',
+    release: '3.6.8',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production

diff --git a/packages/api/src/templates/emails/style.css b/packages/api/src/templates/emails/style.css
@@ -1,106 +1,108 @@
 .background {
-    font-family: "Open Sans", "SansSerif", sans-serif !important;
-    background: #FAFAFD !important;
-    margin: 0 !important;
-    padding-bottom: 34px !important;
+  font-family: 'Open Sans', 'SansSerif', sans-serif, 'Manjari' !important;
+  background: #fafafd !important;
+  margin: 0 !important;
+  padding-bottom: 34px !important;
 }
 
 .header {
-    background: #C7EFD3 !important;
+  background: #c7efd3 !important;
 }
 
 #logo {
-    height: 48px !important;
-    display: block !important;
-    margin: auto !important;
-    padding: 0px 28px !important;
-    background: white !important;
+  height: 48px !important;
+  display: block !important;
+  margin: auto !important;
+  padding: 0px 28px !important;
+  background: white !important;
 }
 
 .main-container {
-    background: white !important;
-    margin: auto !important;
-    width: 95% !important;
-    max-width: 568px !important;
-    border-bottom: 4px solid #C7EFD3 !important;
+  background: white !important;
+  margin: auto !important;
+  width: 95% !important;
+  max-width: 568px !important;
+  border-bottom: 4px solid #c7efd3 !important;
 }
 
 .main-content {
-    padding: 2vw 4vw !important;
+  padding: 2vw 4vw !important;
 }
 
 .main-content p {
-    font-style: normal !important;
-    font-weight: normal !important;
-    font-size: 16px !important;
-    line-height: 24px !important;
-    color: #262422 !important;
+  font-style: normal !important;
+  font-weight: normal !important;
+  font-size: 16px !important;
+  line-height: 24px !important;
+  color: #262422 !important;
 }
 
 .support-header {
-    font-weight: 600 !important;
-    font-style: normal !important;
-    font-size: 16px !important;
-    line-height: 24px !important;
-    color: #262422 !important;
+  font-weight: 600 !important;
+  font-style: normal !important;
+  font-size: 16px !important;
+  line-height: 24px !important;
+  color: #262422 !important;
 }
 
 .support-content {
-    font-style: normal !important;
-    font-weight: normal !important;
-    font-size: 16px !important;
-    line-height: 24px !important;
-    color: #262422 !important;
+  font-style: normal !important;
+  font-weight: normal !important;
+  font-size: 16px !important;
+  line-height: 24px !important;
+  color: #262422 !important;
 }
 
 .support-container {
-    margin: 36px 0 !important;
+  margin: 36px 0 !important;
 }
 
 .button-aligner {
-    text-align: center !important;
+  text-align: center !important;
 }
 
 .button {
-    text-decoration: none !important;
-    color: #282B36 !important;
-    background: #FCE38D !important;
-    border-radius: 4px !important;
-    padding: 12px 12px !important;
-    width: 90% !important;
-    max-width: 248px !important;
-    cursor: pointer !important;
-    border: none !important;
-    box-shadow: 0px 2px 8px rgba(102, 115, 138, 0.3) !important;
-    font-style: normal !important;
-    font-weight: 600 !important;
-    font-size: 16px !important;
-    line-height: 24px !important;
+  text-decoration: none !important;
+  color: #282b36 !important;
+  background: #fce38d !important;
+  border-radius: 4px !important;
+  padding: 12px 12px !important;
+  width: 90% !important;
+  max-width: 248px !important;
+  cursor: pointer !important;
+  border: none !important;
+  box-shadow: 0px 2px 8px rgba(102, 115, 138, 0.3) !important;
+  font-style: normal !important;
+  font-weight: 600 !important;
+  font-size: 16px !important;
+  line-height: 24px !important;
 }
 
 p {
-    font-size: 20px !important;
+  font-size: 20px !important;
 }
 
 .footer {
-    text-align: center !important;
-    margin-top: 34px !important;
+  text-align: center !important;
+  margin-top: 34px !important;
 }
 
 .footer p {
-    font-style: normal !important;
-    font-weight: normal !important;
-    font-size: 12px !important;
-    line-height: 24px !important;
-    color: #9FAABE !important;
+  font-style: normal !important;
+  font-weight: normal !important;
+  font-size: 12px !important;
+  line-height: 24px !important;
+  color: #9faabe !important;
 }
 
-.main-content p a, .footer a {
-    color: #38AA92 !important;
-    text-decoration: none !important;
+.main-content p a,
+.footer a {
+  color: #38aa92 !important;
+  text-decoration: none !important;
 }
 
-.main-content p a:hover, .footer a:hover {
-    color: #38AA92 !important;
-    text-decoration: underline !important;
+.main-content p a:hover,
+.footer a:hover {
+  color: #38aa92 !important;
+  text-decoration: underline !important;
 }
diff --git a/packages/api/src/templates/locales/ml.json b/packages/api/src/templates/locales/ml.json
@@ -91,8 +91,7 @@
     "PRIVACY": "ലൈറ്റ്ഫാമിൽ, ഞങ്ങൾ നിങ്ങളുടെ സ്വകാര്യത ഗൗരവമായി കാണുന്നു, അതിനാൽ നിങ്ങളുടെ എക്സ്പോർറ്റ് ആക്‌സസ് ചെയ്യുന്നതിന് മുമ്പ് നിങ്ങൾ ലോഗിൻ ചെയ്യേണ്ടതുണ്ട്. എന്തെങ്കിലും അസൗകര്യം ഉണ്ടായതിൽ ഖേദിക്കുന്നു. നിങ്ങളുടെ സമർപ്പണത്തിന് ആശംസകൾ, ലൈറ്റ്ഫാം ഉപയോഗിച്ചതിന് നന്ദി!",
     "SUBJECT": "ലൈറ്റ്ഫാമിൽ നിന്ന് നിങ്ങളുടെ സർട്ടിഫിക്കേഷൻ രേഖകൾ എക്സ്പോർറ്റ് ചെയ്യുന്നു",
     "HI": "നമസ്തേ",
-    "GET_YOUR_EXPORT": "രേഖകൾ നേടുക",
-    "LANGUAGE_DELAY": ""
+    "GET_YOUR_EXPORT": "രേഖകൾ നേടുക"
   },
   "COMMON": {
     "JOIN": "ചേരുക",
@@ -102,4 +101,4 @@
     "WORKER": "തൊഴിലാളി",
     "EXTENSION_OFFICER": "എക്സ്റ്റൻഷൻ ഓഫീസർ"
   }
-}
+}
diff --git a/packages/api/src/templates/sendEmailTemplate.js b/packages/api/src/templates/sendEmailTemplate.js
@@ -71,14 +71,7 @@ const emailTransporter = new EmailTemplates({
     root: path.join(dir, 'emails'),
   },
   i18n: {
-    locales: [
-      'en',
-      'es',
-      'fr',
-      'pt',
-      'de',
-      // 'hi', 'pa', 'ml'
-    ],
+    locales: ['en', 'es', 'fr', 'pt', 'de', 'hi', 'pa', 'ml'],
     directory: path.join(dir, 'locales'),
     objectNotation: true,
   },

diff --git a/packages/shared/locales/hi/sensorCSV.json b/packages/shared/locales/hi/sensorCSV.json
@@ -0,0 +1,17 @@
+{
+  "CSV_HEADER_TRANSLATIONS": {
+    "name": "नाम",
+    "latitude": "अक्षांश",
+    "longitude": "देशांतर",
+    "reading_types": "पठन_प्रकार",
+    "external_id": "बाह्य_ID",
+    "depth": "गहराई_सेमी",
+    "brand": "ब्रांड",
+    "model": "मॉडल"
+  },
+  "READING_TYPE_TRANSLATIONS": {
+    "soil_water_content": "मृदा_जल_सामग्री",
+    "soil_water_potential": "मृदा_जल_क्षमता",
+    "temperature": "तापमान"
+  }
+}
diff --git a/packages/shared/locales/ml/sensorCSV.json b/packages/shared/locales/ml/sensorCSV.json
@@ -0,0 +1,17 @@
+{
+  "CSV_HEADER_TRANSLATIONS": {
+    "name": "പേര്",
+    "latitude": "അക്ഷാംശം",
+    "longitude": "രേഖാംശം",
+    "reading_types": "വായന_തരങ്ങൾ",
+    "external_id": "ബാഹ്യ_ഐഡി",
+    "depth": "ആഴം_സെ.മീ",
+    "brand": "ബ്രാൻഡ്",
+    "model": "മോഡൽ"
+  },
+  "READING_TYPE_TRANSLATIONS": {
+    "soil_water_content": "മണ്ണ്_ജലം_ഉള്ളടക്കം",
+    "soil_water_potential": "മണ്ണ്_ജലം_ ശേഷി",
+    "temperature": "താപനില"
+  }
+}
diff --git a/packages/shared/locales/pa/sensorCSV.json b/packages/shared/locales/pa/sensorCSV.json
@@ -0,0 +1,17 @@
+{
+  "CSV_HEADER_TRANSLATIONS": {
+    "name": "ਨਾਮ",
+    "latitude": "ਵਿਥਕਾਰ",
+    "longitude": "ਲੰਬਕਾਰ",
+    "reading_types": "ਪੜ੍ਹਨਾ_ਕਿਸਮਾਂ",
+    "external_id": "ਬਾਹਰੀ_ID",
+    "depth": "ਡੂੰਘਾਈ_ਸੈ.ਮੀ",
+    "brand": "ਬ੍ਰਾਂਡ",
+    "model": "ਮਾਡਲ"
+  },
+  "READING_TYPE_TRANSLATIONS": {
+    "soil_water_content": "ਮਿੱਟੀ_ਪਾਣੀ_ਸਮੱਗਰੀ",
+    "soil_water_potential": "ਮਿੱਟੀ_ਪਾਣੀ_ਸੰਭਾਵੀ",
+    "temperature": "ਤਾਪਮਾਨ"
+  }
+}