From c0b306d15c80064d59136dd2da2f6faaaaf24c31 Mon Sep 17 00:00:00 2001 From: Vineet Sharma Date: Wed, 27 Sep 2023 16:56:40 +0530 Subject: [PATCH] Added translation for Home breadcrumb and left nav link --- .gitignore | 3 +++ packages/esm-home-app/package.json | 2 +- ...ashboardLink.tsx => createDashboardLink.component.tsx} | 5 ++++- packages/esm-home-app/src/index.ts | 5 +++-- packages/esm-home-app/translations/am.json | 3 +++ packages/esm-home-app/translations/en.json | 8 +------- packages/esm-home-app/translations/es.json | 7 ++----- packages/esm-home-app/translations/fr.json | 8 +------- packages/esm-home-app/translations/he.json | 8 +------- packages/esm-home-app/translations/km.json | 3 +++ 10 files changed, 22 insertions(+), 30 deletions(-) rename packages/esm-home-app/src/{createDashboardLink.tsx => createDashboardLink.component.tsx} (89%) create mode 100644 packages/esm-home-app/translations/am.json create mode 100644 packages/esm-home-app/translations/km.json diff --git a/.gitignore b/.gitignore index a38206453..31cce5fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,6 @@ dist !.yarn/releases !.yarn/sdks !.yarn/versions + +# i18next parser creating moduleName folder when parsing index.ts +moduleName \ No newline at end of file diff --git a/packages/esm-home-app/package.json b/packages/esm-home-app/package.json index da73c3c7c..a2975b094 100644 --- a/packages/esm-home-app/package.json +++ b/packages/esm-home-app/package.json @@ -15,7 +15,7 @@ "lint": "cross-env TIMING=1 eslint src --ext ts,tsx --fix --max-warnings=0 --color", "typescript": "tsc", "verify": "turbo lint typescript test --color", - "extract-translations": "i18next 'src/**/*.{component.tsx,tsx}' --config ../../tools/i18next-parser.config.js", + "extract-translations": "i18next 'src/**/*.{component.tsx,tsx}' 'src/index.ts' --config ../../tools/i18next-parser.config.js", "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests", "coverage": "yarn test --coverage" }, diff --git a/packages/esm-home-app/src/createDashboardLink.tsx b/packages/esm-home-app/src/createDashboardLink.component.tsx similarity index 89% rename from packages/esm-home-app/src/createDashboardLink.tsx rename to packages/esm-home-app/src/createDashboardLink.component.tsx index 24214396e..2efc37a4c 100644 --- a/packages/esm-home-app/src/createDashboardLink.tsx +++ b/packages/esm-home-app/src/createDashboardLink.component.tsx @@ -1,6 +1,7 @@ import React, { useMemo } from 'react'; import { BrowserRouter, useLocation } from 'react-router-dom'; import { ConfigurableLink } from '@openmrs/esm-framework'; +import { useTranslation } from 'react-i18next'; export interface DashboardLinkConfig { name: string; @@ -8,6 +9,7 @@ export interface DashboardLinkConfig { } const DashboardLink = ({ dashboardLinkConfig }: { dashboardLinkConfig: DashboardLinkConfig }) => { + const { t } = useTranslation(); const { name } = dashboardLinkConfig; const location = useLocation(); const spaBasePath = `${window.spaBase}/home`; @@ -23,7 +25,8 @@ const DashboardLink = ({ dashboardLinkConfig }: { dashboardLinkConfig: Dashboard to={spaBasePath} className={`cds--side-nav__link ${navLink === 'home' && 'active-left-nav-link'}`} > - {name} + {/* t('Home', 'Home') */} + {t(name)} ); }; diff --git a/packages/esm-home-app/src/index.ts b/packages/esm-home-app/src/index.ts index 386d8aec2..bb5437187 100644 --- a/packages/esm-home-app/src/index.ts +++ b/packages/esm-home-app/src/index.ts @@ -1,5 +1,5 @@ import { registerBreadcrumbs, defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework'; -import { createDashboardLink } from './createDashboardLink'; +import { createDashboardLink } from './createDashboardLink.component'; import { dashboardMeta } from './dashboard.meta'; import { esmHomeSchema } from './openmrs-esm-home-schema'; @@ -26,11 +26,12 @@ export const homeWidgetDashboard = getAsyncLifecycle( export function startupApp() { defineConfigSchema(moduleName, esmHomeSchema); + // t('Home', 'Home'); registerBreadcrumbs([ { path: `${window.spaBase}/${pageName}`, - title: 'Home', + title: () => Promise.resolve(window.i18next.t('Home', { defaultValue: 'Home', ns: moduleName })), }, ]); } diff --git a/packages/esm-home-app/translations/am.json b/packages/esm-home-app/translations/am.json new file mode 100644 index 000000000..a5ff8c612 --- /dev/null +++ b/packages/esm-home-app/translations/am.json @@ -0,0 +1,3 @@ +{ + "Home": "Home" +} diff --git a/packages/esm-home-app/translations/en.json b/packages/esm-home-app/translations/en.json index 9257c406f..a5ff8c612 100644 --- a/packages/esm-home-app/translations/en.json +++ b/packages/esm-home-app/translations/en.json @@ -1,9 +1,3 @@ { - "activeVisits": "Active Visits", - "appointmentScheduling": "Appointment Scheduling", - "captureVitals": "Capture Vitals", - "configureMetadata": "Configure Metadata", - "dataManagement": "Data Management", - "reports": "Reports", - "systemAdministration": "System Administration" + "Home": "Home" } diff --git a/packages/esm-home-app/translations/es.json b/packages/esm-home-app/translations/es.json index 4c8113e2d..a5ff8c612 100644 --- a/packages/esm-home-app/translations/es.json +++ b/packages/esm-home-app/translations/es.json @@ -1,6 +1,3 @@ { - "patient": "paciente", - "found": "encontró", - "containing":"conteniendo", - "patientSearchText": "Búsqueda por nombre de paciente O identificador" -} \ No newline at end of file + "Home": "Home" +} diff --git a/packages/esm-home-app/translations/fr.json b/packages/esm-home-app/translations/fr.json index ff0d7d62d..a5ff8c612 100644 --- a/packages/esm-home-app/translations/fr.json +++ b/packages/esm-home-app/translations/fr.json @@ -1,9 +1,3 @@ { - "activeVisits": "Visites actives", - "appointmentScheduling": "Planification de rendez-vous", - "captureVitals": "Entrer les signes vitaux", - "configureMetadata": "Configurer les métadonnées", - "dataManagement": "Gestion de données", - "reports": "Rapports", - "systemAdministration": "Administration du système" + "Home": "Home" } diff --git a/packages/esm-home-app/translations/he.json b/packages/esm-home-app/translations/he.json index 2594647f7..a5ff8c612 100644 --- a/packages/esm-home-app/translations/he.json +++ b/packages/esm-home-app/translations/he.json @@ -1,9 +1,3 @@ { - "activeVisits": "ביקורים פעילים", - "appointmentScheduling": "תזמון תורים", - "captureVitals": "לכידת נתוני חיים", - "configureMetadata": "הגדרת מטה-נתונים", - "dataManagement": "ניהול נתונים", - "reports": "דוחות", - "systemAdministration": "ניהול מערכת" + "Home": "Home" } diff --git a/packages/esm-home-app/translations/km.json b/packages/esm-home-app/translations/km.json new file mode 100644 index 000000000..021ba4dd9 --- /dev/null +++ b/packages/esm-home-app/translations/km.json @@ -0,0 +1,3 @@ +{ + "Home": "ផ្ទះ" +}