fix: [DHIS2-15945] translations in enrollment widget (#3433)

dhis2 · Nov 2, 2023 · c188767 · c188767
1 parent c557537
commit c188767
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Date/Date.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/Date/Date.component.js
@@ -17,6 +17,7 @@ import { dataElementTypes } from '../../../metaData';
 type Props = {
     date: string,
     dateLabel: string,
+    locale: string,
     editEnabled: boolean,
     displayAutoGeneratedEventWarning: boolean,
     onSave: (string) => void,
@@ -66,6 +67,7 @@ const styles = {
 const DateComponentPlain = ({
     date,
     dateLabel,
+    locale,
     editEnabled,
     displayAutoGeneratedEventWarning,
     onSave,
@@ -103,6 +105,7 @@ const DateComponentPlain = ({
                     className={classes.calendar}
                     label={dateLabel}
                     date={selectedDate}
+                    locale={locale}
                     onDateSelect={dateChangeHandler}
                 />
             </div>

diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.component.js
@@ -42,14 +42,15 @@ const styles = {
 
 const getGeometryType = geometryType =>
     (geometryType === 'Point' ? dataElementTypes.COORDINATE : dataElementTypes.POLYGON);
-const getEnrollmentDateLabel = program => program.enrollmentDateLabel || i18n.t('Enrollment date');
-const getIncidentDateLabel = program => program.incidentDateLabel || i18n.t('Incident date');
+const getEnrollmentDateLabel = program => program.displayEnrollmentDateLabel || i18n.t('Enrollment date');
+const getIncidentDateLabel = program => program.displayIncidentDateLabel || i18n.t('Incident date');
 
 export const WidgetEnrollmentPlain = ({
     classes,
     enrollment = {},
     program = {},
     ownerOrgUnit = {},
+    locale,
     refetchEnrollment,
     refetchTEI,
     initError,
@@ -97,6 +98,7 @@ export const WidgetEnrollmentPlain = ({
                             <Date
                                 date={enrollment.enrolledAt}
                                 dateLabel={getEnrollmentDateLabel(program)}
+                                locale={locale}
                                 editEnabled={editDateEnabled}
                                 displayAutoGeneratedEventWarning={displayAutoGeneratedEventWarning}
                                 onSave={updateEnrollmentDate}
@@ -109,6 +111,7 @@ export const WidgetEnrollmentPlain = ({
                                 <Date
                                     date={enrollment.occurredAt}
                                     dateLabel={getIncidentDateLabel(program)}
+                                    locale={locale}
                                     editEnabled={editDateEnabled}
                                     displayAutoGeneratedEventWarning={displayAutoGeneratedEventWarning}
                                     onSave={updateIncidentDate}

diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js b/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js
@@ -7,6 +7,7 @@ import { useOrganizationUnit } from './hooks/useOrganizationUnit';
 import { useTrackedEntityInstances } from './hooks/useTrackedEntityInstances';
 import { useEnrollment } from './hooks/useEnrollment';
 import { useProgram } from './hooks/useProgram';
+import { useUserLocale } from '../../utils/localeData/useUserLocale';
 import type { Props } from './enrollment.types';
 import { plainStatus } from './constants/status.const';
 
@@ -42,11 +43,12 @@ export const WidgetEnrollment = ({
         refetch: refetchTEI,
     } = useTrackedEntityInstances(teiId, programId);
     const { error: errorOrgUnit, displayName } = useOrganizationUnit(ownerOrgUnit);
+    const { error: errorLocale, locale } = useUserLocale();
     const canAddNew = enrollments
         .filter(item => item.program === programId)
         .every(item => item.status !== plainStatus.ACTIVE);
     const containsAutoGeneratedEvent = program && program.programStages.some(({ autoGenerateEvent }) => autoGenerateEvent);
-    const error = errorEnrollment || errorProgram || errorOwnerOrgUnit || errorOrgUnit;
+    const error = errorEnrollment || errorProgram || errorOwnerOrgUnit || errorOrgUnit || errorLocale;
 
     if (error) {
         log.error(errorCreator('Enrollment widget could not be loaded')({ error }));
@@ -62,7 +64,8 @@ export const WidgetEnrollment = ({
             refetchEnrollment={refetchEnrollment}
             refetchTEI={refetchTEI}
             ownerOrgUnit={{ id: ownerOrgUnit, displayName }}
-            loading={!(enrollment && program && displayName)}
+            locale={locale}
+            loading={!(enrollment && program && displayName && locale)}
             onDelete={onDelete}
             onAddNew={onAddNew}
             updateEnrollmentDate={updateEnrollmentDate}

diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js b/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js
@@ -18,6 +18,7 @@ export type PlainProps = {|
     enrollment: Object,
     program: Object,
     ownerOrgUnit: Object,
+    locale: string,
     refetchEnrollment: QueryRefetchFunction,
     refetchTEI: QueryRefetchFunction,
     initError?: FetchError,

diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js
@@ -10,7 +10,7 @@ export const useProgram = (programId: string) => {
                     resource: `programs/${programId}`,
                     params: {
                         fields: [
-                            'displayIncidentDate,incidentDateLabel,enrollmentDateLabel,onlyEnrollOnce,trackedEntityType[displayName],programStages[autoGenerateEvent],access',
+                            'displayIncidentDate,displayIncidentDateLabel,displayEnrollmentDateLabel,onlyEnrollOnce,trackedEntityType[displayName],programStages[autoGenerateEvent],access',
                         ],
                     },
                 },