From 330e11c7ff0151e1096e19b8ffdae7d64cae280e Mon Sep 17 00:00:00 2001 From: Pavel Date: Wed, 1 Nov 2023 00:36:45 +0500 Subject: [PATCH] feat(i18n): enhanced i18n support (#3730) --- .../default/src/ViewerLayout/ViewerHeader.tsx | 4 +- platform/app/src/routes/WorkList/WorkList.tsx | 16 +++--- .../app/src/routes/WorkList/filtersMeta.js | 16 +++--- platform/i18n/src/locales/de/AboutModal.json | 8 +-- platform/i18n/src/locales/de/Buttons.json | 2 +- platform/i18n/src/locales/de/StudyList.json | 2 +- .../src/locales/de/UserPreferencesModal.json | 4 +- .../i18n/src/locales/en-US/AboutModal.json | 12 +++-- platform/i18n/src/locales/en-US/Buttons.json | 2 +- .../i18n/src/locales/en-US/DatePicker.json | 6 ++- .../i18n/src/locales/en-US/StudyList.json | 5 +- .../locales/en-US/UserPreferencesModal.json | 4 +- platform/i18n/src/locales/es/AboutModal.json | 8 +-- platform/i18n/src/locales/es/Buttons.json | 2 +- platform/i18n/src/locales/es/StudyList.json | 5 +- .../src/locales/es/UserPreferencesModal.json | 4 +- platform/i18n/src/locales/fr/Buttons.json | 2 +- .../src/locales/fr/UserPreferencesModal.json | 4 +- platform/i18n/src/locales/ja-JP/Buttons.json | 2 +- .../locales/ja-JP/UserPreferencesModal.json | 4 +- .../i18n/src/locales/pt-BR/AboutModal.json | 8 +-- platform/i18n/src/locales/pt-BR/Buttons.json | 2 +- .../locales/pt-BR/UserPreferencesModal.json | 4 +- .../i18n/src/locales/test-LNG/AboutModal.json | 10 ++-- .../i18n/src/locales/test-LNG/Buttons.json | 2 +- .../i18n/src/locales/test-LNG/DatePicker.json | 6 ++- .../i18n/src/locales/test-LNG/StudyList.json | 2 +- .../test-LNG/UserPreferencesModal.json | 4 +- .../i18n/src/locales/tr-TR/AboutModal.json | 8 +-- platform/i18n/src/locales/tr-TR/Buttons.json | 2 +- .../i18n/src/locales/tr-TR/StudyList.json | 2 +- .../locales/tr-TR/UserPreferencesModal.json | 4 +- platform/i18n/src/locales/vi/Buttons.json | 2 +- platform/i18n/src/locales/vi/StudyList.json | 2 +- .../src/locales/vi/UserPreferencesModal.json | 4 +- platform/i18n/src/locales/zh/Buttons.json | 2 +- platform/i18n/src/locales/zh/StudyList.json | 3 +- .../src/locales/zh/UserPreferencesModal.json | 4 +- .../src/components/AboutModal/AboutModal.tsx | 28 +++++----- .../ui/src/components/DateRange/DateRange.tsx | 51 ++++++++++--------- .../HotkeysPreferences/HotkeysPreferences.tsx | 2 +- .../InputLabelWrapper/InputLabelWrapper.tsx | 5 +- .../StudyListExpandedRow.tsx | 5 +- .../StudyListFilter/StudyListFilter.tsx | 2 +- .../StudyListPagination.tsx | 2 +- .../UserPreferences/UserPreferences.tsx | 2 +- 46 files changed, 146 insertions(+), 134 deletions(-) diff --git a/extensions/default/src/ViewerLayout/ViewerHeader.tsx b/extensions/default/src/ViewerLayout/ViewerHeader.tsx index 6b7f5bfd3f..00ec7b4796 100644 --- a/extensions/default/src/ViewerLayout/ViewerHeader.tsx +++ b/extensions/default/src/ViewerLayout/ViewerHeader.tsx @@ -53,7 +53,7 @@ function ViewerHeader({ hotkeysManager, extensionManager, servicesManager }) { onClick: () => show({ content: AboutModal, - title: 'About OHIF Viewer', + title: t('AboutModal:About OHIF Viewer'), contentProps: { versionNumber, commitHash }, }), }, @@ -62,7 +62,7 @@ function ViewerHeader({ hotkeysManager, extensionManager, servicesManager }) { icon: 'settings', onClick: () => show({ - title: t('UserPreferencesModal:User Preferences'), + title: t('UserPreferencesModal:User preferences'), content: UserPreferences, contentProps: { hotkeyDefaults: hotkeysManager.getValidHotkeyDefinitions(hotkeyDefaults), diff --git a/platform/app/src/routes/WorkList/WorkList.tsx b/platform/app/src/routes/WorkList/WorkList.tsx index 8e8af65f5e..fa236ce701 100644 --- a/platform/app/src/routes/WorkList/WorkList.tsx +++ b/platform/app/src/routes/WorkList/WorkList.tsx @@ -254,11 +254,11 @@ function WorkList({ const studyDate = date && moment(date, ['YYYYMMDD', 'YYYY.MM.DD'], true).isValid() && - moment(date, ['YYYYMMDD', 'YYYY.MM.DD']).format('MMM-DD-YYYY'); + moment(date, ['YYYYMMDD', 'YYYY.MM.DD']).format(t('Common:localDateFormat','MMM-DD-YYYY')); const studyTime = time && moment(time, ['HH', 'HHmm', 'HHmmss', 'HHmmss.SSS']).isValid() && - moment(time, ['HH', 'HHmm', 'HHmmss', 'HHmmss.SSS']).format('hh:mm A'); + moment(time, ['HH', 'HHmm', 'HHmmss', 'HHmmss.SSS']).format(t('Common:localTimeFormat', 'hh:mm A')); return { dataCY: `studyRow-${studyInstanceUid}`, @@ -327,10 +327,10 @@ function WorkList({ expandedContent: ( show({ content: AboutModal, - title: 'About OHIF Viewer', + title: t('AboutModal:About OHIF Viewer'), contentProps: { versionNumber, commitHash }, }), }, @@ -425,7 +425,7 @@ function WorkList({ icon: 'settings', onClick: () => show({ - title: t('UserPreferencesModal:User Preferences'), + title: t('UserPreferencesModal:User preferences'), content: UserPreferences, contentProps: { hotkeyDefaults: hotkeysManager.getValidHotkeyDefinitions(hotkeyDefaults), diff --git a/platform/app/src/routes/WorkList/filtersMeta.js b/platform/app/src/routes/WorkList/filtersMeta.js index a6bf204b53..7057c8b3b8 100644 --- a/platform/app/src/routes/WorkList/filtersMeta.js +++ b/platform/app/src/routes/WorkList/filtersMeta.js @@ -1,35 +1,37 @@ +import i18n from 'i18next'; + const filtersMeta = [ { name: 'patientName', - displayName: 'PatientName', + displayName: i18n.t('StudyList:PatientName'), inputType: 'Text', isSortable: true, gridCol: 4, }, { name: 'mrn', - displayName: 'MRN', + displayName: i18n.t('StudyList:MRN'), inputType: 'Text', isSortable: true, gridCol: 3, }, { name: 'studyDate', - displayName: 'StudyDate', + displayName: i18n.t('StudyList:StudyDate'), inputType: 'DateRange', isSortable: true, gridCol: 5, }, { name: 'description', - displayName: 'StudyDescription', + displayName: i18n.t('StudyList:Description'), inputType: 'Text', isSortable: true, gridCol: 4, }, { name: 'modalities', - displayName: 'Modality', + displayName: i18n.t('StudyList:Modality'), inputType: 'MultiSelect', inputProps: { options: [ @@ -110,14 +112,14 @@ const filtersMeta = [ }, { name: 'accession', - displayName: 'AccessionNumber', + displayName: i18n.t('StudyList:AccessionNumber'), inputType: 'Text', isSortable: true, gridCol: 3, }, { name: 'instances', - displayName: 'Instances', + displayName: i18n.t('StudyList:Instances'), inputType: 'None', isSortable: false, gridCol: 2, diff --git a/platform/i18n/src/locales/de/AboutModal.json b/platform/i18n/src/locales/de/AboutModal.json index 29d0b30578..c64654d6d2 100644 --- a/platform/i18n/src/locales/de/AboutModal.json +++ b/platform/i18n/src/locales/de/AboutModal.json @@ -1,14 +1,14 @@ { + "About OHIF Viewer": "Über OHIF Viewer", "Browser": "Browser", - "Build Number": "Build-Nummer", - "Latest Master Commits": "Letzter Master Commit", + "Build number": "Build-Nummer", + "Last master commits": "Letzter Master Commit", "More details": "Mehr Details", "Name": "Name", - "About OHIF Viewer": "Über OHIF Viewer", "OS": "OS", "Report an issue": "Ein Problem melden", "Repository URL": "Repository URL", "Value": "Wert", - "Version Information": "Informationen zur Version", + "Version information": "Informationen zur Version", "Visit the forum": "Besuchen Sie das Forum" } diff --git a/platform/i18n/src/locales/de/Buttons.json b/platform/i18n/src/locales/de/Buttons.json index 9bf993f362..9adac93e07 100644 --- a/platform/i18n/src/locales/de/Buttons.json +++ b/platform/i18n/src/locales/de/Buttons.json @@ -36,7 +36,7 @@ "Rectangle": "Rechteck", "Reset": "$t(Common:Reset)", "Reset View": "$t(Common:Reset)", - "Reset to Defaults": "Auf Default zurücksetzen", + "Reset to defaults": "Auf Default zurücksetzen", "Rotate Right": "Nach rechts drehen", "Rotate +90": "Drehen +90", "Sagittal": "Sagittal", diff --git a/platform/i18n/src/locales/de/StudyList.json b/platform/i18n/src/locales/de/StudyList.json index 2794ba8938..0759eb8617 100644 --- a/platform/i18n/src/locales/de/StudyList.json +++ b/platform/i18n/src/locales/de/StudyList.json @@ -9,5 +9,5 @@ "Description": "Beschreibung", "Study list": "Studienliste", "Instances": "Instanzen", - "Studies": "Studien" + "Number of studies": "Studien" } diff --git a/platform/i18n/src/locales/de/UserPreferencesModal.json b/platform/i18n/src/locales/de/UserPreferencesModal.json index 4ae672cbf7..04790fdfc5 100644 --- a/platform/i18n/src/locales/de/UserPreferencesModal.json +++ b/platform/i18n/src/locales/de/UserPreferencesModal.json @@ -1,11 +1,11 @@ { "Cancel": "$t(Buttons:Cancel)", "No hotkeys found": "Keine Hotkeys gefunden.", - "Reset to Defaults": "$t(Buttons:Reset to Defaults)", + "Reset to defaults": "$t(Buttons:Reset to defaults)", "ResetDefaultMessage": "Einstellungen zurückgesetzt. Bitte speichern.", "Save": "$t(Buttons:Save)", "SaveMessage": "Gespeichert", - "User Preferences": "Benutzereinstellungen", + "User preferences": "Benutzereinstellungen", "Language": "Sprache", "General": "Allgemein" } diff --git a/platform/i18n/src/locales/en-US/AboutModal.json b/platform/i18n/src/locales/en-US/AboutModal.json index 55e0144c90..aa00fc0b67 100644 --- a/platform/i18n/src/locales/en-US/AboutModal.json +++ b/platform/i18n/src/locales/en-US/AboutModal.json @@ -1,14 +1,18 @@ { + "About OHIF Viewer": "About OHIF Viewer", "Browser": "Browser", - "Build Number": "Build Number", - "Latest Master Commits": "Latest Master Commits", + "Build number": "Build Number", + "Commit hash": "Commit hash", + "Data citation": "Data citation", + "Important links": "Important links", + "Last master commits": "Latest Master Commits", "More details": "More details", "Name": "Name", - "OHIF Viewer - About": "OHIF Viewer - About", "OS": "OS", "Report an issue": "Report an issue", "Repository URL": "Repository URL", "Value": "Value", - "Version Information": "Version Information", + "Version information": "Version Information", + "Version number": "Version number", "Visit the forum": "Visit the forum" } diff --git a/platform/i18n/src/locales/en-US/Buttons.json b/platform/i18n/src/locales/en-US/Buttons.json index 7e5f23b36a..4a2d259a73 100644 --- a/platform/i18n/src/locales/en-US/Buttons.json +++ b/platform/i18n/src/locales/en-US/Buttons.json @@ -39,7 +39,7 @@ "Rectangle": "Rectangle", "Reference Lines": "Reference Lines", "Reset": "$t(Common:Reset)", - "Reset to Defaults": "$t(Common:Reset) to Defaults", + "Reset to defaults": "$t(Common:Reset) to Defaults", "Rotate Right": "Rotate Right", "Sagittal": "Sagittal", "Save": "Save", diff --git a/platform/i18n/src/locales/en-US/DatePicker.json b/platform/i18n/src/locales/en-US/DatePicker.json index 24187a1cf4..3add53f9e7 100644 --- a/platform/i18n/src/locales/en-US/DatePicker.json +++ b/platform/i18n/src/locales/en-US/DatePicker.json @@ -1,5 +1,9 @@ { "Clear dates": "Clear dates", + "Close": "$t(Common:Close)", "End Date": "End Date", - "Start Date": "Start Date" + "Last 7 days": "Last 7 days", + "Last 30 days": "Last 30 days", + "Start Date": "Start Date", + "Today": "Today" } diff --git a/platform/i18n/src/locales/en-US/StudyList.json b/platform/i18n/src/locales/en-US/StudyList.json index 3c2c731eca..9ee5a74fb4 100644 --- a/platform/i18n/src/locales/en-US/StudyList.json +++ b/platform/i18n/src/locales/en-US/StudyList.json @@ -11,9 +11,8 @@ "Previous": "< Back", "Page": "Page", "Next": "Next >", - "ResultsPerPage": "Results per page", - "Studies": "Studies", + "Results per page": "Results per page", + "Number of studies": "Studies", "StudyDate": "Study Date", - "StudyDescription": "Description", "StudyList": "Study List" } diff --git a/platform/i18n/src/locales/en-US/UserPreferencesModal.json b/platform/i18n/src/locales/en-US/UserPreferencesModal.json index 33b331f598..5e73354681 100644 --- a/platform/i18n/src/locales/en-US/UserPreferencesModal.json +++ b/platform/i18n/src/locales/en-US/UserPreferencesModal.json @@ -1,9 +1,9 @@ { "Cancel": "$t(Buttons:Cancel)", "No hotkeys found": "No hotkeys are configured for this application. Hotkeys can be configured in the application's app-config.js file.", - "Reset to Defaults": "$t(Buttons:Reset to Defaults)", + "Reset to defaults": "$t(Buttons:Reset to defaults)", "ResetDefaultMessage": "Preferences successfully reset to default.
You must Save to perform this action.", "Save": "$t(Buttons:Save)", "SaveMessage": "Preferences saved", - "User Preferences": "User Preferences" + "User preferences": "User Preferences" } diff --git a/platform/i18n/src/locales/es/AboutModal.json b/platform/i18n/src/locales/es/AboutModal.json index 74cab12b24..22153c9fe6 100644 --- a/platform/i18n/src/locales/es/AboutModal.json +++ b/platform/i18n/src/locales/es/AboutModal.json @@ -1,14 +1,14 @@ { + "About OHIF Viewer": "Sobre OHIF Viewer", "Browser": "Navegador", - "Build Number": "Número de compilación", - "Latest Master Commits": "Últimos Master Commits", + "Build number": "Número de compilación", + "Last master commits": "Últimos Master Commits", "More details": "Más detalles", "Name": "Nombre", - "OHIF Viewer - About": "Sobre OHIF Viewer", "OS": "SO", "Report an issue": "Informar un problema", "Repository URL": "URL del repositorio", "Value": "Valor", - "Version Information": "Información de la versión", + "Version information": "Información de la versión", "Visit the forum": "Visita el foro" } diff --git a/platform/i18n/src/locales/es/Buttons.json b/platform/i18n/src/locales/es/Buttons.json index d7e0acfbfb..ce1a1a999b 100644 --- a/platform/i18n/src/locales/es/Buttons.json +++ b/platform/i18n/src/locales/es/Buttons.json @@ -32,7 +32,7 @@ "ROI Window": "Ventana ROI", "Rectangle": "Rectángulo", "Reset": "$t(Common:Reset)", - "Reset to Defaults": "$t(Common:Reset) por defecto", + "Reset to defaults": "$t(Common:Reset) por defecto", "Rotate Right": "Girar ->", "Sagittal": "Sagital", "Save": "Guardar", diff --git a/platform/i18n/src/locales/es/StudyList.json b/platform/i18n/src/locales/es/StudyList.json index b20d1c98cc..eb1d970f00 100644 --- a/platform/i18n/src/locales/es/StudyList.json +++ b/platform/i18n/src/locales/es/StudyList.json @@ -11,9 +11,8 @@ "Previous": "< Anterior", "Page": "Página", "Next": "Siguiente >", - "ResultsPerPage": "Resultados por página", - "Studies": "Estudios", + "Results per page": "Resultados por página", + "Number of studies": "Estudios", "StudyDate": "Fecha del estudio", - "StudyDescription": "Descripción", "StudyList": "Lista de Estudios" } diff --git a/platform/i18n/src/locales/es/UserPreferencesModal.json b/platform/i18n/src/locales/es/UserPreferencesModal.json index 4534903afc..f0a9fe8ca2 100644 --- a/platform/i18n/src/locales/es/UserPreferencesModal.json +++ b/platform/i18n/src/locales/es/UserPreferencesModal.json @@ -1,6 +1,6 @@ { "Cancel": "$t(Buttons:Cancel)", - "Reset to Defaults": "$t(Buttons:Reset to Defaults)", + "Reset to defaults": "$t(Buttons:Reset to defaults)", "Save": "$t(Buttons:Save)", - "User Preferences": "Preferencias de Usuario" + "User preferences": "Preferencias de Usuario" } diff --git a/platform/i18n/src/locales/fr/Buttons.json b/platform/i18n/src/locales/fr/Buttons.json index 50e7dfadc4..c97dfaac66 100644 --- a/platform/i18n/src/locales/fr/Buttons.json +++ b/platform/i18n/src/locales/fr/Buttons.json @@ -31,7 +31,7 @@ "ROI Window": "ROI fenêtrage", "Rectangle": "Rectangle", "Reset": "$t(Common:Reset)", - "Reset to Defaults": "Valeurs d'usine", + "Reset to defaults": "Valeurs d'usine", "Rotate Right": "Tourner à droite", "Sagittal": "Sagittal", "Save": "Sauvegarder", diff --git a/platform/i18n/src/locales/fr/UserPreferencesModal.json b/platform/i18n/src/locales/fr/UserPreferencesModal.json index 506547fd98..424cfe98ef 100644 --- a/platform/i18n/src/locales/fr/UserPreferencesModal.json +++ b/platform/i18n/src/locales/fr/UserPreferencesModal.json @@ -1,6 +1,6 @@ { "Cancel": "$t(Buttons:Cancel)", - "Reset to Defaults": "$t(Buttons:Reset to Defaults)", + "Reset to defaults": "$t(Buttons:Reset to defaults)", "Save": "$t(Buttons:Save)", - "User Preferences": "Préférences utilisateur" + "User preferences": "Préférences utilisateur" } diff --git a/platform/i18n/src/locales/ja-JP/Buttons.json b/platform/i18n/src/locales/ja-JP/Buttons.json index aed8434026..43934aa65c 100644 --- a/platform/i18n/src/locales/ja-JP/Buttons.json +++ b/platform/i18n/src/locales/ja-JP/Buttons.json @@ -31,7 +31,7 @@ "ROI Window": "ROIウィンドウ", "Rectangle": "長方形", "Reset": "$t(Common:Reset)", - "Reset to Defaults": "デフォルトへ$t(Common:Reset)", + "Reset to defaults": "デフォルトへ$t(Common:Reset)", "Rotate Right": "右に回転", "Sagittal": "サジタル", "Save": "保存", diff --git a/platform/i18n/src/locales/ja-JP/UserPreferencesModal.json b/platform/i18n/src/locales/ja-JP/UserPreferencesModal.json index b7215966cb..80a545b4f9 100644 --- a/platform/i18n/src/locales/ja-JP/UserPreferencesModal.json +++ b/platform/i18n/src/locales/ja-JP/UserPreferencesModal.json @@ -1,6 +1,6 @@ { "Cancel": "$t(Buttons:Cancel)", - "Reset to Defaults": "$t(Buttons:Reset to Defaults)", + "Reset to defaults": "$t(Buttons:Reset to defaults)", "Save": "$t(Buttons:Save)", - "User Preferences": "ユーザプレファレンス" + "User preferences": "ユーザプレファレンス" } diff --git a/platform/i18n/src/locales/pt-BR/AboutModal.json b/platform/i18n/src/locales/pt-BR/AboutModal.json index 23ccac43ab..00e56c6412 100644 --- a/platform/i18n/src/locales/pt-BR/AboutModal.json +++ b/platform/i18n/src/locales/pt-BR/AboutModal.json @@ -1,14 +1,14 @@ { + "About OHIF Viewer": "OHIF Viewer - Sobre", "Browser": "Navegador", - "Build Number": "Número da compilação", - "Latest Master Commits": "Últimos Commits na Master", + "Build number": "Número da compilação", + "Last master commits": "Últimos Commits na Master", "More details": "Mais detalhes", "Name": "Nome", - "OHIF Viewer - About": "OHIF Viewer - Sobre", "OS": "SO", "Report an issue": "Informar um problema", "Repository URL": "URL do Repositório", "Value": "Valor", - "Version Information": "Informação da Versão", + "Version information": "Informação da Versão", "Visit the forum": "Visite o fórum" } diff --git a/platform/i18n/src/locales/pt-BR/Buttons.json b/platform/i18n/src/locales/pt-BR/Buttons.json index 0e910aed10..838e42bd93 100644 --- a/platform/i18n/src/locales/pt-BR/Buttons.json +++ b/platform/i18n/src/locales/pt-BR/Buttons.json @@ -32,7 +32,7 @@ "ROI Window": "Janela ROI", "Rectangle": "Retângulo", "Reset": "$t(Common:Reset)", - "Reset to Defaults": "$t(Common:Reset) para o Padrão", + "Reset to defaults": "$t(Common:Reset) para o Padrão", "Rotate Right": "Girar à direita", "Sagittal": "Sagital", "Save": "Salvar", diff --git a/platform/i18n/src/locales/pt-BR/UserPreferencesModal.json b/platform/i18n/src/locales/pt-BR/UserPreferencesModal.json index 046be3c074..6d85f2a9fd 100644 --- a/platform/i18n/src/locales/pt-BR/UserPreferencesModal.json +++ b/platform/i18n/src/locales/pt-BR/UserPreferencesModal.json @@ -1,8 +1,8 @@ { "Cancel": "Cancelar", - "Reset to Defaults": "$t(Common:Reset) para Padrão", + "Reset to defaults": "$t(Common:Reset) para Padrão", "ResetDefaultMessage": "Preferências resetadas com sucesso.
Você deve Salvar para que essa ação seja realizada.", "Save": "Salvar", "SaveMessage": "Preferências salvas", - "User Preferences": "Preferências do Usuário" + "User preferences": "Preferências do Usuário" } diff --git a/platform/i18n/src/locales/test-LNG/AboutModal.json b/platform/i18n/src/locales/test-LNG/AboutModal.json index 55e0144c90..6608ef6c5b 100644 --- a/platform/i18n/src/locales/test-LNG/AboutModal.json +++ b/platform/i18n/src/locales/test-LNG/AboutModal.json @@ -1,14 +1,18 @@ { + "About OHIF Viewer": "About OHIF Viewer", "Browser": "Browser", "Build Number": "Build Number", - "Latest Master Commits": "Latest Master Commits", + "Commit hash": "Commit hash", + "Data citation": "Data citation", + "Important links": "Important links", + "Last master commits": "Latest Master Commits", "More details": "More details", "Name": "Name", - "OHIF Viewer - About": "OHIF Viewer - About", "OS": "OS", "Report an issue": "Report an issue", "Repository URL": "Repository URL", "Value": "Value", - "Version Information": "Version Information", + "Version information": "Version Information", + "Version number": "Version number", "Visit the forum": "Visit the forum" } diff --git a/platform/i18n/src/locales/test-LNG/Buttons.json b/platform/i18n/src/locales/test-LNG/Buttons.json index 62e1cf81ff..999309aa2b 100644 --- a/platform/i18n/src/locales/test-LNG/Buttons.json +++ b/platform/i18n/src/locales/test-LNG/Buttons.json @@ -32,7 +32,7 @@ "ROI Window": "Test ROI Window", "Rectangle": "Test Rectangle", "Reset": "Test $t(Common:Reset)", - "Reset to Defaults": "Test $t(Common:Reset) to Defaults", + "Reset to defaults": "Test $t(Common:Reset) to Defaults", "Rotate Right": "Test Rotate Right", "Sagittal": "Test Sagittal", "Save": "Test Save", diff --git a/platform/i18n/src/locales/test-LNG/DatePicker.json b/platform/i18n/src/locales/test-LNG/DatePicker.json index 24187a1cf4..3add53f9e7 100644 --- a/platform/i18n/src/locales/test-LNG/DatePicker.json +++ b/platform/i18n/src/locales/test-LNG/DatePicker.json @@ -1,5 +1,9 @@ { "Clear dates": "Clear dates", + "Close": "$t(Common:Close)", "End Date": "End Date", - "Start Date": "Start Date" + "Last 7 days": "Last 7 days", + "Last 30 days": "Last 30 days", + "Start Date": "Start Date", + "Today": "Today" } diff --git a/platform/i18n/src/locales/test-LNG/StudyList.json b/platform/i18n/src/locales/test-LNG/StudyList.json index 5e06459fbc..ea4b300759 100644 --- a/platform/i18n/src/locales/test-LNG/StudyList.json +++ b/platform/i18n/src/locales/test-LNG/StudyList.json @@ -12,7 +12,7 @@ "Description": "Test Description", "StudyDate": "Test Study Date", "Study date": "Test Study Date", - "Studies": "Test Studies", + "Number of studies": "Test Studies", "Series": "Test Series", "Instances": "Test Instances", "Study List": "Test Study List", diff --git a/platform/i18n/src/locales/test-LNG/UserPreferencesModal.json b/platform/i18n/src/locales/test-LNG/UserPreferencesModal.json index c5ae4fde84..e6c003fecc 100644 --- a/platform/i18n/src/locales/test-LNG/UserPreferencesModal.json +++ b/platform/i18n/src/locales/test-LNG/UserPreferencesModal.json @@ -1,11 +1,11 @@ { "Cancel": "$t(Buttons:Cancel)", "No hotkeys found": "No hotkeys are configured for this application. Hotkeys can be configured in the application's app-config.js file.", - "Reset to Defaults": "$t(Buttons:Reset to Defaults)", + "Reset to defaults": "$t(Buttons:Reset to defaults)", "ResetDefaultMessage": "Preferences successfully reset to default.
You must Save to perform this action.", "Save": "$t(Buttons:Save)", "SaveMessage": "Test Preferences saved", - "User Preferences": "Test User Preferences", + "User preferences": "Test User Preferences", "Function": "Test function", "Shortcut": "Test shortcut", "Language": "Test language", diff --git a/platform/i18n/src/locales/tr-TR/AboutModal.json b/platform/i18n/src/locales/tr-TR/AboutModal.json index 487e4082c6..b60829bb75 100644 --- a/platform/i18n/src/locales/tr-TR/AboutModal.json +++ b/platform/i18n/src/locales/tr-TR/AboutModal.json @@ -1,14 +1,14 @@ { + "About OHIF Viewer": "OHIF Viewer - Hakkında", "Browser": "Tarayıcı", - "Build Number": "Derleme Numarası", - "Latest Master Commits": "Son Kaynak Kod Güncellemesi", + "Build number": "Derleme Numarası", + "Last master commits": "Son Kaynak Kod Güncellemesi", "More details": "Daha Fazla Detay", "Name": "İsim", - "OHIF Viewer - About": "OHIF Viewer - Hakkında", "OS": "İşletim Sistemi", "Report an issue": "Sorun Bildir", "Repository URL": "Kaynak Kod URL", "Value": "Değer", - "Version Information": "Sürüm Bilgisi", + "Version information": "Sürüm Bilgisi", "Visit the forum": "Forumu ziyaret et" } diff --git a/platform/i18n/src/locales/tr-TR/Buttons.json b/platform/i18n/src/locales/tr-TR/Buttons.json index 83c2655c11..f397797c07 100644 --- a/platform/i18n/src/locales/tr-TR/Buttons.json +++ b/platform/i18n/src/locales/tr-TR/Buttons.json @@ -32,7 +32,7 @@ "ROI Window": "ROI Penceresi", "Rectangle": "Diktörtgen", "Reset": "$t(Common:Reset)", - "Reset to Defaults": "Varsayılana $t(Common:Reset)", + "Reset to defaults": "Varsayılana $t(Common:Reset)", "Rotate Right": "Sağa Döndür", "Sagittal": "Sagital", "Save": "Kaydet", diff --git a/platform/i18n/src/locales/tr-TR/StudyList.json b/platform/i18n/src/locales/tr-TR/StudyList.json index 4eaea20ca8..956621411d 100644 --- a/platform/i18n/src/locales/tr-TR/StudyList.json +++ b/platform/i18n/src/locales/tr-TR/StudyList.json @@ -5,6 +5,6 @@ "Modality": "Modalite", "PatientName": "Hasta Adı", "StudyDate": "Çalışma Zamanı", - "StudyDescription": "Açıklama", + "Description": "Açıklama", "StudyList": "Çalışma Listesi" } diff --git a/platform/i18n/src/locales/tr-TR/UserPreferencesModal.json b/platform/i18n/src/locales/tr-TR/UserPreferencesModal.json index 1a843a3a4a..16cf465933 100644 --- a/platform/i18n/src/locales/tr-TR/UserPreferencesModal.json +++ b/platform/i18n/src/locales/tr-TR/UserPreferencesModal.json @@ -1,9 +1,9 @@ { "Cancel": "$t(Buttons:Cancel)", "No hotkeys found": "Bu uygulama için hiçbir kısayol tuşu yapılandırılmamış. Kısayol tuşları, uygulamanın app-config.js dosyasında yapılandırılabilir.", - "Reset to Defaults": "$t(Buttons:Reset to Defaults)", + "Reset to defaults": "$t(Buttons:Reset to defaults)", "ResetDefaultMessage": "Tercihler başarıyla varsayılana sıfırlandı.
Bu eylemi gerçekleştirmek için Kaydetmelisiniz.", "Save": "$t(Buttons:Save)", "SaveMessage": "Tercihler kaydedildi", - "User Preferences": "Kullanıcı tercihleri" + "User preferences": "Kullanıcı tercihleri" } diff --git a/platform/i18n/src/locales/vi/Buttons.json b/platform/i18n/src/locales/vi/Buttons.json index ea378b41a8..952ec814fa 100644 --- a/platform/i18n/src/locales/vi/Buttons.json +++ b/platform/i18n/src/locales/vi/Buttons.json @@ -31,7 +31,7 @@ "ROI Window": "ROI Window", "Rectangle": "Đo chữ nhật", "Reset": "$t(Common:Reset)", - "Reset to Defaults": "$t(Common:Reset) đến mặc định", + "Reset to defaults": "$t(Common:Reset) đến mặc định", "Rotate Right": "Xoay phải", "Sagittal": "Mặt phẳng đứng dọc", "Save": "Lưu", diff --git a/platform/i18n/src/locales/vi/StudyList.json b/platform/i18n/src/locales/vi/StudyList.json index 50acf54b68..4f13a5e4f4 100644 --- a/platform/i18n/src/locales/vi/StudyList.json +++ b/platform/i18n/src/locales/vi/StudyList.json @@ -5,6 +5,6 @@ "Modality": "Thiết bị", "PatientName": "Tên Bệnh nhân", "StudyDate": "Ngày chụp", - "StudyDescription": "Diễn giải", + "Description": "Diễn giải", "StudyList": "Danh sách" } diff --git a/platform/i18n/src/locales/vi/UserPreferencesModal.json b/platform/i18n/src/locales/vi/UserPreferencesModal.json index f5474c9e5e..38ad6eda72 100644 --- a/platform/i18n/src/locales/vi/UserPreferencesModal.json +++ b/platform/i18n/src/locales/vi/UserPreferencesModal.json @@ -1,6 +1,6 @@ { "Cancel": "$t(Buttons:Cancel)", - "Reset to Defaults": "$t(Buttons:Reset to Defaults)", + "Reset to defaults": "$t(Buttons:Reset to defaults)", "Save": "$t(Buttons:Save)", - "User Preferences": "Thiết lập theo người dùng" + "User preferences": "Thiết lập theo người dùng" } diff --git a/platform/i18n/src/locales/zh/Buttons.json b/platform/i18n/src/locales/zh/Buttons.json index ea57d0b3b3..fe99f01236 100644 --- a/platform/i18n/src/locales/zh/Buttons.json +++ b/platform/i18n/src/locales/zh/Buttons.json @@ -49,7 +49,7 @@ "Probe": "探针", "Rectangle": "矩形", "Reference Lines": "参考线", - "Reset to Defaults": "返回默认", + "Reset to defaults": "返回默认", "Reset View": "复原", "Reset": "复原", "ROI Window": "选择对比度", diff --git a/platform/i18n/src/locales/zh/StudyList.json b/platform/i18n/src/locales/zh/StudyList.json index d7563ff553..478d3f8029 100644 --- a/platform/i18n/src/locales/zh/StudyList.json +++ b/platform/i18n/src/locales/zh/StudyList.json @@ -3,7 +3,6 @@ "Modality": "成像设备", "PatientName": "患者姓名", "StudyDate": "检查日期", - "StudyDescription": "描述", "StudyList": "检查列表", "Patient Name": "患者姓名", "MRN": "病例号", @@ -11,7 +10,7 @@ "Description": "描述", "Study list": "检查列表", "Clear filters": "清空条件", - "Studies": "", + "Number of studies": "", "Instances": "图像数", "Accession": "检查号", "Results per page": "每页条数", diff --git a/platform/i18n/src/locales/zh/UserPreferencesModal.json b/platform/i18n/src/locales/zh/UserPreferencesModal.json index e71386abc6..41ddeddec6 100644 --- a/platform/i18n/src/locales/zh/UserPreferencesModal.json +++ b/platform/i18n/src/locales/zh/UserPreferencesModal.json @@ -1,6 +1,6 @@ { "Cancel": "取消", - "Reset to Defaults": "返回默认", + "Reset to defaults": "返回默认", "Save": "保存", - "User Preferences": "用户偏好" + "User preferences": "用户偏好" } diff --git a/platform/ui/src/components/AboutModal/AboutModal.tsx b/platform/ui/src/components/AboutModal/AboutModal.tsx index 477b48a9ee..1c027c87f1 100644 --- a/platform/ui/src/components/AboutModal/AboutModal.tsx +++ b/platform/ui/src/components/AboutModal/AboutModal.tsx @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import detect from 'browser-detect'; +import { useTranslation } from 'react-i18next'; import Typography from '../Typography'; import Icon from '../Icon'; @@ -59,6 +60,7 @@ const Row = ({ title, value, link }) => { const AboutModal = ({ buildNumber, versionNumber, commitHash }) => { const { os, version, name } = detect(); const browser = `${name[0].toUpperCase()}${name.substr(1)} ${version}`; + const { t } = useTranslation('AboutModal'); const renderRowTitle = title => (
@@ -73,20 +75,20 @@ const AboutModal = ({ buildNumber, versionNumber, commitHash }) => { ); return (
- {renderRowTitle('Important Links')} + {renderRowTitle(t('Important links'))}
- Visit the forum + {t('Visit the forum')} - Report an issue + {t('Report an issue')} @@ -94,50 +96,50 @@ const AboutModal = ({ buildNumber, versionNumber, commitHash }) => { href="https://ohif.org/" showIcon={true} > - More details + {t('More details')}
- {renderRowTitle('Version Information')} + {renderRowTitle(t('Version information'))}
{/* */} {buildNumber && ( )} {commitHash && ( )}
diff --git a/platform/ui/src/components/DateRange/DateRange.tsx b/platform/ui/src/components/DateRange/DateRange.tsx index 93d81bef18..b93016731d 100644 --- a/platform/ui/src/components/DateRange/DateRange.tsx +++ b/platform/ui/src/components/DateRange/DateRange.tsx @@ -1,6 +1,7 @@ import React, { useState, useCallback } from 'react'; import PropTypes from 'prop-types'; import moment from 'moment'; +import { useTranslation } from 'react-i18next'; /** REACT DATES */ import { DateRangePicker, isInclusivelyBeforeDay } from 'react-dates'; @@ -8,27 +9,6 @@ import 'react-dates/initialize'; import 'react-dates/lib/css/_datepicker.css'; import './DateRange.css'; -const today = moment(); -const lastWeek = moment().subtract(7, 'day'); -const lastMonth = moment().subtract(1, 'month'); -const studyDatePresets = [ - { - text: 'Today', - start: today, - end: today, - }, - { - text: 'Last 7 days', - start: lastWeek, - end: today, - }, - { - text: 'Last 30 days', - start: lastMonth, - end: today, - }, -]; - const renderYearsOptions = () => { const currentYear = moment().year(); const options = []; @@ -52,6 +32,27 @@ const DateRange = props => { const { id, onChange, startDate, endDate } = props; const [focusedInput, setFocusedInput] = useState(null); const renderYearsOptionsCallback = useCallback(renderYearsOptions, []); + const { t } = useTranslation('DatePicker'); + const today = moment(); + const lastWeek = moment().subtract(7, 'day'); + const lastMonth = moment().subtract(1, 'month'); + const studyDatePresets = [ + { + text: t('Today'), + start: today, + end: today, + }, + { + text: t('Last 7 days'), + start: lastWeek, + end: today, + }, + { + text: t('Last 30 days'), + start: lastMonth, + end: today, + }, + ]; const renderDatePresets = () => { return ( @@ -149,11 +150,11 @@ const DateRange = props => { /** OPTIONAL */ renderCalendarInfo={renderDatePresets} renderMonthElement={renderMonthElement} - startDatePlaceholderText={'Start Date'} - endDatePlaceholderText={'End Date'} + startDatePlaceholderText={t('Start Date')} + endDatePlaceholderText={t('End Date')} phrases={{ - closeDatePicker: 'Close', - clearDates: 'Clear dates', + closeDatePicker: t('Close'), + clearDates: t('Clear dates'), }} isOutsideRange={day => !isInclusivelyBeforeDay(day, moment())} hideKeyboardShortcutsPanel={true} diff --git a/platform/ui/src/components/HotkeysPreferences/HotkeysPreferences.tsx b/platform/ui/src/components/HotkeysPreferences/HotkeysPreferences.tsx index 52cd2da07f..2b9b1eb02d 100644 --- a/platform/ui/src/components/HotkeysPreferences/HotkeysPreferences.tsx +++ b/platform/ui/src/components/HotkeysPreferences/HotkeysPreferences.tsx @@ -30,7 +30,7 @@ const HotkeysPreferences = ({ const splitedHotkeys = splitHotkeyDefinitionsAndCreateTuples(visibleHotkeys); if (!Object.keys(hotkeyDefinitions).length) { - return 'No hotkey definitions'; + return t('No hotkeys found'); } const onHotkeyChangeHandler = (id, definition) => { diff --git a/platform/ui/src/components/InputLabelWrapper/InputLabelWrapper.tsx b/platform/ui/src/components/InputLabelWrapper/InputLabelWrapper.tsx index 73172da58c..904b06904e 100644 --- a/platform/ui/src/components/InputLabelWrapper/InputLabelWrapper.tsx +++ b/platform/ui/src/components/InputLabelWrapper/InputLabelWrapper.tsx @@ -1,7 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; -import { useTranslation } from 'react-i18next'; import Icon from '../Icon'; @@ -21,8 +20,6 @@ const InputLabelWrapper = ({ className, children, }) => { - const { t } = useTranslation('StudyList'); - const onClickHandler = e => { if (!isSortable) { return; @@ -40,7 +37,7 @@ const InputLabelWrapper = ({ onKeyDown={onClickHandler} tabIndex="0" > - {t(label)} + {label} {isSortable && ( { - const { t } = useTranslation('StudyList'); - return (
{children}
@@ -19,7 +16,7 @@ const StudyListExpandedRow = ({ seriesTableColumns, seriesTableDataSource, child {Object.keys(seriesTableColumns).map(columnKey => { - return {t(seriesTableColumns[columnKey])}; + return {seriesTableColumns[columnKey]}; })} diff --git a/platform/ui/src/components/StudyListFilter/StudyListFilter.tsx b/platform/ui/src/components/StudyListFilter/StudyListFilter.tsx index 8abe1d37c8..8db3d8393f 100644 --- a/platform/ui/src/components/StudyListFilter/StudyListFilter.tsx +++ b/platform/ui/src/components/StudyListFilter/StudyListFilter.tsx @@ -78,7 +78,7 @@ const StudyListFilter = ({ variant="h6" className="text-primary-light" > - {t('Studies')} + {t('Number of studies')}
diff --git a/platform/ui/src/components/StudyListPagination/StudyListPagination.tsx b/platform/ui/src/components/StudyListPagination/StudyListPagination.tsx index de9067c23b..969af69815 100644 --- a/platform/ui/src/components/StudyListPagination/StudyListPagination.tsx +++ b/platform/ui/src/components/StudyListPagination/StudyListPagination.tsx @@ -43,7 +43,7 @@ const StudyListPagination = ({ onChangePage, currentPage, perPage, onChangePerPa hideSelectedOptions={true} onChange={onSelectedRange} /> - {t('ResultsPerPage')} + {t('Results per page')}
diff --git a/platform/ui/src/components/UserPreferences/UserPreferences.tsx b/platform/ui/src/components/UserPreferences/UserPreferences.tsx index e3934dbbaf..923838f4fe 100644 --- a/platform/ui/src/components/UserPreferences/UserPreferences.tsx +++ b/platform/ui/src/components/UserPreferences/UserPreferences.tsx @@ -112,7 +112,7 @@ const UserPreferences = ({ onClick={onResetHandler} disabled={disabled} > - {t('Reset to Defaults')} + {t('Reset to defaults')}