Merge pull request #177 from onehealthtoolkit/fix_issues

#152 #167 #170 update Laos translation on report, case calendar and fi…
onehealthtoolkit · Feb 8, 2024 · cb552b3 · cb552b3
2 parents f83cf8a + 5a718f9
commit cb552b3
Show file tree

Hide file tree

Showing 11 changed files with 191 additions and 16 deletions.
diff --git a/components/case/filter.tsx b/components/case/filter.tsx
@@ -58,7 +58,7 @@ const CaseFilter = ({ viewModel }: { viewModel: CaseListViewModel }) => {
           value={viewModel.filter.authorities}
           defaultOptions={defaultOptions}
           loadOptions={loadAuthorityOptions}
-          placeholder="type to select"
+          placeholder={t("form.placeholder.typeToSelect", "Type to select")}
           isMulti={true}
           getOptionValue={item => item.id}
           getOptionLabel={item => item.name}

diff --git a/components/map/view.tsx b/components/map/view.tsx
@@ -11,6 +11,7 @@ import { useRouter } from "next/router";
 import { ParsedUrlQuery } from "querystring";
 import React, { useEffect, useState } from "react";
 import MapViewFilter from "./filter";
+import { useTranslation } from "react-i18next";
 
 const JSURL = require("jsurl");
 
@@ -30,6 +31,7 @@ type MapSwitchProps = {
 };
 
 const MapSwitch = ({ active, onChange }: MapSwitchProps) => {
+  const { t } = useTranslation();
   return (
     <label
       htmlFor="live-toggle"
@@ -53,7 +55,9 @@ const MapSwitch = ({ active, onChange }: MapSwitchProps) => {
         after:rounded-full after:h-5 after:w-5 after:transition-all peer-checked:bg-blue-600
         "
       ></div>
-      <span className="ml-3 text-sm font-medium text-gray-900">Live View</span>
+      <span className="ml-3 text-sm font-medium text-gray-900">
+        {t("filter.liveView", "Live View")}
+      </span>
     </label>
   );
 };

diff --git a/components/report/filter.tsx b/components/report/filter.tsx
@@ -58,7 +58,7 @@ const ReportFilter = ({ viewModel }: { viewModel: ReportListViewModel }) => {
           value={viewModel.filter.authorities}
           defaultOptions={defaultOptions}
           loadOptions={loadAuthorityOptions}
-          placeholder="type to select"
+          placeholder={t("form.placeholder.typeToSelect", "Type to select")}
           isMulti={true}
           getOptionValue={item => item.id}
           getOptionLabel={item => item.name}
@@ -85,7 +85,7 @@ const ReportFilter = ({ viewModel }: { viewModel: ReportListViewModel }) => {
                 )
               }
               label={t(
-                "form.label.includeChildAuthority ",
+                "form.label.includeChildAuthority",
                 "Include child authority"
               )}
               disabled={false}

diff --git a/components/widgets/calendar.tsx b/components/widgets/calendar.tsx
@@ -53,7 +53,7 @@ const Calendar = <T extends CalendarEvent>({
               onMonthChange();
             }}
           >
-            Today
+            {t("filter.today", "Today")}
           </span>
           <ChevronRightIcon
             className="w-5 h-5 text-gray-400"

diff --git a/i18n/translations.en.json b/i18n/translations.en.json
@@ -38,6 +38,8 @@
     "placeholder": "Search",
     "listView": "List",
     "calendarView": "Calendar",
+    "liveView": "Live View",
+    "today": "Today",
     "refresh": "Refresh"
   },
   "table": {
@@ -66,6 +68,10 @@
       "category": "Category",
       "reportType": "Report Type",
       "condition": "condition",
+      "select": "Select ...",
+      "thisWeek": "This week",
+      "thisMonth": "This month",
+      "thisYear": "This year",
       "selectItem": "Select item ...",
       "fromDate": "From Date",
       "throughDate": "Through Date",
@@ -118,7 +124,24 @@
       "createdAt": "Created At",
       "incidentDate": "Incident Date",
       "data": "Data",
-      "caseType": "Case Type"
+      "caseType": "Case Type",
+      "reportBy": "Report by",
+      "phoneNumber": "Phone number",
+      "formData": " Form Data",
+      "followup": "Followup",
+      "raw": "Raw",
+      "definition": "Definition",
+      "comments": "Comments",
+      "noComments": "No comments",
+      "state": "State",
+      "detail": "Detail",
+      "finished": " Finished",
+      "month": "Month",
+      "year": "Year",
+      "columnSplit": "column split",
+      "showTestReport": "Show test report",
+      "includesBoundaryConnects": "Includes boundary connects",
+      "includeChildAuthority": "Include child authority"
     },
     "placeholder": {
       "code": "Code",
@@ -153,6 +176,7 @@
       "confirmPassword": "Confirm Password",
       "to": "email:[email protected], user:pphetra",
       "selectReportType": "Select Report Type",
+      "typeToSelect": "Type to select",
       "invitationCode": "Invitation Code",
       "language": "Language",
       "server": "Server",

diff --git a/i18n/translations.es.json b/i18n/translations.es.json
@@ -34,7 +34,10 @@
     "resetButton": "Reiniciar",
     "placeholder": "Buscar",
     "listView": "Lista",
-    "calendarView": "Calendario"
+    "calendarView": "Calendario",
+    "liveView": "Live View",
+    "today": "Today",
+    "refresh": "Refresh"
   },
   "table": {
     "id": "IDENTIFICACIÓN",
@@ -62,6 +65,10 @@
       "category": "Categoría",
       "reportType": "Tipo de informe",
       "condition": "condición",
+      "select": "Select ...",
+      "thisWeek": "This week",
+      "thisMonth": "This month",
+      "thisYear": "This year",
       "selectItem": "Seleccione un artículo ...",
       "fromDate": "Partir de la fecha",
       "throughDate": "Hasta la fecha",
@@ -109,7 +116,29 @@
       "notificationTo": "correo electrónico: [email protected], usuario: pphetra",
       "contributions": "Contribuciones",
       "registerFormDefinition": "Definición de formulario de registro",
-      "identityTemplate": "Plantilla de identidad"
+      "identityTemplate": "Plantilla de identidad",
+      "authorityName": "Authority Name",
+      "createdAt": "Created At",
+      "incidentDate": "Incident Date",
+      "data": "Data",
+      "caseType": "Case Type",
+      "reportBy": "Report by",
+      "phoneNumber": "Phone number",
+      "formData": " Form Data",
+      "followup": "Followup",
+      "raw": "Raw",
+      "definition": "Definition",
+      "comments": "Comments",
+      "noComments": "No comments",
+      "state": "State",
+      "detail": "Detail",
+      "finished": " Finished",
+      "month": "Month",
+      "year": "Year",
+      "columnSplit": "column split",
+      "showTestReport": "Show test report",
+      "includesBoundaryConnects": "Includes boundary connects",
+      "includeChildAuthority": "Include child authority"
     },
     "placeholder": {
       "code": "Código",
@@ -144,6 +173,7 @@
       "confirmPassword": "confirmar Contraseña",
       "to": "email:[email protected], user:pphetra",
       "selectReportType": "Seleccione el tipo de informe",
+      "typeToSelect": "Type to select",
       "invitationCodes": "Códigos de invitación",
       "language": "Idioma",
       "server": "Server",

diff --git a/i18n/translations.fr.json b/i18n/translations.fr.json
@@ -34,7 +34,10 @@
     "resetButton": "Réinitialiser",
     "placeholder": "Recherche",
     "listView": "Liste",
-    "calendarView": "Calendrier"
+    "calendarView": "Calendrier",
+    "liveView": "Live View",
+    "today": "Today",
+    "refresh": "Refresh"
   },
   "table": {
     "id": "IDENTIFIANT",
@@ -62,6 +65,10 @@
       "category": "Catégorie",
       "reportType": "Type de rapport",
       "condition": "condition",
+      "select": "Select ...",
+      "thisWeek": "This week",
+      "thisMonth": "This month",
+      "thisYear": "This year",
       "selectItem": "Sélectionner un article ...",
       "fromDate": "Partir de la date",
       "throughDate": "Jusqu'à la date",
@@ -109,7 +116,29 @@
       "notificationTo": "Contact",
       "contributions": "Contributions",
       "registerFormDefinition": "Définition du formulaire d'inscription",
-      "identityTemplate": "Modèle d'identité"
+      "identityTemplate": "Modèle d'identité",
+      "authorityName": "Authority Name",
+      "createdAt": "Created At",
+      "incidentDate": "Incident Date",
+      "data": "Data",
+      "caseType": "Case Type",
+      "reportBy": "Report by",
+      "phoneNumber": "Phone number",
+      "formData": " Form Data",
+      "followup": "Followup",
+      "raw": "Raw",
+      "definition": "Definition",
+      "comments": "Comments",
+      "noComments": "No comments",
+      "state": "State",
+      "detail": "Detail",
+      "finished": " Finished",
+      "month": "Month",
+      "year": "Year",
+      "columnSplit": "column split",
+      "showTestReport": "Show test report",
+      "includesBoundaryConnects": "Includes boundary connects",
+      "includeChildAuthority": "Include child authority"
     },
     "placeholder": {
       "code": "Code",
@@ -144,6 +173,7 @@
       "confirmPassword": "Confirmez le mot de passe",
       "to": "email:[email protected], utilisateur:pphetra",
       "selectReportType": "Sélectionnez le type de rapport",
+      "typeToSelect": "Type to select",
       "invitationCodes": "Codes d'invitation",
       "language": "Langue",
       "server": "Server",

diff --git a/i18n/translations.km.json b/i18n/translations.km.json
@@ -35,6 +35,8 @@
     "placeholder": "ស្វែងរក",
     "listView": "តុ",
     "calendarView": "ប្រតិទិន",
+    "liveView": "Live View",
+    "today": "Today",
     "refresh": "ធ្វើឱ្យស្រស់"
   },
   "table": {
@@ -63,6 +65,10 @@
       "category": "ប្រភេទ",
       "reportType": "ប្រភេទនៃរបាយការណ៍",
       "condition": "លក្ខខណ្ឌ",
+      "select": "Select ...",
+      "thisWeek": "This week",
+      "thisMonth": "This month",
+      "thisYear": "This year",
       "selectItem": "ជ្រើសរើសធាតុ...",
       "fromDate": "ពីកាលបរិច្ឆេទ",
       "throughDate": "តាមរយៈកាលបរិច្ឆេទ",
@@ -106,7 +112,29 @@
       "longitude": "បណ្តោយ",
       "notificationTo": "ការជូនដំណឹងទៅ",
       "registerFormDefinition": "ចុះឈ្មោះនិយមន័យទម្រង់",
-      "identityTemplate": "គំរូអត្តសញ្ញាណ"
+      "identityTemplate": "គំរូអត្តសញ្ញាណ",
+      "authorityName": "Authority Name",
+      "createdAt": "Created At",
+      "incidentDate": "Incident Date",
+      "data": "Data",
+      "caseType": "Case Type",
+      "reportBy": "Report by",
+      "phoneNumber": "Phone number",
+      "formData": " Form Data",
+      "followup": "Followup",
+      "raw": "Raw",
+      "definition": "Definition",
+      "comments": "Comments",
+      "noComments": "No comments",
+      "state": "State",
+      "detail": "Detail",
+      "finished": " Finished",
+      "month": "Month",
+      "year": "Year",
+      "columnSplit": "column split",
+      "showTestReport": "Show test report",
+      "includesBoundaryConnects": "Includes boundary connects",
+      "includeChildAuthority": "Include child authority"
     },
     "placeholder": {
       "code": "កូដ",
@@ -141,6 +169,7 @@
       "confirmPassword": "បញ្ជាក់ពាក្យសម្ងាត់",
       "to": "email:[email protected], user:pphetra",
       "selectReportType": "ជ្រើសរើសប្រភេទរបាយការណ៍",
+      "typeToSelect": "Type to select",
       "invitationCode": "លេខកូដការអញ្ជើញ",
       "language": "ភាសា",
       "server": "ម៉ាស៊ីនមេ",

diff --git a/i18n/translations.la.json b/i18n/translations.la.json
@@ -39,6 +39,8 @@
     "placeholder": "ຕົວຍຶດ",
     "listView": "ລາຍການເບິ່ງ",
     "calendarView": "ປະຕິທິນເບິ່ງ",
+    "liveView": "ເບິ່ງສົດ",
+    "today": "ມື້ນີ້",
     "refresh": "ໂຫຼດຫນ້າຈໍຄືນ"
   },
   "table": {
@@ -67,7 +69,7 @@
       "category": "ກຸ່ມ",
       "reportType": "ປະເພດລາຍງານ",
       "condition": "ສະພາບ",
-      "select": "ເລືອກ...",
+      "select": "ເລືອກ ...",
       "thisWeek": "ອາທິດນີ້",
       "thisMonth": "ເດືອນນີ້",
       "thisYear": "ປີນີ້",
@@ -139,7 +141,8 @@
       "year": "ປີ",
       "columnSplit": "ແບ່ງຖັນ",
       "showTestReport": "ສະແດງໃຫ້ເຫັນບົດລາຍງານການທົດສອບ",
-      "includesBoundaryConnects": "ປະກອບມີການເຊື່ອມຕໍ່ຊາຍແດນ"
+      "includesBoundaryConnects": "ປະກອບມີການເຊື່ອມຕໍ່ຊາຍແດນ",
+      "includeChildAuthority": "ລວມເອົາສິດອຳນາດຂອງເດັກ"
     },
     "placeholder": {
       "code": "ລະຫັດ",
@@ -177,6 +180,7 @@
       "confirmPassword": "ຢືນຢັນລະຫັດຜ່ານໃຫມ່",
       "to": "email:[email protected], user:pphetra",
       "selectReportType": "ເລືອກປະເພດບົດລາຍງານ",
+      "typeToSelect": "ພິມບາງຕົວອັກສອນຂອງຄໍາ. ຫຼັງຈາກນັ້ນ, ລະບົບຈະສະແດງຄໍາທີ່ຈະເລືອກເອົາຈາກ.",
       "invitationCode": "ລະຫັດການຈົດທະບຽນ",
       "language": "ພາສາ",
       "server": "ເຊີບເວີ",

diff --git a/i18n/translations.mm.json b/i18n/translations.mm.json
@@ -34,7 +34,10 @@
     "resetButton": "ပြန်လည်သတ်မှတ်ပါ။",
     "placeholder": "ရှာရန်",
     "listView": "စာရင်း",
-    "calendarView": "ပြက္ခဒိန်"
+    "calendarView": "ပြက္ခဒိန်",
+    "liveView": "Live View",
+    "today": "Today",
+    "refresh": "Refresh"
   },
   "table": {
     "id": "အမှတ်သညာ",
@@ -62,6 +65,10 @@
       "category": "အမျိုးအစား",
       "reportType": "အစီရင်ခံစာအမျိုးအစား",
       "condition": "အခြေအနေ",
+      "select": "Select ...",
+      "thisWeek": "This week",
+      "thisMonth": "This month",
+      "thisYear": "This year",
       "selectItem": "ပစ္စည်းရွေးပါ...",
       "fromDate": "Date မှ",
       "throughDate": "Date မှတဆင့်",
@@ -109,7 +116,29 @@
       "notificationTo": "ဆက်သွယ်ပါ။",
       "contributions": "ပံ့ပိုးမှုများ",
       "registerFormDefinition": "RegisterForm အဓိပ္ပာယ်ဖွင့်ဆိုချက်",
-      "identityTemplate": "အထောက်အထားပုံစံ"
+      "identityTemplate": "အထောက်အထားပုံစံ",
+      "authorityName": "Authority Name",
+      "createdAt": "Created At",
+      "incidentDate": "Incident Date",
+      "data": "Data",
+      "caseType": "Case Type",
+      "reportBy": "Report by",
+      "phoneNumber": "Phone number",
+      "formData": " Form Data",
+      "followup": "Followup",
+      "raw": "Raw",
+      "definition": "Definition",
+      "comments": "Comments",
+      "noComments": "No comments",
+      "state": "State",
+      "detail": "Detail",
+      "finished": " Finished",
+      "month": "Month",
+      "year": "Year",
+      "columnSplit": "column split",
+      "showTestReport": "Show test report",
+      "includesBoundaryConnects": "Includes boundary connects",
+      "includeChildAuthority": "Include child authority"
     },
     "placeholder": {
       "code": "ကုဒ်",
@@ -144,6 +173,7 @@
       "confirmPassword": "စကားဝှက်အတည်ပြုခြင်း",
       "to": "အီးမေးလ်: [email protected]၊ အသုံးပြုသူ: pphetra",
       "selectReportType": "အစီရင်ခံစာအမျိုးအစားကိုရွေးချယ်ပါ။",
+      "typeToSelect": "Type to select",
       "invitationCodes": "ဖိတ်စာကုဒ်များ",
       "language": "ဘာသာစကား",
       "server": "Server",