From 26508f8a310d69813a72f5b6230c03be4ac28e54 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Sat, 8 Jun 2024 16:15:20 +0300
Subject: [PATCH 1/3] (fix) Fix duplicate translations

---
 .../common-components/appointments-table.component.tsx       | 2 +-
 .../common-components/end-appointment-modal.component.tsx    | 2 +-
 .../common-components/end-appointment-modal.test.tsx         | 4 ++--
 .../scheduled/scheduled-appointments.component.tsx           | 2 +-
 .../src/form/appointments-form.component.tsx                 | 4 ++--
 packages/esm-appointments-app/translations/en.json           | 1 +
 .../src/active-visits/change-status-dialog.component.tsx     | 4 ++--
 .../add-patient-toqueue-dialog.component.tsx                 | 2 +-
 .../add-provider-queue-room.component.tsx                    | 2 +-
 .../src/queue-services/queue-service-form.workspace.tsx      | 4 ++--
 .../undo-transition-queue-entry-modal.component.tsx          | 4 ++--
 .../src/queue-table/queue-table-by-status-menu.component.tsx | 2 +-
 .../src/queue-table/queue-table-by-status.component.tsx      | 2 +-
 packages/esm-service-queues-app/translations/en.json         | 5 ++++-
 14 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx
index 9c5f545f0..7a8249318 100644
--- a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx
+++ b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx
@@ -132,7 +132,7 @@ const AppointmentsTable: React.FC<AppointmentsTableProps> = ({ appointments, isL
     <Layer className={styles.container}>
       <Tile className={styles.headerContainer}>
         <div className={isDesktop(layout) ? styles.desktopHeading : styles.tabletHeading}>
-          <h4>{`${t(tableHeading)} ${t('appointments', 'appointments')}`}</h4>
+          <h4>{`${t(tableHeading)} ${t('appointments', 'Appointments')}`}</h4>
         </div>
       </Tile>
       <div className={styles.toolbar}>
diff --git a/packages/esm-appointments-app/src/appointments/common-components/end-appointment-modal.component.tsx b/packages/esm-appointments-app/src/appointments/common-components/end-appointment-modal.component.tsx
index 08092aaa4..bf3d6a4ef 100644
--- a/packages/esm-appointments-app/src/appointments/common-components/end-appointment-modal.component.tsx
+++ b/packages/esm-appointments-app/src/appointments/common-components/end-appointment-modal.component.tsx
@@ -94,7 +94,7 @@ const EndAppointmentModal: React.FC<EndAppointmentModalProps> = ({ patientUuid,
           {t('cancel', 'Cancel')}
         </Button>
         <Button kind="danger" onClick={endAppointment}>
-          {t('checkOut', 'Check Out')}
+          {t('checkOut', 'Check out')}
         </Button>
       </ModalFooter>
     </div>
diff --git a/packages/esm-appointments-app/src/appointments/common-components/end-appointment-modal.test.tsx b/packages/esm-appointments-app/src/appointments/common-components/end-appointment-modal.test.tsx
index 4d4fa83fe..ccd10dace 100644
--- a/packages/esm-appointments-app/src/appointments/common-components/end-appointment-modal.test.tsx
+++ b/packages/esm-appointments-app/src/appointments/common-components/end-appointment-modal.test.tsx
@@ -37,7 +37,7 @@ describe('EndAppointmentModal', () => {
 
     render(<EndAppointmentModal appointmentUuid={'abc'} patientUuid={'123'} closeModal={closeModal} />);
 
-    const submitButton = screen.getByRole('button', { name: /Check Out/ });
+    const submitButton = screen.getByRole('button', { name: /check out/i });
     expect(submitButton).not.toBeDisabled();
     await user.click(submitButton);
 
@@ -62,7 +62,7 @@ describe('EndAppointmentModal', () => {
 
     render(<EndAppointmentModal appointmentUuid={'abc'} patientUuid={'123'} closeModal={closeModal} />);
 
-    const submitButton = screen.getByRole('button', { name: /Check Out/ });
+    const submitButton = screen.getByRole('button', { name: /check out/i });
     expect(submitButton).not.toBeDisabled();
     await user.click(submitButton);
 
diff --git a/packages/esm-appointments-app/src/appointments/scheduled/scheduled-appointments.component.tsx b/packages/esm-appointments-app/src/appointments/scheduled/scheduled-appointments.component.tsx
index c74eeb29d..2202b5ecf 100644
--- a/packages/esm-appointments-app/src/appointments/scheduled/scheduled-appointments.component.tsx
+++ b/packages/esm-appointments-app/src/appointments/scheduled/scheduled-appointments.component.tsx
@@ -32,7 +32,7 @@ const ScheduledAppointments: React.FC<ScheduledAppointmentsProps> = ({ appointme
   const responsiveSize = isDesktop(layout) ? 'sm' : 'md';
 
   // added to prevent auto-removal of translations for dynamic keys
-  // t('checkedIn', 'Checked In');
+  // t('checkedIn', 'Checked in');
   // t('expected', 'Expected');
 
   const [currentTab, setCurrentTab] = useState<string>(null);
diff --git a/packages/esm-appointments-app/src/form/appointments-form.component.tsx b/packages/esm-appointments-app/src/form/appointments-form.component.tsx
index 9cbc95997..e34a9213c 100644
--- a/packages/esm-appointments-app/src/form/appointments-form.component.tsx
+++ b/packages/esm-appointments-app/src/form/appointments-form.component.tsx
@@ -431,7 +431,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
                 <Select
                   id="location"
                   invalidText="Required"
-                  labelText={t('selectLocation', 'Select a location')}
+                  labelText={t('selectALocation', 'Select a location')}
                   onChange={onChange}
                   onBlur={onBlur}
                   value={value}
@@ -749,7 +749,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
                     value={value}
                     ref={ref}
                     onBlur={onBlur}>
-                    <SelectItem text={t('selectAppointmentStatus', 'selectAppointmentStatus')} value="" />
+                    <SelectItem text={t('selectAppointmentStatus', 'Select status')} value="" />
                     {appointmentStatuses?.length > 0 &&
                       appointmentStatuses.map((appointmentStatus, index) => (
                         <SelectItem key={index} text={appointmentStatus} value={appointmentStatus}>
diff --git a/packages/esm-appointments-app/translations/en.json b/packages/esm-appointments-app/translations/en.json
index 677716c95..075bfe5c9 100644
--- a/packages/esm-appointments-app/translations/en.json
+++ b/packages/esm-appointments-app/translations/en.json
@@ -129,6 +129,7 @@
   "saveAndClose": "Save and close",
   "scheduled": "Scheduled",
   "scheduledAppointments": "Scheduled appointments",
+  "selectALocation": "Select a location",
   "selectAppointmentStatus": "Select status",
   "selectAppointmentType": "Select an appointment type",
   "selectLocation": "Select location",
diff --git a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
index dc0251655..e97f7dd1d 100644
--- a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
+++ b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
@@ -42,7 +42,7 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, closeModa
       z.object({
         location: z.string({ required_error: t('queueLocationRequired', 'Queue location is required') }),
         service: z.string({ required_error: t('serviceIsRequired', 'Service is required') }),
-        status: z.string({ required_error: t('serviceIsRequired', 'Status is required') }),
+        status: z.string({ required_error: t('statusIsRequired', 'Status is required') }),
         priority: z.string({ required_error: t('priorityIsRequired', 'Priority is required') }),
       }),
     [],
@@ -254,7 +254,7 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, closeModa
                     <InlineLoading
                       status="active"
                       iconDescription={t('submitting', 'Submitting')}
-                      description={t('submitting', 'Submitting...')}
+                      description={`${t('submitting', 'Submitting')}...`}
                     />
                   </div>
                 ) : (
diff --git a/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx b/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx
index 287b8cabe..371dbd9c0 100644
--- a/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx
+++ b/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx
@@ -80,7 +80,7 @@ const AddVisitToQueue: React.FC<AddVisitToQueueDialogProps> = ({ visitDetails, c
             isLowContrast: true,
             title: t('addEntry', 'Add entry'),
             kind: 'success',
-            subtitle: t('queueEntryAddedSuccessfully', 'Queue Entry Added Successfully'),
+            subtitle: t('queueEntryAddedSuccessfully', 'Queue entry added successfully'),
           });
           closeModal();
           mutateQueueEntries();
diff --git a/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx
index 6fb58c836..502577668 100644
--- a/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx
+++ b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx
@@ -147,7 +147,7 @@ const AddProviderQueueRoom: React.FC<AddProviderQueueRoomProps> = ({ providerUui
 
   return (
     <div>
-      <ModalHeader closeModal={closeModal} title={t('addProviderQueueRoom', 'Add provider queue room?')} />
+      <ModalHeader closeModal={closeModal} title={t('addAProviderQueueRoom', 'Add a provider queue room?')} />
       <ModalBody>
         <Form onSubmit={onSubmit}>
           <section className={styles.section}>
diff --git a/packages/esm-service-queues-app/src/queue-services/queue-service-form.workspace.tsx b/packages/esm-service-queues-app/src/queue-services/queue-service-form.workspace.tsx
index 1c8f5661a..d40f0cf8a 100644
--- a/packages/esm-service-queues-app/src/queue-services/queue-service-form.workspace.tsx
+++ b/packages/esm-service-queues-app/src/queue-services/queue-service-form.workspace.tsx
@@ -136,12 +136,12 @@ const QueueServiceForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) =
         <Column>
           <Layer className={styles.input}>
             <Select
-              labelText={t('selectLocation', 'Select a location')}
+              labelText={t('selectALocation', 'Select a location')}
               id="location"
               invalidText="Required"
               value={userLocation}
               onChange={(event) => setUserLocation(event.target.value)}>
-              {!userLocation && <SelectItem text={t('selectLocation', 'Select a location')} />}
+              {!userLocation && <SelectItem text={t('selectALocation', 'Select a location')} />}
               {queueLocations.length === 0 && <SelectItem text={t('noLocationsAvailable', 'No locations available')} />}
               {queueLocations?.length > 0 &&
                 queueLocations.map((location) => (
diff --git a/packages/esm-service-queues-app/src/queue-table/queue-entry-actions/undo-transition-queue-entry-modal.component.tsx b/packages/esm-service-queues-app/src/queue-table/queue-entry-actions/undo-transition-queue-entry-modal.component.tsx
index 9baa9607b..12fda1fa9 100644
--- a/packages/esm-service-queues-app/src/queue-table/queue-entry-actions/undo-transition-queue-entry-modal.component.tsx
+++ b/packages/esm-service-queues-app/src/queue-table/queue-entry-actions/undo-transition-queue-entry-modal.component.tsx
@@ -40,10 +40,10 @@ const UndoTransitionQueueEntryModal: React.FC<UndoTransitionQueueEntryModalProps
       queueEntry={queueEntry}
       closeModal={closeModal}
       modalParams={{
-        modalTitle: t('undoTransition', 'Undo Transition'),
+        modalTitle: t('undoTransition', 'Undo transition'),
         modalInstruction,
         submitButtonText: t('undoTransition', 'Undo transition'),
-        submitSuccessTitle: t('queueEntryTransitionUndoSuccessful', 'Undo transition success'),
+        submitSuccessTitle: t('undoQueueEntryTransitionSuccess', 'Undo transition success'),
         submitSuccessText: t('queueEntryTransitionUndoSuccessful', 'Queue entry transition undo success'),
         submitFailureTitle: t('queueEntryTransitionUndoFailed', 'Error undoing transition'),
         submitAction: (queueEntry) =>
diff --git a/packages/esm-service-queues-app/src/queue-table/queue-table-by-status-menu.component.tsx b/packages/esm-service-queues-app/src/queue-table/queue-table-by-status-menu.component.tsx
index ec339a059..f8b3b6850 100644
--- a/packages/esm-service-queues-app/src/queue-table/queue-table-by-status-menu.component.tsx
+++ b/packages/esm-service-queues-app/src/queue-table/queue-table-by-status-menu.component.tsx
@@ -15,7 +15,7 @@ export default function QueueTableByStatusMenu() {
   const { queues } = useQueues();
 
   return (
-    <SideNavMenu title={t('serviceQueues', 'Service Queues')} className={styles.queueTableByStatusNavMenu}>
+    <SideNavMenu title={t('serviceQueues', 'Service queues')} className={styles.queueTableByStatusNavMenu}>
       <BrowserRouter>
         {queues.map((queue) => (
           <QueueTableByStatusLink queue={queue} />
diff --git a/packages/esm-service-queues-app/src/queue-table/queue-table-by-status.component.tsx b/packages/esm-service-queues-app/src/queue-table/queue-table-by-status.component.tsx
index cff7da774..8bdc872c8 100644
--- a/packages/esm-service-queues-app/src/queue-table/queue-table-by-status.component.tsx
+++ b/packages/esm-service-queues-app/src/queue-table/queue-table-by-status.component.tsx
@@ -63,7 +63,7 @@ const QueueTableByStatus: React.FC<QueueTableByStatusProps> = ({
           const url = `/queue-table-by-status/${selectedQueue.uuid}` + (newStatusUuid ? '/' + newStatusUuid : '');
           navigate(url);
         }}>
-        <TabList className={styles.tabList} aria-label={t('queueStatus', 'Queue Status')} contained>
+        <TabList className={styles.tabList} aria-label={t('queueStatus', 'Queue status')} contained>
           {allowedStatuses?.map((s) => <Tab key={s?.uuid}>{s?.display}</Tab>)}
           {allStatusTabConfig && <Tab>{t('all', 'All')}</Tab>}
         </TabList>
diff --git a/packages/esm-service-queues-app/translations/en.json b/packages/esm-service-queues-app/translations/en.json
index addd84a1e..e3c6396c2 100644
--- a/packages/esm-service-queues-app/translations/en.json
+++ b/packages/esm-service-queues-app/translations/en.json
@@ -2,6 +2,7 @@
   "actions": "Actions",
   "activeVisits": "Active Visits",
   "activeVisitsNotInQueue": "Active visits not in queue",
+  "addAProviderQueueRoom": "Add a provider queue room?",
   "addEntry": "Add entry",
   "addisitToQueueTooltip": "Add",
   "addNewQueueService": "Add New Queue Service",
@@ -237,9 +238,9 @@
   "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
   "secondaryHelperText": "Type the patient's name or unique ID number",
+  "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
   "selectFacility": "Select a facility",
-  "selectLocation": "Select a location",
   "selectOption": "Select an option",
   "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
@@ -266,6 +267,7 @@
   "startVisitError": "Error starting visit",
   "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
+  "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
   "success": "Success",
   "tcaDate": "Tca date",
@@ -284,6 +286,7 @@
   "triageForm": "Triage form",
   "triageNote": "Triage note",
   "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
+  "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
   "unknown": "Unknown",

From 1950990994f79fdf4276bff563578cc1025ffbe8 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Mon, 10 Jun 2024 22:47:31 +0300
Subject: [PATCH 2/3] Update translation for RTL language compatibility

Co-authored-by: chibongho <cbho@pih.org>
---
 .../src/active-visits/change-status-dialog.component.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
index e97f7dd1d..d35b2223f 100644
--- a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
+++ b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
@@ -254,7 +254,7 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, closeModa
                     <InlineLoading
                       status="active"
                       iconDescription={t('submitting', 'Submitting')}
-                      description={`${t('submitting', 'Submitting')}...`}
+                      description={t('submitting...', 'Submitting...')}
                     />
                   </div>
                 ) : (

From 9bdb1a7584ce3fb4b76bd468c73d8202124b55d0 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Mon, 10 Jun 2024 22:57:42 +0300
Subject: [PATCH 3/3] Fixup

---
 .../src/active-visits/change-status-dialog.component.tsx        | 2 +-
 packages/esm-service-queues-app/translations/en.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
index d35b2223f..8d7d60a74 100644
--- a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
+++ b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
@@ -254,7 +254,7 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, closeModa
                     <InlineLoading
                       status="active"
                       iconDescription={t('submitting', 'Submitting')}
-                      description={t('submitting...', 'Submitting...')}
+                      description={t('submitting', 'Submitting')}
                     />
                   </div>
                 ) : (
diff --git a/packages/esm-service-queues-app/translations/en.json b/packages/esm-service-queues-app/translations/en.json
index e3c6396c2..de50a7925 100644
--- a/packages/esm-service-queues-app/translations/en.json
+++ b/packages/esm-service-queues-app/translations/en.json
@@ -268,7 +268,7 @@
   "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
-  "submitting": "Submitting...",
+  "submitting": "Submitting",
   "success": "Success",
   "tcaDate": "Tca date",
   "temperature": "Temperature",