(chore) Bump i18next, react-i18next and i18next-parser and support fo…

…r pluralization (#847) * Bump i18next to v23, react-18next to v13 and i18next-parser to v8 * Updated translations and fixed plural translations * Bump i18 and jest to supported versions * Updated translations
openmrs · Oct 17, 2023 · bc23e35 · bc23e35
1 parent 20fb442
commit bc23e35
Show file tree

Hide file tree

Showing 17 changed files with 800 additions and 496 deletions.
diff --git a/package.json b/package.json
@@ -52,19 +52,19 @@
     "eslint-config-ts-react-important-stuff": "^3.0.0",
     "eslint-plugin-prettier": "^3.3.1",
     "husky": "^8.0.1",
-    "i18next": "^19.7.0",
-    "i18next-parser": "^3.11.0",
+    "i18next": "^21.10.0",
+    "i18next-parser": "^6.6.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^28.1.0",
-    "jest-cli": "^28.1.0",
+    "jest": "^29.7.0",
+    "jest-cli": "^29.7.0",
     "jest-environment-jsdom": "^28.1.0",
     "lerna": "^3.20.2",
     "openmrs": "next",
     "prettier": "^2.4.1",
     "pretty-quick": "^2.0.2",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "react-i18next": "^11.0.0",
+    "react-i18next": "^11.18.6",
     "react-router-dom": "^6.3.0",
     "sass": "^1.29.0",
     "sass-loader": "^10.1.0",

diff --git a/packages/esm-patient-search-app/src/compact-patient-search/patient-search.component.tsx b/packages/esm-patient-search-app/src/compact-patient-search/patient-search.component.tsx
@@ -83,9 +83,8 @@ const PatientSearch = React.forwardRef<HTMLDivElement, PatientSearchProps>(
         <div className={styles.searchResultsContainer}>
           <div className={styles.searchResults}>
             <p className={styles.resultsText}>
-              {t('searchResultsCount', '{count} search result{plural}', {
+              {t('searchResultsCount', '{count} search result', {
                 count: searchResults.length,
-                plural: searchResults.length === 0 || searchResults.length > 1 ? 's' : '',
               })}
             </p>
             <PatientSearchResults patients={searchResults} selectPatientAction={selectPatientAction} ref={ref} />

diff --git a/...ges/esm-patient-search-app/src/compact-patient-search/recent-patient-search.component.tsx b/...ges/esm-patient-search-app/src/compact-patient-search/recent-patient-search.component.tsx
@@ -75,9 +75,8 @@ const RecentPatientSearch = React.forwardRef<HTMLDivElement, RecentPatientSearch
         <div className={styles.searchResultsContainer}>
           <div className={styles.searchResults}>
             <p className={styles.resultsText}>
-              {t('recentSearchResultsCount', '{count} recent search result{plural}', {
+              {t('recentSearchResultsCount', '{count} recent search result', {
                 count: searchResults.length,
-                plural: searchResults.length === 0 || searchResults.length > 1 ? 's' : '',
               })}
             </p>
             <PatientSearchResults patients={searchResults} selectPatientAction={selectPatientAction} ref={ref} />

diff --git a/packages/esm-patient-search-app/src/patient-search-page/patient-search-lg.component.tsx b/packages/esm-patient-search-app/src/patient-search-page/patient-search-lg.component.tsx
@@ -95,9 +95,8 @@ const PatientSearchComponent: React.FC<PatientSearchComponentProps> = ({
           }`}>
           {isLoading ? t('searchingText', 'Searching...') : null}
           {!isLoading
-            ? t('searchResultsCount', '{count} search result{plural}', {
+            ? t('searchResultsCount', '{count} search result', {
                 count: totalResults,
-                plural: totalResults === 0 || totalResults > 1 ? 's' : '',
               })
             : null}
         </h2>

diff --git a/packages/esm-patient-search-app/translations/am.json b/packages/esm-patient-search-app/translations/am.json
@@ -22,8 +22,8 @@
   "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
-  "recentSearchResultsCount": "{count} recent search result{plural}",
-  "recentSearchResultsCount_plural": "{count} recent search result{plural}",
+  "recentSearchResultsCount_one": "{count} recent search result",
+  "recentSearchResultsCount_other": "{count} recent search results",
   "refineSearch": "Refine search",
   "refineSearchHeaderText": "Add additional search criteria",
   "refineSearchTabletBannerText": "Can't find who you're looking for?",
@@ -34,8 +34,8 @@
   "searchingText": "Searching...",
   "searchPatient": "Search Patient",
   "searchResults": "Search results",
-  "searchResultsCount": "{count} search result{plural}",
-  "searchResultsCount_plural": "{count} search result{plural}",
+  "searchResultsCount_one": "{count} search result",
+  "searchResultsCount_other": "{count} search results",
   "sex": "Sex",
   "showDetails": "Show details",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",

diff --git a/packages/esm-patient-search-app/translations/en.json b/packages/esm-patient-search-app/translations/en.json
@@ -22,8 +22,8 @@
   "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
-  "recentSearchResultsCount": "{count} recent search result{plural}",
-  "recentSearchResultsCount_plural": "{count} recent search result{plural}",
+  "recentSearchResultsCount_one": "{count} recent search result",
+  "recentSearchResultsCount_other": "{count} recent search results",
   "refineSearch": "Refine search",
   "refineSearchHeaderText": "Add additional search criteria",
   "refineSearchTabletBannerText": "Can't find who you're looking for?",
@@ -34,13 +34,11 @@
   "searchingText": "Searching...",
   "searchPatient": "Search Patient",
   "searchResults": "Search Results",
-  "searchResultsCount": "{count} search result{plural}",
-  "searchResultsCount_plural": "{count} search result{plural}",
+  "searchResultsCount_one": "{count} search result",
+  "searchResultsCount_other": "{count} search results",
   "sex": "Sex",
   "showDetails": "Show details",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
-  "yearOfBirth": "Year of Birth",
-  "searchResultsCount_one": "{count} search result{plural}",
-  "searchResultsCount_other": "{count} search result{plural}"
+  "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/es.json b/packages/esm-patient-search-app/translations/es.json
@@ -22,8 +22,9 @@
   "phoneNumber": "Número de teléfono",
   "postcode": "Código postal",
   "previousPage": "Página anterior",
-  "recentSearchResultsCount": "{count} resultado{plural} de búsqueda reciente",
-  "recentSearchResultsCount_plural": "{count} resultados{plural} de búsqueda reciente",
+  "recentSearchResultsCount_one": "{count} resultado de búsqueda reciente",
+  "recentSearchResultsCount_many": "{count} resultados de búsqueda reciente",
+  "recentSearchResultsCount_other": "{count} resultados de búsqueda reciente",
   "refineSearch": "Afinar búsqueda",
   "refineSearchHeaderText": "Añadir criterios de búsqueda adicionales",
   "refineSearchTabletBannerText": "¿No encuentra lo que está buscando?",
@@ -34,13 +35,12 @@
   "searchingText": "Buscando...",
   "searchPatient": "Buscar Paciente",
   "searchResults": "Resultados de la Búsqueda",
-  "searchResultsCount": "{count} resultado{plural} de búsqueda",
-  "searchResultsCount_plural": "{count} resultados{plural} de búsqueda",
+  "searchResultsCount_one": "{count} resultado de búsqueda",
+  "searchResultsCount_many": "{count} resultados de búsqueda",
+  "searchResultsCount_other": "{count} resultados de búsqueda",
   "sex": "Sexo",
   "showDetails": "Mostrar detalles",
   "trySearchWithPatientUniqueID": "Intente buscar con el número de identificación único del paciente",
   "unknown": "Desconocido",
-  "yearOfBirth": "Año de Nacimiento",
-  "searchResultsCount_one": "{count} resultado{plural} de búsqueda",
-  "searchResultsCount_other": "{count} resultados{plural} de búsqueda"
+  "yearOfBirth": "Año de Nacimiento"
 }
diff --git a/packages/esm-patient-search-app/translations/fr.json b/packages/esm-patient-search-app/translations/fr.json
@@ -22,8 +22,9 @@
   "phoneNumber": "Numéro de téléphone",
   "postcode": "Code postal",
   "previousPage": "Page précédente",
-  "recentSearchResultsCount": "{count} recent search result{plural}",
-  "recentSearchResultsCount_plural": "{count} recent search result{plural}",
+  "recentSearchResultsCount_one": "{count} recent search result",
+  "recentSearchResultsCount_many": "{count} recent search results",
+  "recentSearchResultsCount_other": "{count} recent search results",
   "refineSearch": "Affiner la recherche",
   "refineSearchHeaderText": "Ajouter un critère de recherche supplémentaire",
   "refineSearchTabletBannerText": "Vous ne trouvez pas la personne recherchée?",
@@ -34,8 +35,9 @@
   "searchingText": "Recherche",
   "searchPatient": "Rechercher un patient",
   "searchResults": "Résultats de recherche",
-  "searchResultsCount": "{count} search result{plural}",
-  "searchResultsCount_plural": "{count} search result{plural}",
+  "searchResultsCount_one": "{count} search result",
+  "searchResultsCount_many": "{count} search results",
+  "searchResultsCount_other": "{count} search results",
   "sex": "Sexe",
   "showDetails": "Afficher les informations",
   "trySearchWithPatientUniqueID": "Essayez de chercher par l'identifiant unique du patient",

diff --git a/packages/esm-patient-search-app/translations/he.json b/packages/esm-patient-search-app/translations/he.json
@@ -22,10 +22,10 @@
   "phoneNumber": "מספר טלפון",
   "postcode": "מיקוד",
   "previousPage": "הדף הקודם",
-  "recentSearchResultsCount_0": "{count} recent search result{plural}",
-  "recentSearchResultsCount_1": "{count} recent search result{plural}",
-  "recentSearchResultsCount_2": "{count} recent search result{plural}",
-  "recentSearchResultsCount_3": "{count} recent search result{plural}",
+  "recentSearchResultsCount_one": "{count} recent search result",
+  "recentSearchResultsCount_two": "{count} recent search results",
+  "recentSearchResultsCount_many": "{count} recent search results",
+  "recentSearchResultsCount_other": "{count} recent search results",
   "refineSearch": "צמצם חיפוש",
   "refineSearchHeaderText": "הוסף קריטריונים נוספים לחיפוש",
   "refineSearchTabletBannerText": "לא ניתן למצוא את האדם שאתה מחפש?",
@@ -36,10 +36,10 @@
   "searchingText": "...מחפש",
   "searchPatient": "חיפוש מטופל",
   "searchResults": "תוצאות חיפוש",
-  "searchResultsCount_0": "{count} search result{plural}",
-  "searchResultsCount_1": "{count} search result{plural}",
-  "searchResultsCount_2": "{count} search result{plural}",
-  "searchResultsCount_3": "{count} search result{plural}",
+  "searchResultsCount_one": "{count} search result",
+  "searchResultsCount_two": "{count} search results",
+  "searchResultsCount_many": "{count} search results",
+  "searchResultsCount_other": "{count} search results",
   "sex": "מין",
   "showDetails": "הראה פרטים",
   "trySearchWithPatientUniqueID": "נסה לחפש עם מספר הזיהוי הייחודי של המטופל",

diff --git a/packages/esm-patient-search-app/translations/km.json b/packages/esm-patient-search-app/translations/km.json
@@ -16,13 +16,13 @@
   "hideDetails": "ព័ត៌មានលម្អិតលាក់",
   "male": "ប្រុស",
   "monthOfBirth": "Month of Birth",
-  "nextPage": "ទំពរ័បន្ទាប់",
+  "nextPage": "ទំbពbរ័bបន្ទាប់",
   "noPatientChartsFoundMessage": "សូមអភ័យទោស រកមិនឃើញតារាងអ្នកជំងឺទេ។",
   "other": "ផ្សេងទៀត",
   "phoneNumber": "លេខទូរស័ព្ទ",
   "postcode": "លេខកូដប្រៃសណីយ៍",
-  "previousPage": "ទំព័រមុន",
-  "recentSearchResultsCount": "{count} recent search result{plural}",
+  "previousPage": "ទំព័រbមុន",
+  "recentSearchResultsCount_other": "{count} recent search results",
   "refineSearch": "កែលម្អការស្វែងរក",
   "refineSearchHeaderText": "បន្ថែមលក្ខណៈវិនិច្ឆ័យស្វែងរកបន្ថែម",
   "refineSearchTabletBannerText": "រកមិនឃើញអ្នកណាដែលអ្នកកំពុងស្វែងរក?",
@@ -33,7 +33,7 @@
   "searchingText": "កំពុងស្វែងរក...",
   "searchPatient": "ស្វែងរកអ្នកជំងឺ",
   "searchResults": "លទ្ធផលស្វែងរក",
-  "searchResultsCount": "{count} search result{plural}",
+  "searchResultsCount_other": "{count} search results",
   "sex": "ភេទ",
   "showDetails": "បង្ហាញព័ត៌មានលម្អិត",
   "trySearchWithPatientUniqueID": "ព្យាយាមស្វែងរកដោយប្រើអត្តលេខតែមួយគត់របស់អ្នកជំងឺ",

diff --git a/packages/esm-service-queues-app/translations/am.json b/packages/esm-service-queues-app/translations/am.json
@@ -78,8 +78,8 @@
   "filterTable": "Filter table",
   "firstName": "First name",
   "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits": "{count} visit(s) scheduled for dates in the future",
-  "futureScheduledVisits_plural": "{count} visit(s) scheduled for dates in the future",
+  "futureScheduledVisits_one": "{count} visit scheduled for dates in the future",
+  "futureScheduledVisits_other": "{count} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
@@ -181,8 +181,8 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits": "{count} visit(s) scheduled for +/- 7 days",
-  "recentScheduledVisits_plural": "{count} visit(s) scheduled for +/- 7 days",
+  "recentScheduledVisits_one": "{count} visit scheduled for +/- 7 days",
+  "recentScheduledVisits_other": "{count} visits scheduled for +/- 7 days",
   "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit?",

diff --git a/packages/esm-service-queues-app/translations/en.json b/packages/esm-service-queues-app/translations/en.json
@@ -78,8 +78,8 @@
   "filterTable": "Filter table",
   "firstName": "First name",
   "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits": "{count, plural, one{{count} visit} other{{count} visits}} scheduled for dates in the future",
-  "futureScheduledVisits_plural": "",
+  "futureScheduledVisits_one": "{count} visit scheduled for dates in the future",
+  "futureScheduledVisits_other": "{count} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
@@ -181,8 +181,8 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits": "{count, plural, one{{count} visit} other{{count} visits}} scheduled for +/- 7 days",
-  "recentScheduledVisits_plural": "",
+  "recentScheduledVisits_one": "{count} visit scheduled for +/- 7 days",
+  "recentScheduledVisits_other": "{count} visits scheduled for +/- 7 days",
   "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",

diff --git a/packages/esm-service-queues-app/translations/es.json b/packages/esm-service-queues-app/translations/es.json
@@ -78,8 +78,9 @@
   "filterTable": "Filter table",
   "firstName": "First name",
   "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits": "{count} visit(s) scheduled for dates in the future",
-  "futureScheduledVisits_plural": "{count} visit(s) scheduled for dates in the future",
+  "futureScheduledVisits_one": "{count} visit scheduled for dates in the future",
+  "futureScheduledVisits_many": "{count} visits scheduled for dates in the future",
+  "futureScheduledVisits_other": "{count} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
@@ -181,8 +182,9 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits": "{count} visit(s) scheduled for +/- 7 days",
-  "recentScheduledVisits_plural": "{count} visit(s) scheduled for +/- 7 days",
+  "recentScheduledVisits_one": "{count} visit scheduled for +/- 7 days",
+  "recentScheduledVisits_many": "{count} visits scheduled for +/- 7 days",
+  "recentScheduledVisits_other": "{count} visits scheduled for +/- 7 days",
   "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit?",

diff --git a/packages/esm-service-queues-app/translations/fr.json b/packages/esm-service-queues-app/translations/fr.json
@@ -78,8 +78,9 @@
   "filterTable": "Filter table",
   "firstName": "First name",
   "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits": "{count} visit(s) scheduled for dates in the future",
-  "futureScheduledVisits_plural": "{count} visit(s) scheduled for dates in the future",
+  "futureScheduledVisits_one": "{count} visit scheduled for dates in the future",
+  "futureScheduledVisits_many": "{count} visits scheduled for dates in the future",
+  "futureScheduledVisits_other": "{count} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
@@ -181,8 +182,9 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits": "{count} visit(s) scheduled for +/- 7 days",
-  "recentScheduledVisits_plural": "{count} visit(s) scheduled for +/- 7 days",
+  "recentScheduledVisits_one": "{count} visit scheduled for +/- 7 days",
+  "recentScheduledVisits_many": "{count} visits scheduled for +/- 7 days",
+  "recentScheduledVisits_other": "{count} visits scheduled for +/- 7 days",
   "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit?",

diff --git a/packages/esm-service-queues-app/translations/he.json b/packages/esm-service-queues-app/translations/he.json
@@ -78,10 +78,10 @@
   "filterTable": "Filter table",
   "firstName": "שם פרטי",
   "firstNameSort": "שם פרטי (א-ת)",
-  "futureScheduledVisits_0": "{count} visit(s) scheduled for dates in the future",
-  "futureScheduledVisits_1": "{count} visit(s) scheduled for dates in the future",
-  "futureScheduledVisits_2": "{count} visit(s) scheduled for dates in the future",
-  "futureScheduledVisits_3": "{count} visit(s) scheduled for dates in the future",
+  "futureScheduledVisits_one": "{count} visit scheduled for dates in the future",
+  "futureScheduledVisits_two": "{count} visits scheduled for dates in the future",
+  "futureScheduledVisits_many": "{count} visits scheduled for dates in the future",
+  "futureScheduledVisits_other": "{count} visits scheduled for dates in the future",
   "gender": "מגדר",
   "heartRate": "דופק לב",
   "height": "גובה",
@@ -183,10 +183,10 @@
   "queueScreen": "Queue screen",
   "queueService": "שירות התור",
   "queueStatus": "מצב התור",
-  "recentScheduledVisits_0": "{count} visit(s) scheduled for +/- 7 days",
-  "recentScheduledVisits_1": "{count} visit(s) scheduled for +/- 7 days",
-  "recentScheduledVisits_2": "{count} visit(s) scheduled for +/- 7 days",
-  "recentScheduledVisits_3": "{count} visit(s) scheduled for +/- 7 days",
+  "recentScheduledVisits_one": "{count} visit scheduled for +/- 7 days",
+  "recentScheduledVisits_two": "{count} visits scheduled for +/- 7 days",
+  "recentScheduledVisits_many": "{count} visits scheduled for +/- 7 days",
+  "recentScheduledVisits_other": "{count} visits scheduled for +/- 7 days",
   "recommended": "מומלץ",
   "refills": "חידושים",
   "removeFromQueueAndEndVisit": "הסר מטופל מהתור וסיים ביקור פעיל",