chore: improve wording

dhis2 · Nov 27, 2024 · ddb3f0e · ddb3f0e
1 parent d88b9c2
commit ddb3f0e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 30 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n"
-"PO-Revision-Date: 2024-11-07T11:57:59.094Z\n"
+"POT-Creation-Date: 2024-11-26T11:09:35.292Z\n"
+"PO-Revision-Date: 2024-11-26T11:09:35.292Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1424,8 +1424,8 @@ msgstr "{{trackedEntityTypeName}} profile"
 msgid "tracked entity instance"
 msgstr "tracked entity instance"
 
-msgid "Link to an existing {{linkableStageLabel}}"
-msgstr "Link to an existing {{linkableStageLabel}}"
+msgid "Choose a {{linkableStageLabel}} event"
+msgstr "Choose a {{linkableStageLabel}} event"
 
 msgid "Choose a {{linkableStageLabel}}"
 msgstr "Choose a {{linkableStageLabel}}"
@@ -1445,8 +1445,8 @@ msgstr "Ambiguous relationships, contact system administrator"
 msgid "Enter details now"
 msgstr "Enter details now"
 
-msgid "Link to an existing"
-msgstr "Link to an existing"
+msgid "Link to an existing event"
+msgstr "Link to an existing event"
 
 msgid "Scheduled date"
 msgstr "Scheduled date"
@@ -1681,15 +1681,6 @@ msgstr "Follow up"
 msgid "Choose a program stage to filter by {{label}}"
 msgstr "Choose a program stage to filter by {{label}}"
 
-msgid "Active enrollments"
-msgstr "Active enrollments"
-
-msgid "Completed enrollments"
-msgstr "Completed enrollments"
-
-msgid "Cancelled enrollments"
-msgstr "Cancelled enrollments"
-
 msgid ""
 "Some enrollments were completed successfully, but there was an error while "
 "completing the rest. Please see the details below."

diff --git a/...rollment/EnrollmentWithFirstStageDataEntry/EnrollmentWithFirstStageDataEntry.container.js b/...rollment/EnrollmentWithFirstStageDataEntry/EnrollmentWithFirstStageDataEntry.container.js
@@ -30,7 +30,6 @@ export const EnrollmentWithFirstStageDataEntry = (props: Props) => {
                 ref={relatedStageRef}
                 programId={passOnProps.programId}
                 programStageId={firstStageMetaData.stage?.id}
-                currentStageLabel={firstStageMetaData.stage?.name}
             />
         </>
     );

diff --git a/...modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js b/...modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
@@ -52,7 +52,6 @@ const ValidatedPlain = ({
                     enrollmentId={enrollmentId}
                     programId={programId}
                     programStageId={stage?.id}
-                    currentStageLabel={stage.name}
                     enableLinkExistingEvent
                 />
                 <FinishButtons

diff --git a/...les/capture-core/components/WidgetRelatedStages/EnterDataInOrgUnit/EnterData.component.js b/...les/capture-core/components/WidgetRelatedStages/EnterDataInOrgUnit/EnterData.component.js
@@ -48,7 +48,6 @@ type Props = {
     linkableStageLabel: string,
     relatedStagesDataValues: RelatedStageDataValueStates,
     setRelatedStagesDataValues: (() => Object) => void,
-    currentStageLabel: string,
     saveAttempted: boolean,
     errorMessages: ErrorMessagesForRelatedStages,
     ...CssClasses
@@ -60,7 +59,6 @@ export const EnterDataInOrgUnitPlain = ({
     setRelatedStagesDataValues,
     saveAttempted,
     errorMessages,
-    currentStageLabel,
     classes,
 }: Props) => {
     const onSelectOrgUnit = (e: { id: string, displayName: string, path: string }) => {
@@ -98,11 +96,10 @@ export const EnterDataInOrgUnitPlain = ({
                 <IconInfo16 />
                 {i18n.t(
                     relatedStagesDataValues?.orgUnit?.name
-                        ? 'Enter {{linkableStageLabel}} details for {{orgUnitLabel}} in the next step after completing this {{currentStageLabel}}.'
-                        : 'Select organisation unit and enter {{linkableStageLabel}} details in the next step after completing this {{currentStageLabel}}.',
+                        ? 'Enter {{linkableStageLabel}} details for {{orgUnitLabel}} in the next step'
+                        : 'Select organisation unit and enter {{linkableStageLabel}} details in the next step',
                     {
                         linkableStageLabel,
-                        currentStageLabel,
                         orgUnitLabel: relatedStagesDataValues?.orgUnit?.name,
                     },
                 )}

diff --git a/...es/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.component.js b/...es/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.component.js
@@ -40,7 +40,7 @@ export const LinkToExistingPlain = ({
     return (
         <div className={classes.searchRow}>
             <p className={classes.label}>
-                {i18n.t('Link to an existing {{linkableStageLabel}}', {
+                {i18n.t('Choose a {{linkableStageLabel}} event', {
                     linkableStageLabel,
                 })}
             </p>

diff --git a/...ore/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js b/...ore/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js
@@ -50,7 +50,6 @@ export const RelatedStagesActionsPlain = ({
     relatedStagesDataValues,
     setRelatedStagesDataValues,
     constraint,
-    currentStageLabel,
     errorMessages,
     saveAttempted,
     enableLinkExistingEvent,
@@ -170,7 +169,6 @@ export const RelatedStagesActionsPlain = ({
                     linkableStageLabel={programStage.stageForm.name}
                     relatedStagesDataValues={relatedStagesDataValues}
                     setRelatedStagesDataValues={setRelatedStagesDataValues}
-                    currentStageLabel={currentStageLabel}
                     saveAttempted={saveAttempted}
                     errorMessages={errorMessages}
                 />

diff --git a/...re-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.types.js b/...re-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.types.js
@@ -36,7 +36,6 @@ export type Props = {|
     constraint: ?Constraint,
     addErrorMessage: (ErrorMessagesForRelatedStages) => void,
     setRelatedStagesDataValues: (() => Object) => void,
-    currentStageLabel: string,
     enableLinkExistingEvent?: boolean,
     ...CssClasses
 |}
diff --git a/...core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js b/...core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js
@@ -14,7 +14,6 @@ const WidgetRelatedStagesPlain = ({
     programId,
     enrollmentId,
     programStageId,
-    currentStageLabel,
     ...passOnProps
 }: Props, ref) => {
     const { currentRelatedStagesStatus, selectedRelationshipType, constraint } = useRelatedStages({
@@ -108,7 +107,6 @@ const WidgetRelatedStagesPlain = ({
             saveAttempted={saveAttempted}
             errorMessages={errorMessages}
             constraint={constraint}
-            currentStageLabel={currentStageLabel}
             {...passOnProps}
         />
     );

diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js
@@ -19,7 +19,6 @@ export type Props = {|
     programId: string,
     enrollmentId?: string,
     programStageId: string,
-    currentStageLabel: string,
     enableLinkExistingEvent?: boolean,
 |}
 export type RelatedStageDataValueStates = {|

diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/constants.js b/src/core_modules/capture-core/components/WidgetRelatedStages/constants.js
@@ -15,5 +15,5 @@ export const actions = Object.freeze({
 export const mainOptionTranslatedTexts = {
     [actions.SCHEDULE_IN_ORG]: i18n.t('Schedule'),
     [actions.ENTER_DATA]: i18n.t('Enter details now'),
-    [actions.LINK_EXISTING_RESPONSE]: i18n.t('Link to an existing'),
+    [actions.LINK_EXISTING_RESPONSE]: i18n.t('Link to an existing event'),
 };