From 5aaeeea6b11c5878b0647e5690bb9ed394b9acc2 Mon Sep 17 00:00:00 2001 From: Pius Rubangakene Date: Fri, 17 Jan 2025 09:30:40 +0300 Subject: [PATCH] (chore) Transifix migration for translations --- src/components/sidebar/sidebar.component.tsx | 3 +- src/form-engine.component.tsx | 4 +- src/globals.ts | 1 + src/lifecycle.ts | 3 -- src/setupI18n.ts | 16 -------- translations/ar.json | 40 -------------------- translations/en.json | 40 -------------------- translations/es.json | 38 ------------------- translations/fr.json | 38 ------------------- translations/km.json | 38 ------------------- tsconfig.json | 6 ++- 11 files changed, 10 insertions(+), 217 deletions(-) delete mode 100644 src/setupI18n.ts delete mode 100644 translations/ar.json delete mode 100644 translations/en.json delete mode 100644 translations/es.json delete mode 100644 translations/fr.json delete mode 100644 translations/km.json diff --git a/src/components/sidebar/sidebar.component.tsx b/src/components/sidebar/sidebar.component.tsx index fbe0522bb..4beb40dad 100644 --- a/src/components/sidebar/sidebar.component.tsx +++ b/src/components/sidebar/sidebar.component.tsx @@ -84,6 +84,7 @@ interface PageLinkProps { } function PageLink({ page, currentActivePage, pagesWithErrors, requestPage }: PageLinkProps) { + const { t } = useTranslation(); const isActive = page.id === currentActivePage; const hasError = pagesWithErrors.includes(page.id); return ( @@ -98,7 +99,7 @@ function PageLink({ page, currentActivePage, pagesWithErrors, requestPage }: Pag e.preventDefault(); requestPage(page.id); }}> - {page.label} + {t(page.label)} ); diff --git a/src/form-engine.component.tsx b/src/form-engine.component.tsx index 889d60aaa..e0d40d2cb 100644 --- a/src/form-engine.component.tsx +++ b/src/form-engine.component.tsx @@ -6,7 +6,7 @@ import { useSession, type Visit } from '@openmrs/esm-framework'; import { FormFactoryProvider } from './provider/form-factory-provider'; import { init, teardown } from './lifecycle'; import { isEmpty, useFormJson } from '.'; -import { moduleName } from './globals'; +import { formEngineAppName } from './globals'; import { reportError } from './utils/error-utils'; import { useFormCollapse } from './hooks/useFormCollapse'; import { useFormWorkspaceSize } from './hooks/useFormWorkspaceSize'; @@ -200,7 +200,7 @@ const FormEngine = ({ function I18FormEngine(props: FormEngineProps) { return ( - + ); diff --git a/src/globals.ts b/src/globals.ts index 49a56a862..162e5ebf2 100644 --- a/src/globals.ts +++ b/src/globals.ts @@ -1 +1,2 @@ export const moduleName = '@openmrs/esm-form-engine-lib'; +export const formEngineAppName = '@openmrs/esm-form-engine-app'; diff --git a/src/lifecycle.ts b/src/lifecycle.ts index 185e8e11e..b8efbbf0f 100644 --- a/src/lifecycle.ts +++ b/src/lifecycle.ts @@ -1,5 +1,4 @@ import { pageObserver } from './components/sidebar/page-observer'; -import setupFormEngineLibI18n from './setupI18n'; import { type FormFieldValueAdapter } from './types'; const formFieldAdapters = new Set(); @@ -15,8 +14,6 @@ export function registerFormFieldAdaptersForCleanUp(formFieldAdaptersMap: Record * Invoked on mounting the "FormEngine" component */ export function init() { - // Setting up the i18n for the form engine library - setupFormEngineLibI18n(); } /** diff --git a/src/setupI18n.ts b/src/setupI18n.ts deleted file mode 100644 index f212696ec..000000000 --- a/src/setupI18n.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { moduleName } from './globals'; - -function loadResourcesFromFile() { - const lang = window.i18next.language; - import(/* webpackMode: "lazy" */ `../translations/${lang}.json`) - .then((json) => { - const data = json ?? {}; - window?.i18next?.addResourceBundle?.(lang, moduleName, data); - }) - .catch((err) => console.error(err)); -} - -export default function setupFormEngineLibI18n() { - loadResourcesFromFile(); - window.i18next?.on?.('languageChanged', loadResourcesFromFile); -} diff --git a/translations/ar.json b/translations/ar.json deleted file mode 100644 index 2760b5746..000000000 --- a/translations/ar.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "add": "إضافة", - "addCameraImage": "إضافة صورة من الكاميرا", - "addFile": "إضافة ملفات", - "blank": "فارغ", - "cameraCapture": "التقاط بالكاميرا", - "cancel": "إلغاء", - "chooseAnOption": "اختر خيارًا", - "clearFile": "مسح الملف", - "close": "إغلاق", - "closeCamera": "إغلاق الكاميرا", - "closesNotification": "إغلاق الإشعار", - "errorLoadingFormSchema": "خطأ في تحميل مخطط النموذج", - "errorLoadingInitialValues": "خطأ في تحميل القيم الأولية", - "errorRenderingField": "خطأ في عرض الحقل", - "fieldErrorDescriptionTitle": "أخطاء التحقق", - "fileUploadDescription": "", - "fileUploadDescriptionAny": "تحميل أي نوع من الملفات", - "invalidWorkspaceName": "اسم مساحة العمل غير صالح.", - "invalidWorkspaceNameSubtitle": "يرجى إدخال اسم صالح لمساحة العمل.", - "launchWorkspace": "فتح مساحة العمل", - "loading": "جارٍ التحميل", - "notification": "إشعار", - "nullMandatoryField": "يرجى ملء الحقول المطلوبة", - "preview": "معاينة", - "previousValue": "القيمة السابقة:", - "remove": "إزالة", - "required": "مطلوب", - "reuseValue": "إعادة استخدام القيمة", - "save": "حفظ", - "search": "بحث", - "searching": "جارٍ البحث", - "submitting": "جارٍ الإرسال", - "time": "الوقت", - "unspecified": "غير محدد", - "upload": "تحميل", - "uploadedPhoto": "الصورة التي تم تحميلها", - "uploadImage": "تحميل صورة", - "valuesOutOfBound": "بعض القيم خارج النطاق المسموح" -} diff --git a/translations/en.json b/translations/en.json deleted file mode 100644 index f301ea29f..000000000 --- a/translations/en.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "add": "Add", - "addCameraImage": "Add camera image", - "addFile": "Add files", - "blank": "Blank", - "cameraCapture": "Camera capture", - "cancel": "Cancel", - "chooseAnOption": "Choose an option", - "clearFile": "Clear file", - "close": "Close", - "closeCamera": "Close camera", - "closesNotification": "Closes notification", - "errorLoadingFormSchema": "Error loading form schema", - "errorLoadingInitialValues": "Error loading initial values", - "errorRenderingField": "Error rendering field", - "fieldErrorDescriptionTitle": "Validation Errors", - "fileUploadDescription": "", - "fileUploadDescriptionAny": "Upload any file type", - "invalidWorkspaceName": "Invalid workspace name.", - "invalidWorkspaceNameSubtitle": "Please provide a valid workspace name.", - "launchWorkspace": "Launch Workspace", - "loading": "Loading", - "notification": "Notification", - "nullMandatoryField": "Please fill the required fields", - "preview": "Preview", - "previousValue": "Previous value:", - "remove": "Remove", - "required": "Required", - "reuseValue": "Reuse value", - "save": "Save", - "search": "Search", - "searching": "Searching", - "submitting": "Submitting", - "time": "Time", - "unspecified": "Unspecified", - "upload": "Upload", - "uploadedPhoto": "Uploaded photo", - "uploadImage": "Upload image", - "valuesOutOfBound": "Some of the values are out of bounds" -} diff --git a/translations/es.json b/translations/es.json deleted file mode 100644 index c618a5c0b..000000000 --- a/translations/es.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "activeLoadingIndicator": "Indicador de carga activo", - "add": "Agregar", - "addCameraImage": "Agregar imagen de cámara", - "addFile": "Agregar archivos", - "cameraCapture": "Captura de cámara", - "cancel": "Cancelar", - "chooseAnOption": "Elegir una opción", - "close": "Cerrar", - "closeCamera": "Cerrar cámara", - "closesNotification": "Cerrar notificación", - "collapseAll": "Contraer todo", - "createdRecord": "Registro creado", - "createdRecordDescription": "Se creó un nuevo encuentro", - "errorDescriptionTitle": "Error al guardar el formulario", - "errorRenderingField": "Error al renderizar el campo", - "expandAll": "Expandir todo", - "fileUploadDescription": "", - "fileUploadDescriptionAny": "Subir cualquier tipo de archivo", - "loading": "Cargando", - "notification": "Notificación", - "preview": "Vista previa", - "previousValue": "Valor anterior:", - "removeGroup": "Eliminar grupo", - "revert": "Revertir", - "save": "Guardar", - "search": "Buscar", - "submitting": "Enviando", - "time": "Tiempo", - "toggleCollapseOrExpand": "Alternar entre contraer o expandir", - "unspecified": "No especificado", - "unspecifyAll": "No especificar todo", - "updatedRecord": "Registro actualizado", - "updatedRecordDescription": "Se actualizó el encuentro del paciente", - "upload": "Subir", - "uploadedPhoto": "Foto subida", - "uploadImage": "Subir imagen" -} diff --git a/translations/fr.json b/translations/fr.json deleted file mode 100644 index 9efb95192..000000000 --- a/translations/fr.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "activeLoadingIndicator": "Indicateur de chargement actif", - "add": "Ajouter", - "addCameraImage": "Ajouter une image de la caméra", - "addFile": "Ajouter des fichiers", - "cameraCapture": "Capture de la caméra", - "cancel": "Annuler", - "chooseAnOption": "Choisissez une option", - "close": "Fermer", - "closeCamera": "Fermer la caméra", - "closesNotification": "Ferme la notification", - "collapseAll": "Réduire tout", - "createdRecord": "Enregistrement créé", - "createdRecordDescription": "Une nouvelle rencontre a été créée", - "errorDescriptionTitle": "Erreur lors de l'enregistrement du formulaire", - "errorRenderingField": "Erreur lors du rendu du champ", - "expandAll": "Développer tout", - "fileUploadDescription": "", - "fileUploadDescriptionAny": "Télécharger n'importe quel type de fichier", - "loading": "Chargement", - "notification": "Notification", - "preview": "Aperçu", - "previousValue": "Valeur précédente :", - "removeGroup": "Supprimer le groupe", - "revert": "Revenir", - "save": "Enregistrer", - "search": "Recherche", - "submitting": "Soumission", - "time": "Temps", - "toggleCollapseOrExpand": "Basculer réduire ou développer", - "unspecified": "Non spécifié", - "unspecifyAll": "Tout non spécifié", - "updatedRecord": "Enregistrement mis à jour", - "updatedRecordDescription": "La rencontre du patient a été mise à jour", - "upload": "Télécharger", - "uploadedPhoto": "Photo téléchargée", - "uploadImage": "Télécharger une image" -} diff --git a/translations/km.json b/translations/km.json deleted file mode 100644 index af1ce574f..000000000 --- a/translations/km.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "activeLoadingIndicator": "សិទ្ធិដំណើរការអត្ថបទកំពុងស្រលាញ់", - "add": "បន្ថែម", - "addCameraImage": "បន្ថែមរូបភាពសាកល្បង", - "addFile": "បន្ថែមឯកសារ", - "cameraCapture": "ការថតរូបភាពតាមកាមេរ៉ា", - "cancel": "បោះបង់", - "chooseAnOption": "ជ្រើសរើសជម្រើស", - "close": "បិទ", - "closeCamera": "បិទកាមេរ៉ា", - "closesNotification": "បិទការជូនដំណឹង", - "collapseAll": "លាក់ទាំងអស់", - "createdRecord": "បានបង្កើតកំណត់ហេតុ", - "createdRecordDescription": "បានបង្កើតការចូលទិន្ន័រថ្មី", - "errorDescriptionTitle": "កំហុសព័ត៌មានលទ្ធផល", - "errorRenderingField": "កំហុសការបង្ហាញវាល", - "expandAll": "ពង្រីកទាំងអស់", - "fileUploadDescription": "", - "fileUploadDescriptionAny": "ផ្ទុកឡើងឯកសារប្រភេទណាមួយ", - "loading": "កំពុងដំណើរការ", - "notification": "ការជូនដំណឹង", - "preview": "មើលជាមុន", - "previousValue": "តម្លៃមុន:", - "removeGroup": "យកក្រុមចេញ", - "revert": "ត្រឡប់ទៅកាន់ដំណើរការដូចដើម", - "save": "រក្សាទុក", - "search": "ស្វែងរក", - "submitting": "កំពុងដាក់ស្នើ", - "time": "ពេលវេលា", - "toggleCollapseOrExpand": "បិទឬពង្រីកជាមួយគ្រាប់គ្នា", - "unspecified": "មិនបានបញ្ជាក់", - "unspecifyAll": "មិនបានបញ្ជាក់ទាំងអស់", - "updatedRecord": "កំណត់ហេតុដែលបានធ្វើបច្ចុប្បន្នភាព", - "updatedRecordDescription": "ការស៊ើបអ្នកជម្រើសបានធ្វើបច្ចុប្បន្នភាព", - "upload": "ផ្ទុកឡើង", - "uploadedPhoto": "រូបភាពដែលបានផ្ទុកឡើង", - "uploadImage": "ផ្ទុករូបភាពឡើង" -} diff --git a/tsconfig.json b/tsconfig.json index 4bc6a7e0b..857b96b9f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,5 +15,9 @@ "__mocks__": ["./__mocks__"] } }, - "include": ["src/**/*", "./setupTests.ts"] + "include": [ + "src/**/*", + "./setupTests.ts", + "tools/**/*" + ] }