From 6f9faffd2b640e69ef8405c00e89bdb9e0558c36 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Sat, 21 Sep 2024 19:34:20 +0300
Subject: [PATCH 01/12] (feat) Visual tweaks to the service queues ChangeStatus
 modal

---
 .../change-status-dialog.component.tsx        | 279 +++++++++---------
 .../change-status-dialog.test.tsx             |  10 +-
 .../translations/en.json                      |   7 +-
 3 files changed, 150 insertions(+), 146 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 cfabd3a89..e9d9bad2a 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
@@ -1,31 +1,32 @@
 import React, { useMemo } from 'react';
 import {
   Button,
+  ContentSwitcher,
+  Form,
+  InlineLoading,
+  InlineNotification,
   ModalBody,
   ModalFooter,
   ModalHeader,
-  Form,
-  ContentSwitcher,
-  Switch,
-  Select,
-  SelectItem,
-  InlineNotification,
   RadioButton,
   RadioButtonGroup,
-  InlineLoading,
+  Select,
+  SelectItem,
+  Stack,
+  Switch,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { navigate, showSnackbar, useConfig } from '@openmrs/esm-framework';
-import { type MappedQueueEntry } from '../types';
-import { updateQueueEntry } from './active-visits-table.resource';
-import { useQueueLocations } from '../patient-search/hooks/useQueueLocations';
-import styles from './change-status-dialog.scss';
-import { useQueues } from '../hooks/useQueues';
 import { useForm, Controller } from 'react-hook-form';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { navigate, showSnackbar, useConfig } from '@openmrs/esm-framework';
+import { type MappedQueueEntry } from '../types';
 import { type ConfigObject } from '../config-schema';
+import { useQueues } from '../hooks/useQueues';
+import { updateQueueEntry } from './active-visits-table.resource';
 import { useMutateQueueEntries } from '../hooks/useQueueEntries';
+import { useQueueLocations } from '../patient-search/hooks/useQueueLocations';
+import styles from './change-status-dialog.scss';
 
 interface ChangeStatusDialogProps {
   queueEntry: MappedQueueEntry;
@@ -41,9 +42,9 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, closeModa
     () =>
       z.object({
         location: z.string({ required_error: t('queueLocationRequired', 'Queue location is required') }),
+        priority: z.string({ required_error: t('priorityIsRequired', 'Priority is required') }),
         service: z.string({ required_error: t('serviceIsRequired', 'Service is required') }),
         status: z.string({ required_error: t('statusIsRequired', 'Status is required') }),
-        priority: z.string({ required_error: t('priorityIsRequired', 'Priority is required') }),
       }),
     [],
   );
@@ -82,18 +83,16 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, closeModa
       endDate,
       sortWeight,
     ).then(
-      ({ status }) => {
-        if (status === 201) {
-          showSnackbar({
-            isLowContrast: true,
-            title: t('updateEntry', 'Update entry'),
-            kind: 'success',
-            subtitle: t('queueEntryUpdateSuccessfully', 'Queue Entry Updated Successfully'),
-          });
-          closeModal();
-          mutateQueueEntries();
-          navigate({ to: `${window.spaBase}/home/service-queues` });
-        }
+      () => {
+        showSnackbar({
+          isLowContrast: true,
+          title: t('updateEntry', 'Update entry'),
+          kind: 'success',
+          subtitle: t('queueEntryUpdateSuccessfully', 'Queue Entry Updated Successfully'),
+        });
+        closeModal();
+        mutateQueueEntries();
+        navigate({ to: `${window.spaBase}/home/service-queues` });
       },
       (error) => {
         showSnackbar({
@@ -121,127 +120,131 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, closeModa
           <ModalBody>
             <div className={styles.modalBody}>
               <h5>
-                {queueEntry.name} &nbsp; · &nbsp;{queueEntry.patientSex} &nbsp; · &nbsp;{queueEntry.patientAge}&nbsp;
-                {t('years', 'Years')}
+                {t('patientInfo', '{{name}}{{sexInfo}}{{ageInfo}}', {
+                  name: queueEntry.name,
+                  sexInfo: queueEntry.patientSex ? ` · ${queueEntry.patientSex} · ` : '',
+                  ageInfo: queueEntry.patientAge ? `${queueEntry.patientAge} ${t('years', 'Years')}` : '',
+                })}
               </h5>
             </div>
-            <section>
-              <Controller
-                name="location"
-                control={control}
-                render={({ field: { onChange, value } }) => (
-                  <Select
-                    labelText={t('selectQueueLocation', 'Select a queue location')}
-                    id="location"
-                    invalid={!!errors.location}
-                    invalidText={errors.location?.message}
-                    value={value}
-                    onChange={(event) => {
-                      onChange(event.target.value);
-                    }}>
-                    {!getValues()?.location && (
-                      <SelectItem text={t('selectQueueLocation', 'Select a queue location')} value="" />
-                    )}
-                    {queueLocations?.length > 0 &&
-                      queueLocations.map((location) => (
-                        <SelectItem key={location.id} text={location.name} value={location.id}>
-                          {location.name}
-                        </SelectItem>
-                      ))}
-                  </Select>
-                )}
-              />
-            </section>
-
-            <section className={styles.section}>
-              <div className={styles.sectionTitle}>{t('queueService', 'Queue service')}</div>
-              <Controller
-                name="service"
-                control={control}
-                render={({ field: { onChange, value } }) => (
-                  <Select
-                    labelText={t('selectService', 'Select a service')}
-                    id="service"
-                    invalid={!!errors.service}
-                    invalidText={errors.service?.message}
-                    value={value}
-                    onChange={(event) => onChange(event.target.value)}>
-                    {!getValues()?.service && <SelectItem text={t('selectService', 'Select a service')} value="" />}
-                    {queues?.length > 0 &&
-                      queues.map((service) => (
-                        <SelectItem key={service.uuid} text={service.display} value={service.uuid}>
-                          {service.display}
-                        </SelectItem>
-                      ))}
-                  </Select>
-                )}
-              />
-            </section>
-
-            <section className={styles.section}>
-              <div className={styles.sectionTitle}>{t('queueStatus', 'Queue status')}</div>
-              {!allowedStatuses?.length ? (
-                <InlineNotification
-                  className={styles.inlineNotification}
-                  kind={'error'}
-                  lowContrast
-                  subtitle={t('configureStatus', 'Please configure status to continue.')}
-                  title={t('noStatusConfigured', 'No status configured')}
-                />
-              ) : (
+            <Stack gap={4}>
+              <section>
+                <div className={styles.sectionTitle}>{t('queueLocation', 'Queue location')}</div>
                 <Controller
-                  name="status"
+                  name="location"
                   control={control}
-                  render={({ field: { value, onChange } }) => (
-                    <RadioButtonGroup
-                      className={styles.radioButtonWrapper}
-                      name="status"
-                      invalid={!!errors.status}
-                      invalidText={errors.status?.message}
-                      defaultSelected={value}
-                      onChange={(uuid) => {
-                        onChange(uuid);
+                  render={({ field: { onChange, value } }) => (
+                    <Select
+                      labelText={t('selectQueueLocation', 'Select a queue location')}
+                      id="location"
+                      invalid={!!errors.location}
+                      invalidText={errors.location?.message}
+                      value={value}
+                      onChange={(event) => {
+                        onChange(event.target.value);
                       }}>
-                      {allowedStatuses?.length > 0 &&
-                        allowedStatuses.map(({ uuid, display }) => (
-                          <RadioButton key={uuid} labelText={display} value={uuid} />
+                      {!getValues()?.location && (
+                        <SelectItem text={t('selectQueueLocation', 'Select a queue location')} value="" />
+                      )}
+                      {queueLocations?.length > 0 &&
+                        queueLocations.map((location) => (
+                          <SelectItem key={location.id} text={location.name} value={location.id}>
+                            {location.name}
+                          </SelectItem>
                         ))}
-                    </RadioButtonGroup>
+                    </Select>
                   )}
                 />
-              )}
-            </section>
-
-            <section className={styles.section}>
-              <div className={styles.sectionTitle}>{t('queuePriority', 'Queue priority')}</div>
-              <Controller
-                control={control}
-                name="priority"
-                render={({ field: { onChange } }) => (
-                  <>
-                    <ContentSwitcher
-                      size="sm"
-                      selectedIndex={1}
-                      onChange={(event) => {
-                        onChange(event.name as any);
-                      }}>
-                      {allowedPriorities?.length > 0 ? (
-                        allowedPriorities.map(({ uuid, display }) => {
-                          return <Switch name={uuid} text={display} key={uuid} value={uuid} />;
-                        })
-                      ) : (
-                        <Switch
-                          name={t('noPriorityFound', 'No priority found')}
-                          text={t('noPriorityFound', 'No priority found')}
-                          value={null}
-                        />
-                      )}
-                    </ContentSwitcher>
-                    {errors.priority && <div className={styles.error}>{errors.priority.message}</div>}
-                  </>
+              </section>
+              <section className={styles.section}>
+                <div className={styles.sectionTitle}>{t('queueService', 'Queue service')}</div>
+                <Controller
+                  name="service"
+                  control={control}
+                  render={({ field: { onChange, value } }) => (
+                    <Select
+                      labelText={t('selectService', 'Select a service')}
+                      id="service"
+                      invalid={!!errors.service}
+                      invalidText={errors.service?.message}
+                      value={value}
+                      onChange={(event) => onChange(event.target.value)}>
+                      {!getValues()?.service && <SelectItem text={t('selectService', 'Select a service')} value="" />}
+                      {queues?.length > 0 &&
+                        queues.map((service) => (
+                          <SelectItem key={service.uuid} text={service.display} value={service.uuid}>
+                            {service.display}
+                          </SelectItem>
+                        ))}
+                    </Select>
+                  )}
+                />
+              </section>
+              <section className={styles.section}>
+                <div className={styles.sectionTitle}>{t('queueStatus', 'Queue status')}</div>
+                {!allowedStatuses?.length ? (
+                  <InlineNotification
+                    className={styles.inlineNotification}
+                    kind={'error'}
+                    lowContrast
+                    subtitle={t('configureStatus', 'Please configure status to continue.')}
+                    title={t('noStatusConfigured', 'No status configured')}
+                  />
+                ) : (
+                  <Controller
+                    name="status"
+                    control={control}
+                    render={({ field: { value, onChange } }) => (
+                      <RadioButtonGroup
+                        className={styles.radioButtonWrapper}
+                        id="status"
+                        name="status"
+                        invalid={!!errors.status}
+                        invalidText={errors.status?.message}
+                        defaultSelected={value}
+                        onChange={(uuid) => {
+                          onChange(uuid);
+                        }}>
+                        {allowedStatuses?.length > 0 &&
+                          allowedStatuses.map(({ uuid, display }) => (
+                            <RadioButton key={uuid} labelText={display} value={uuid} />
+                          ))}
+                      </RadioButtonGroup>
+                    )}
+                  />
                 )}
-              />
-            </section>
+              </section>
+              <section className={styles.section}>
+                <div className={styles.sectionTitle}>{t('queuePriority', 'Queue priority')}</div>
+                <Controller
+                  control={control}
+                  name="priority"
+                  render={({ field: { onChange } }) => (
+                    <>
+                      <ContentSwitcher
+                        size="sm"
+                        selectedIndex={1}
+                        onChange={(event) => {
+                          onChange(event.name as any);
+                        }}>
+                        {allowedPriorities?.length > 0 ? (
+                          allowedPriorities.map(({ uuid, display }) => {
+                            return <Switch name={uuid} text={display} key={uuid} value={uuid} />;
+                          })
+                        ) : (
+                          <Switch
+                            name={t('noPriorityFound', 'No priority found')}
+                            text={t('noPriorityFound', 'No priority found')}
+                            value={null}
+                          />
+                        )}
+                      </ContentSwitcher>
+                      {errors.priority && <div className={styles.error}>{errors.priority.message}</div>}
+                    </>
+                  )}
+                />
+              </section>
+            </Stack>
           </ModalBody>
           <ModalFooter>
             <Button kind="secondary" onClick={closeModal}>
diff --git a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx
index a3339291b..917411b60 100644
--- a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx
+++ b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx
@@ -39,7 +39,7 @@ jest.mock('../hooks/useQueues', () => {
   };
 });
 
-describe('Queue entry details', () => {
+describe('ChangeStatusDialog', () => {
   beforeEach(() => {
     mockUseConfig.mockReturnValue({
       ...getDefaultsFromConfigSchema(configSchema),
@@ -62,14 +62,14 @@ describe('Queue entry details', () => {
     expect(screen.getByText(/queue service/i)).toBeInTheDocument();
     expect(screen.getByText(/queue priority/i)).toBeInTheDocument();
 
-    // user selects a service
-    const queueServiceTypes = screen.getByRole('combobox', { name: /select a service/i });
-    await user.selectOptions(queueServiceTypes, '176052c7-5fd4-4b33-89cc-7bae6848c65a');
-
     // user selects queue location
     const queueLocation = screen.getByRole('combobox', { name: /Select a queue location/i });
     await user.selectOptions(queueLocation, 'some-uuid1');
 
+    // user selects a service
+    const queueServiceTypes = screen.getByRole('combobox', { name: /select a service/i });
+    await user.selectOptions(queueServiceTypes, '176052c7-5fd4-4b33-89cc-7bae6848c65a');
+
     // user selects queue status
     const queueStatus = screen.getByRole('radio', { name: /Waiting/i });
     await user.click(queueStatus);
diff --git a/packages/esm-service-queues-app/translations/en.json b/packages/esm-service-queues-app/translations/en.json
index b10d793e0..84d2743cd 100644
--- a/packages/esm-service-queues-app/translations/en.json
+++ b/packages/esm-service-queues-app/translations/en.json
@@ -161,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
   "patientHasActiveVisit": "The patient already has an active visit",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
   "patientNotInQueue": "The patient is not in the queue",
@@ -203,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "Error updating queue entry status",
   "queueEntryUpdateSuccessfully": "Queue Entry Updated Successfully",
-  "queueLocation": "Queue Location",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
   "queueName": "Queue name",
   "queuePriority": "Queue priority",
@@ -212,7 +213,7 @@
   "queueRoomAddFailed": "Error adding queue room",
   "queueRoomName": "Queue room name",
   "queueRoomUpdatedSuccessfully": "Queue room updated successfully",
-  "queuesClearedSuccessfully": "Queues Cleared Successfully",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
@@ -254,7 +255,7 @@
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
-  "serviceIsRequired": "Status is required",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
   "sex": "Sex",

From 42c3c4b634d09573a288f88285184eef6b78b79a Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Sat, 21 Sep 2024 20:08:34 +0300
Subject: [PATCH 02/12] (fix) Fix Appointments calendar navigation

---
 .../calendar/appointments-calendar-view.component.tsx |  2 +-
 .../src/calendar/header/calendar-header.component.tsx | 11 ++++++-----
 .../monthly/monthly-workload-view.component.tsx       |  6 +++---
 packages/esm-appointments-app/src/constants.ts        |  2 +-
 .../src/metrics/metrics-header.component.tsx          |  7 +++----
 packages/esm-appointments-app/translations/en.json    |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/esm-appointments-app/src/calendar/appointments-calendar-view.component.tsx b/packages/esm-appointments-app/src/calendar/appointments-calendar-view.component.tsx
index 650e9c347..af6901140 100644
--- a/packages/esm-appointments-app/src/calendar/appointments-calendar-view.component.tsx
+++ b/packages/esm-appointments-app/src/calendar/appointments-calendar-view.component.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useState } from 'react';
 import dayjs from 'dayjs';
+import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useAppointmentsCalendar } from '../hooks/useAppointmentsCalendar';
 import AppointmentsHeader from '../header/appointments-header.component';
 import CalendarHeader from './header/calendar-header.component';
 import MonthlyCalendarView from './monthly/monthly-calendar-view.component';
 import SelectedDateContext from '../hooks/selectedDateContext';
-import { useParams } from 'react-router-dom';
 import { omrsDateFormat } from '../constants';
 
 const AppointmentsCalendarView: React.FC = () => {
diff --git a/packages/esm-appointments-app/src/calendar/header/calendar-header.component.tsx b/packages/esm-appointments-app/src/calendar/header/calendar-header.component.tsx
index 591616d5d..f537a9e87 100644
--- a/packages/esm-appointments-app/src/calendar/header/calendar-header.component.tsx
+++ b/packages/esm-appointments-app/src/calendar/header/calendar-header.component.tsx
@@ -1,17 +1,18 @@
 import React, { useContext } from 'react';
+import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
 import { Button } from '@carbon/react';
 import { ArrowLeft } from '@carbon/react/icons';
 import { navigate } from '@openmrs/esm-framework';
 import { spaHomePage } from '../../constants';
-import styles from './calendar-header.scss';
 import SelectedDateContext from '../../hooks/selectedDateContext';
-import dayjs from 'dayjs';
+import styles from './calendar-header.scss';
 
 const CalendarHeader: React.FC = () => {
   const { t } = useTranslation();
   const { selectedDate } = useContext(SelectedDateContext);
-  const backButtonOnClick = () => {
+
+  const handleClick = () => {
     navigate({ to: `${spaHomePage}/appointments/${dayjs(selectedDate).format('YYYY-MM-DD')}` });
   };
 
@@ -20,10 +21,10 @@ const CalendarHeader: React.FC = () => {
       <div className={styles.titleContainer}>
         <Button
           className={styles.backButton}
+          iconDescription={t('back', 'Back')}
           kind="ghost"
-          onClick={backButtonOnClick}
+          onClick={handleClick}
           renderIcon={ArrowLeft}
-          iconDescription={t('back', 'Back')}
           size="lg">
           <span>{t('back', 'Back')}</span>
         </Button>
diff --git a/packages/esm-appointments-app/src/calendar/monthly/monthly-workload-view.component.tsx b/packages/esm-appointments-app/src/calendar/monthly/monthly-workload-view.component.tsx
index 6b9c80ae2..044b0da07 100644
--- a/packages/esm-appointments-app/src/calendar/monthly/monthly-workload-view.component.tsx
+++ b/packages/esm-appointments-app/src/calendar/monthly/monthly-workload-view.component.tsx
@@ -1,14 +1,14 @@
 import React, { useContext, useMemo } from 'react';
 import classNames from 'classnames';
 import dayjs, { type Dayjs } from 'dayjs';
+import { User } from '@carbon/react/icons';
 import { navigate, useLayoutType } from '@openmrs/esm-framework';
-import { isSameMonth } from '../../helpers';
 import { spaHomePage } from '../../constants';
-import styles from './monthly-view-workload.scss';
+import { isSameMonth } from '../../helpers';
 import { type DailyAppointmentsCountByService } from '../../types';
 import SelectedDateContext from '../../hooks/selectedDateContext';
-import { User } from '@carbon/react/icons';
 import MonthlyWorkloadViewExpanded from './monthly-workload-view-expanded.component';
+import styles from './monthly-view-workload.scss';
 
 export interface MonthlyWorkloadViewProps {
   events: Array<DailyAppointmentsCountByService>;
diff --git a/packages/esm-appointments-app/src/constants.ts b/packages/esm-appointments-app/src/constants.ts
index 5cd36ccc7..377a28b21 100644
--- a/packages/esm-appointments-app/src/constants.ts
+++ b/packages/esm-appointments-app/src/constants.ts
@@ -1,6 +1,6 @@
 export const spaRoot = window['getOpenmrsSpaBase'];
 export const basePath = '/appointments';
-export const spaHomePage = ` ${window.getOpenmrsSpaBase()}home`;
+export const spaHomePage = `${window.spaBase}/home`;
 export const omrsDateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZZ';
 export const appointmentLocationTagName = 'Appointment Location';
 
diff --git a/packages/esm-appointments-app/src/metrics/metrics-header.component.tsx b/packages/esm-appointments-app/src/metrics/metrics-header.component.tsx
index 5c2fb6eeb..8b2a915e6 100644
--- a/packages/esm-appointments-app/src/metrics/metrics-header.component.tsx
+++ b/packages/esm-appointments-app/src/metrics/metrics-header.component.tsx
@@ -1,14 +1,13 @@
 import React, { useContext } from 'react';
 import dayjs from 'dayjs';
 import isToday from 'dayjs/plugin/isToday';
-import { launchWorkspace } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 import { Calendar, Hospital } from '@carbon/react/icons';
 import { Button } from '@carbon/react';
-import { ExtensionSlot, isDesktop, navigate, useLayoutType } from '@openmrs/esm-framework';
+import { ExtensionSlot, isDesktop, launchWorkspace, navigate, useLayoutType } from '@openmrs/esm-framework';
 import { spaHomePage } from '../constants';
-import styles from './metrics-header.scss';
 import SelectedDateContext from '../hooks/selectedDateContext';
+import styles from './metrics-header.scss';
 
 dayjs.extend(isToday);
 
@@ -39,7 +38,7 @@ const MetricsHeader: React.FC = () => {
           onClick={() =>
             navigate({ to: `${spaHomePage}/appointments/calendar/${dayjs(selectedDate).format('YYYY-MM-DD')}` })
           }>
-          {t('appointmentsCalendar', 'Appointments Calendar')}
+          {t('appointmentsCalendar', 'Appointments calendar')}
         </Button>
         <ExtensionSlot
           name="patient-search-button-slot"
diff --git a/packages/esm-appointments-app/translations/en.json b/packages/esm-appointments-app/translations/en.json
index 16bb21e71..a913a658b 100644
--- a/packages/esm-appointments-app/translations/en.json
+++ b/packages/esm-appointments-app/translations/en.json
@@ -27,7 +27,7 @@
   "appointments": "Appointments",
   "Appointments": "Appointments",
   "appointments_lower": "appointments",
-  "appointmentsCalendar": "Appointments Calendar",
+  "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "Appointment scheduled",
   "appointmentService": "Appointment service",
   "appointmentServiceCreate": "Appointment service created successfully",

From cdb8bbd6f392df50f2cded26edf84c3d7533a856 Mon Sep 17 00:00:00 2001
From: Usama Idriss Kakumba <53287480+usamaidrsk@users.noreply.github.com>
Date: Mon, 23 Sep 2024 19:33:03 +0300
Subject: [PATCH 03/12] (fix) O3-3737: Fix pending items configuration on ward
 patient card  (#1324)

* feat: configure pending orders

* rename pending-orders to pending-items slot name

* (fix): fix pendingItems config
---
 .../config-schema-pending-items-extension.ts  | 29 +++++++++++
 .../config-schema-pending-orders-extension.ts | 25 ----------
 packages/esm-ward-app/src/config-schema.ts    | 16 +++---
 packages/esm-ward-app/src/index.ts            |  8 +--
 packages/esm-ward-app/src/routes.json         |  4 +-
 .../pending-items-car-row.extension.tsx       | 50 +++++++++++++++++++
 .../card-rows/pending-orders.extension.tsx    | 28 -----------
 .../ward-patient-pending-order.component.tsx  | 16 +++++-
 .../ward-patient-card.component.tsx           | 32 ++++--------
 .../ward-patient-card/ward-patient-card.scss  | 11 ++--
 10 files changed, 127 insertions(+), 92 deletions(-)
 create mode 100644 packages/esm-ward-app/src/config-schema-pending-items-extension.ts
 delete mode 100644 packages/esm-ward-app/src/config-schema-pending-orders-extension.ts
 create mode 100644 packages/esm-ward-app/src/ward-patient-card/card-rows/pending-items-car-row.extension.tsx
 delete mode 100644 packages/esm-ward-app/src/ward-patient-card/card-rows/pending-orders.extension.tsx

diff --git a/packages/esm-ward-app/src/config-schema-pending-items-extension.ts b/packages/esm-ward-app/src/config-schema-pending-items-extension.ts
new file mode 100644
index 000000000..985b5a1b2
--- /dev/null
+++ b/packages/esm-ward-app/src/config-schema-pending-items-extension.ts
@@ -0,0 +1,29 @@
+import { Type } from '@openmrs/esm-framework';
+
+export const pendingItemsExtensionConfigSchema = {
+  orders: {
+    orderTypes: {
+      _type: Type.Array,
+      _description: 'Defines order types displayed on the ward patient card pending items section.',
+      _default: [{ label: 'Labs', uuid: '52a447d3-a64a-11e3-9aeb-50e549534c5e' }],
+      _elements: {
+        uuid: {
+          _type: Type.UUID,
+          _description: 'Identifies the order type.',
+        },
+        label: {
+          _type: Type.String,
+          _description:
+            "The label or i18n key to the translated label to display. If not provided, defaults to 'Orders'",
+          _default: null,
+        },
+      },
+    },
+  },
+  showPendingItems: {
+    _type: Type.Boolean,
+    _description:
+      'Optional. If true, pending items (e.g., number of pending orders) will be displayed on the patient card.',
+    _default: true,
+  },
+};
diff --git a/packages/esm-ward-app/src/config-schema-pending-orders-extension.ts b/packages/esm-ward-app/src/config-schema-pending-orders-extension.ts
deleted file mode 100644
index ed6ebc540..000000000
--- a/packages/esm-ward-app/src/config-schema-pending-orders-extension.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Type } from '@openmrs/esm-framework';
-
-export const pendingOrdersExtensionConfigSchema = {
-  orderTypes: {
-    _type: Type.Array,
-    _description: 'Defines order types displayed on the ward patient card pending items section.',
-    _default: [{ label: 'Labs', uuid: '52a447d3-a64a-11e3-9aeb-50e549534c5e' }],
-    _elements: {
-      uuid: {
-        _type: Type.UUID,
-        _description: 'Identifies the order type.',
-      },
-      label: {
-        _type: Type.String,
-        _description: "The label or i18n key to the translated label to display. If not provided, defaults to 'Orders'",
-        _default: null,
-      },
-    },
-  },
-  enabled: {
-    _type: Type.Boolean,
-    _description: 'Optional. Enable pending order visibility on ward card pending items',
-    _default: true,
-  },
-};
diff --git a/packages/esm-ward-app/src/config-schema.ts b/packages/esm-ward-app/src/config-schema.ts
index c574313ca..a4dfb5945 100644
--- a/packages/esm-ward-app/src/config-schema.ts
+++ b/packages/esm-ward-app/src/config-schema.ts
@@ -185,18 +185,20 @@ export interface WardConfigObject {
 
 export interface WardPatientCardsConfig {
   obsElementDefinitions: Array<ObsElementDefinition>;
-  pendingOrderTypesDefinitions: Array<PendingOrderTypesDefinition>;
+  pendingItemsDefinitions: Array<PendingItemsDefinition>;
   identifierElementDefinitions: Array<IdentifierElementDefinition>;
   addressElementDefinitions: Array<AddressElementDefinition>;
   cardDefinitions: Array<WardPatientCardDefinition>;
 }
 
-export interface PendingOrderTypesDefinition {
-  enabled: boolean;
-  orderTypes: Array<{
-    label?: string;
-    uuid: string;
-  }>;
+export interface PendingItemsDefinition {
+  showPendingItems: boolean;
+  orders: {
+    orderTypes: Array<{
+      label?: string;
+      uuid: string;
+    }>;
+  };
 }
 
 export interface ObsElementDefinition {
diff --git a/packages/esm-ward-app/src/index.ts b/packages/esm-ward-app/src/index.ts
index 06a6a344d..7474a605e 100644
--- a/packages/esm-ward-app/src/index.ts
+++ b/packages/esm-ward-app/src/index.ts
@@ -13,7 +13,7 @@ import { moduleName } from './constant';
 import { createDashboardLink } from './createDashboardLink.component';
 import rootComponent from './root.component';
 import { motherChildRowConfigSchema } from './config-schema-mother-child-row';
-import { pendingOrdersExtensionConfigSchema } from './config-schema-pending-orders-extension';
+import { pendingItemsExtensionConfigSchema } from './config-schema-pending-items-extension';
 
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
@@ -74,8 +74,8 @@ export const motherChildRowExtension = getAsyncLifecycle(
   options,
 );
 
-export const pendingOrdersExtension = getAsyncLifecycle(
-  () => import('./ward-patient-card/card-rows/pending-orders.extension'),
+export const pendingItemsCardRowExtension = getAsyncLifecycle(
+  () => import('./ward-patient-card/card-rows/pending-items-car-row.extension'),
   options,
 );
 
@@ -113,7 +113,7 @@ export function startupApp() {
   defineExtensionConfigSchema('colored-obs-tags-card-row', coloredObsTagsCardRowConfigSchema);
   defineExtensionConfigSchema('admission-request-note-card-row', admissionRequestNoteRowConfigSchema);
   defineExtensionConfigSchema('mother-child-card-row', motherChildRowConfigSchema);
-  defineExtensionConfigSchema('ward-patient-pending-orders', pendingOrdersExtensionConfigSchema);
+  defineExtensionConfigSchema('ward-patient-pending-items-card-row', pendingItemsExtensionConfigSchema);
 
   registerFeatureFlag(
     'bedmanagement-module',
diff --git a/packages/esm-ward-app/src/routes.json b/packages/esm-ward-app/src/routes.json
index 9b5690071..77f9d532a 100644
--- a/packages/esm-ward-app/src/routes.json
+++ b/packages/esm-ward-app/src/routes.json
@@ -66,8 +66,8 @@
       "slot": "ward-patient-card-slot"
     },
     {
-      "component": "pendingOrdersExtension",
-      "name": "ward-patient-pending-orders",
+      "component": "pendingItemsCardRowExtension",
+      "name": "ward-patient-pending-items-card-row",
       "slot": "ward-patient-card-pending-items-slot"
     }
   ],
diff --git a/packages/esm-ward-app/src/ward-patient-card/card-rows/pending-items-car-row.extension.tsx b/packages/esm-ward-app/src/ward-patient-card/card-rows/pending-items-car-row.extension.tsx
new file mode 100644
index 000000000..4cded2d6f
--- /dev/null
+++ b/packages/esm-ward-app/src/ward-patient-card/card-rows/pending-items-car-row.extension.tsx
@@ -0,0 +1,50 @@
+import React, { useCallback, useEffect } from 'react';
+import { type WardPatientCard } from '../../types';
+import { Hourglass } from '@carbon/react/icons';
+
+import { useConfig } from '@openmrs/esm-framework';
+import type { PendingItemsDefinition } from '../../config-schema';
+import { WardPatientPendingOrder } from '../row-elements/ward-patient-pending-order.component';
+import styles from '../ward-patient-card.scss';
+import WardPatientPendingTransfer from '../row-elements/ward-patient-pending-transfer';
+
+const PendingItemsCarRowExtension: WardPatientCard = (wardPatient) => {
+  const { orders, showPendingItems } = useConfig<PendingItemsDefinition>();
+  const [hasPendingOrders, setHasPendingOrders] = React.useState(false);
+
+  const hasPendingItems = !!wardPatient?.inpatientRequest || hasPendingOrders;
+
+  const handlePendingOrderCount = useCallback((count: number) => {
+    if (count > 0) {
+      setHasPendingOrders(true);
+    }
+  }, []);
+
+  useEffect(() => {
+    if (!orders?.orderTypes?.length) {
+      setHasPendingOrders(false);
+    }
+  }, [orders]);
+
+  return (
+    <div className={styles.wardPatientCardPendingItemsRow}>
+      {showPendingItems && hasPendingItems ? (
+        <>
+          <Hourglass className={styles.hourGlassIcon} size="16" />:
+        </>
+      ) : null}
+      {orders?.orderTypes.map(({ uuid, label }) => (
+        <WardPatientPendingOrder
+          key={`pending-order-type-${uuid}`}
+          wardPatient={wardPatient}
+          orderUuid={uuid}
+          label={label}
+          onOrderCount={handlePendingOrderCount}
+        />
+      ))}
+      {wardPatient?.inpatientRequest ? <WardPatientPendingTransfer wardPatient={wardPatient} /> : null}
+    </div>
+  );
+};
+
+export default PendingItemsCarRowExtension;
diff --git a/packages/esm-ward-app/src/ward-patient-card/card-rows/pending-orders.extension.tsx b/packages/esm-ward-app/src/ward-patient-card/card-rows/pending-orders.extension.tsx
deleted file mode 100644
index fb7291508..000000000
--- a/packages/esm-ward-app/src/ward-patient-card/card-rows/pending-orders.extension.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { type WardPatientCard } from '../../types';
-import { useConfig } from '@openmrs/esm-framework';
-import type { PendingOrderTypesDefinition } from '../../config-schema';
-import { WardPatientPendingOrder } from '../row-elements/ward-patient-pending-order.component';
-
-const PendingOrdersExtension: WardPatientCard = (wardPatient) => {
-  const { orderTypes, enabled } = useConfig<PendingOrderTypesDefinition>();
-
-  if (!enabled || !orderTypes) {
-    return <></>;
-  }
-
-  return (
-    <>
-      {orderTypes.map(({ uuid, label }) => (
-        <WardPatientPendingOrder
-          key={`pending-order-type-${uuid}`}
-          wardPatient={wardPatient}
-          orderUuid={uuid}
-          label={label}
-        />
-      ))}
-    </>
-  );
-};
-
-export default PendingOrdersExtension;
diff --git a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-order.component.tsx b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-order.component.tsx
index ca73df645..dbaa9129a 100644
--- a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-order.component.tsx
+++ b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-order.component.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { ChemistryReference } from '@carbon/react/icons';
 import styles from '../ward-patient-card.scss';
 import { useTranslation } from 'react-i18next';
@@ -9,9 +9,15 @@ export interface WardPatientPendingOrderProps {
   wardPatient: WardPatient;
   orderUuid: string;
   label: string;
+  onOrderCount: (count: number) => void; // New prop for notifying parent
 }
 
-export const WardPatientPendingOrder: React.FC<WardPatientPendingOrderProps> = ({ wardPatient, orderUuid, label }) => {
+export const WardPatientPendingOrder: React.FC<WardPatientPendingOrderProps> = ({
+  wardPatient,
+  orderUuid,
+  label,
+  onOrderCount,
+}) => {
   const { t } = useTranslation();
   const { count, isLoading } = usePatientPendingOrders(
     wardPatient?.patient?.uuid,
@@ -19,6 +25,12 @@ export const WardPatientPendingOrder: React.FC<WardPatientPendingOrderProps> = (
     wardPatient?.visit?.startDatetime.split('T')[0],
   );
 
+  useEffect(() => {
+    if (!isLoading) {
+      onOrderCount(count); // Notify parent when count is available
+    }
+  }, [count, isLoading, onOrderCount]);
+
   if (isLoading || !count || count == 0) {
     return null;
   }
diff --git a/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx b/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
index 35bf1e1e0..d7b87084a 100644
--- a/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
+++ b/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
@@ -1,20 +1,16 @@
-import { ExtensionSlot, getPatientName, launchWorkspace, useConfig } from '@openmrs/esm-framework';
+import { ExtensionSlot, getPatientName, launchWorkspace } from '@openmrs/esm-framework';
 import classNames from 'classnames';
 import React from 'react';
-import { Hourglass } from '@carbon/react/icons';
 import { useCurrentWardCardConfig } from '../hooks/useCurrentWardCardConfig';
 import { type WardPatientCard, type WardPatientWorkspaceProps } from '../types';
 import WardPatientBedNumber from './row-elements/ward-patient-bed-number';
 import WardPatientName from './row-elements/ward-patient-name';
 import { WardPatientCardElement } from './ward-patient-card-element.component';
 import styles from './ward-patient-card.scss';
-import WardPatientPendingTransfer from './row-elements/ward-patient-pending-transfer';
-import { type PendingOrderTypesDefinition } from '../config-schema';
 
 const WardPatientCard: WardPatientCard = (wardPatient) => {
   const { patient, bed } = wardPatient;
   const { id, headerRowElements, footerRowElements } = useCurrentWardCardConfig();
-  const { enabled: showPendingOrders } = useConfig<PendingOrderTypesDefinition>();
 
   const headerExtensionSlotName =
     id == 'default' ? 'ward-patient-card-header-slot' : `ward-patient-card-header-${id}-slot`;
@@ -36,6 +32,16 @@ const WardPatientCard: WardPatientCard = (wardPatient) => {
         ))}
         <ExtensionSlot name={headerExtensionSlotName} state={wardPatient} />
       </div>
+      <ExtensionSlot
+        name="ward-patient-card-pending-items-slot"
+        state={wardPatient}
+        className={styles.wardPatientCardExtensionSlot}
+      />
+      <ExtensionSlot
+        name={rowsExtensionSlotName}
+        state={wardPatient}
+        className={classNames(styles.wardPatientCardRow, styles.wardPatientCardExtensionSlot)}
+      />
       <div className={styles.wardPatientCardRow}>
         {footerRowElements.map((elementId, i) => (
           <WardPatientCardElement
@@ -46,22 +52,6 @@ const WardPatientCard: WardPatientCard = (wardPatient) => {
         ))}
         <ExtensionSlot name={footerExtensionSlotName} state={wardPatient} />
       </div>
-      {wardPatient?.inpatientRequest || showPendingOrders ? (
-        <div className={styles.wardPatientCardPendingItemsRow}>
-          <Hourglass className={styles.hourGlassIcon} size="16" />:
-          <ExtensionSlot
-            name="ward-patient-card-pending-items-slot"
-            state={wardPatient}
-            className={classNames(styles.wardPatientPendingOrdersRow, styles.wardPatientCardExtensionSlot)}
-          />
-          {wardPatient?.inpatientRequest ? <WardPatientPendingTransfer wardPatient={wardPatient} /> : null}
-        </div>
-      ) : null}
-      <ExtensionSlot
-        name={rowsExtensionSlotName}
-        state={wardPatient}
-        className={classNames(styles.wardPatientCardExtensionSlot)}
-      />
       <button
         className={styles.wardPatientCardButton}
         onClick={() => {
diff --git a/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.scss b/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.scss
index f7455d8f1..3da4aaa6c 100644
--- a/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.scss
+++ b/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.scss
@@ -77,9 +77,9 @@
   }
 }
 
-.wardPatientCardHeader {
-  @extend .dotSeparatedChildren;
-  border-top: 0;
+.wardPatientCardPendingItemsRow:empty {
+  display: none;
+  margin-left: layout.$spacing-04;
 }
 
 .wardPatientCardPendingItemsRow {
@@ -91,6 +91,11 @@
   background-color: colors.$gray-80;
 }
 
+.wardPatientCardHeader {
+  @extend .dotSeparatedChildren;
+  border-top: 0;
+}
+
 .wardPatientCardDispositionTypeContainer {
   display: flex;
   flex-flow: row;

From bc531a6e93524d8df8a8f8d82dc8a2854549cedf Mon Sep 17 00:00:00 2001
From: Bhargav kodali <115476530+kb019@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:36:45 -0700
Subject: [PATCH 04/12] (fix) O3-3211: Fix calculations for Patients and
 Capacity in Ward Metrics (#1307)

* feat-metrics

* update metrics

* correct test

* refactor useAdmission

* fix e2e tests

* (refactor) Refactor registration form cancel modal to match conventions (#1294)

This PR refactors the registration form's cancel modal to match new modal naming and registration conventions. Modals
are now registered in the routes registry file under the `modals`. The naming convention has also changed - modals now use the `*.modal.tsx` suffix.
I've also amended the modal to use Carbon's ModalBody, ModalHeader, and ModalFooter components instead of using divs with
custom classes. Finally, I've amended the modal title and content to align with other confirmation modals in O3.

* (feat) 03-3404: follow-up -ensure the  dateAppointmentScheduled <= appointmentDate (#1295)

* correct yarn.lock

* fix metrics calculations

* add internationalization

* correct mocks

* add dir attribute

* remove i18n code

* clean code

---------

Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
Co-authored-by: Lucy Jemutai <130601439+lucyjemutai@users.noreply.github.com>
---
 .../src/hooks/useWardPatientGrouping.ts       |  9 +--
 .../ward-metric.component.tsx                 |  3 +-
 .../ward-metrics.component.tsx                | 45 +++++++++-----
 .../ward-view-header/ward-metrics.test.tsx    | 35 +++++++++--
 .../src/ward-view/ward-view.resource.ts       | 59 ++++++++++++++++---
 packages/esm-ward-app/translations/en.json    |  8 +++
 6 files changed, 122 insertions(+), 37 deletions(-)

diff --git a/packages/esm-ward-app/src/hooks/useWardPatientGrouping.ts b/packages/esm-ward-app/src/hooks/useWardPatientGrouping.ts
index 8ab6ae45c..e3284385b 100644
--- a/packages/esm-ward-app/src/hooks/useWardPatientGrouping.ts
+++ b/packages/esm-ward-app/src/hooks/useWardPatientGrouping.ts
@@ -14,13 +14,8 @@ export function useWardPatientGrouping() {
   const { inpatientRequests } = inpatientRequestResponse;
 
   const groupings = useMemo(() => {
-    if(!admissionLocationResponse.isLoading && !inpatientAdmissionResponse.isLoading && !inpatientRequestResponse.isLoading) {
-      return createAndGetWardPatientGrouping(inpatientAdmissions, admissionLocation, inpatientRequests);
-    } else {
-      return {};
-    }
-  }, [admissionLocation, inpatientAdmissions]) as ReturnType<typeof createAndGetWardPatientGrouping>;
-
+    return { ...createAndGetWardPatientGrouping(inpatientAdmissions, admissionLocation, inpatientRequests) };
+  }, [admissionLocation, inpatientAdmissions, inpatientRequests]) as ReturnType<typeof createAndGetWardPatientGrouping>;
   return {
     ...groupings,
     admissionLocationResponse,
diff --git a/packages/esm-ward-app/src/ward-view-header/ward-metric.component.tsx b/packages/esm-ward-app/src/ward-view-header/ward-metric.component.tsx
index 32568cb7d..10a3db993 100644
--- a/packages/esm-ward-app/src/ward-view-header/ward-metric.component.tsx
+++ b/packages/esm-ward-app/src/ward-view-header/ward-metric.component.tsx
@@ -8,9 +8,10 @@ interface WardMetricProps {
   isLoading: boolean;
 }
 const WardMetric: React.FC<WardMetricProps> = ({ metricName, metricValue, isLoading }) => {
+ 
   return (
     <div className={styles.metric}>
-      <span className={styles.metricName}>{metricName}</span>
+     <span className={styles.metricName}>{metricName}</span>
       {isLoading ? (
         <SkeletonPlaceholder className={styles.skeleton} />
       ) : (
diff --git a/packages/esm-ward-app/src/ward-view-header/ward-metrics.component.tsx b/packages/esm-ward-app/src/ward-view-header/ward-metrics.component.tsx
index c507f03d3..0008158d5 100644
--- a/packages/esm-ward-app/src/ward-view-header/ward-metrics.component.tsx
+++ b/packages/esm-ward-app/src/ward-view-header/ward-metrics.component.tsx
@@ -3,16 +3,16 @@ import styles from './ward-metrics.scss';
 import { useBeds } from '../hooks/useBeds';
 import { showNotification, useAppContext, useFeatureFlag } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
-import { getWardMetrics } from '../ward-view/ward-view.resource';
+import {
+  getWardMetricNameTranslation,
+  getWardMetrics,
+  getWardMetricValueTranslation,
+} from '../ward-view/ward-view.resource';
 import WardMetric from './ward-metric.component';
 import type { WardPatientGroupDetails } from '../types';
 import useWardLocation from '../hooks/useWardLocation';
 
-const wardMetrics = [
-  { name: 'Patients', key: 'patients' },
-  { name: 'Free beds', key: 'freeBeds' },
-  { name: 'Capacity', key: 'capacity' },
-];
+const wardMetrics = [{ name: 'patients' }, { name: 'freeBeds' }, { name: 'capacity' }];
 
 const WardMetrics = () => {
   const { location } = useWardLocation();
@@ -20,6 +20,12 @@ const WardMetrics = () => {
   const { t } = useTranslation();
   const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
   const wardPatientGroup = useAppContext<WardPatientGroupDetails>('ward-patients-group');
+  const { admissionLocationResponse, inpatientAdmissionResponse, inpatientRequestResponse } = wardPatientGroup || {};
+  const isDataLoading =
+    admissionLocationResponse?.isLoading ||
+    inpatientAdmissionResponse?.isLoading ||
+    inpatientRequestResponse?.isLoading;
+  if (!wardPatientGroup) return <></>;
 
   if (error) {
     showNotification({
@@ -28,28 +34,37 @@ const WardMetrics = () => {
       description: error.message,
     });
   }
-  const wardMetricValues = getWardMetrics(beds);
+  const wardMetricValues = getWardMetrics(beds, wardPatientGroup);
   return (
     <div className={styles.metricsContainer}>
       {isBedManagementModuleInstalled ? (
         wardMetrics.map((wardMetric) => {
           return (
             <WardMetric
-              metricName={wardMetric.name}
-              metricValue={wardMetricValues[wardMetric.key]}
-              isLoading={!!isLoading}
-              key={wardMetric.key}
+              metricName={getWardMetricNameTranslation(wardMetric.name, t)}
+              metricValue={getWardMetricValueTranslation(wardMetric.name, t, wardMetricValues[wardMetric.name])}
+              isLoading={!!isLoading || !!isDataLoading}
+              key={wardMetric.name}
             />
           );
         })
       ) : (
-        <WardMetric metricName={'Patients'} metricValue={'--'} isLoading={false} key={'patients'} />
+        <WardMetric
+          metricName={getWardMetricNameTranslation('patients', t)}
+          metricValue={'--'}
+          isLoading={false}
+          key={'patients'}
+        />
       )}
       {isBedManagementModuleInstalled && (
         <WardMetric
-          metricName="Pending out"
-          metricValue={error ? '--' : wardPatientGroup?.wardPatientPendingCount?.toString() ?? '--'}
-          isLoading={!wardPatientGroup}
+          metricName={getWardMetricNameTranslation('pendingOut', t)}
+          metricValue={
+            error
+              ? '--'
+              : getWardMetricValueTranslation('pendingOut', t, wardPatientGroup?.wardPatientPendingCount?.toString())
+          }
+          isLoading={!!isDataLoading}
           key="pending"
         />
       )}
diff --git a/packages/esm-ward-app/src/ward-view-header/ward-metrics.test.tsx b/packages/esm-ward-app/src/ward-view-header/ward-metrics.test.tsx
index ef6ff8f86..84b7bdbb7 100644
--- a/packages/esm-ward-app/src/ward-view-header/ward-metrics.test.tsx
+++ b/packages/esm-ward-app/src/ward-view-header/ward-metrics.test.tsx
@@ -3,12 +3,23 @@ import WardMetrics from './ward-metrics.component';
 import { renderWithSwr } from '../../../../tools/test-utils';
 import { useBeds } from '../hooks/useBeds';
 import { mockWardBeds } from '../../../../__mocks__/wardBeds.mock';
-import { getWardMetrics } from '../ward-view/ward-view.resource';
+import {
+  createAndGetWardPatientGrouping,
+  getInpatientAdmissionsUuidMap,
+  getWardMetrics,
+} from '../ward-view/ward-view.resource';
 import { useAdmissionLocation } from '../hooks/useAdmissionLocation';
-import { mockAdmissionLocation, mockInpatientAdmissions } from '__mocks__';
+import { mockAdmissionLocation, mockInpatientAdmissions, mockInpatientRequest } from '__mocks__';
 import { useInpatientAdmission } from '../hooks/useInpatientAdmission';
 import useWardLocation from '../hooks/useWardLocation';
 import { screen } from '@testing-library/react';
+import { useAppContext } from '@openmrs/esm-framework';
+
+const wardMetrics = [
+  { name: 'patients', key: 'patients', defaultTranslation: 'Patients' },
+  { name: 'freeBeds', key: 'freeBeds', defaultTranslation: 'Free beds' },
+  { name: 'capacity', key: 'capacity', defaultTranslation: 'Capacity' },
+];
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
@@ -37,6 +48,10 @@ jest.mock('../hooks/useInpatientAdmission', () => ({
   useInpatientAdmission: jest.fn(),
 }));
 
+jest.mock('../hooks/useInpatientRequest', () => ({
+  useInpatientRequest: jest.fn(),
+}));
+
 jest.mocked(useBeds).mockReturnValue({
   error: undefined,
   mutate: jest.fn(),
@@ -45,14 +60,14 @@ jest.mocked(useBeds).mockReturnValue({
   beds: mockWardBeds,
 });
 
-jest.mocked(useAdmissionLocation).mockReturnValue({
+const mockAdmissionLocationResponse = jest.mocked(useAdmissionLocation).mockReturnValue({
   error: undefined,
   mutate: jest.fn(),
   isValidating: false,
   isLoading: false,
   admissionLocation: mockAdmissionLocation,
 });
-jest.mocked(useInpatientAdmission).mockReturnValue({
+const mockInpatientAdmissionResponse = jest.mocked(useInpatientAdmission).mockReturnValue({
   error: undefined,
   mutate: jest.fn(),
   isValidating: false,
@@ -60,6 +75,13 @@ jest.mocked(useInpatientAdmission).mockReturnValue({
   inpatientAdmissions: mockInpatientAdmissions,
 });
 
+const inpatientAdmissionsUuidMap = getInpatientAdmissionsUuidMap(mockInpatientAdmissions);
+const mockWardPatientGroupDetails = {
+  admissionLocationResponse: mockAdmissionLocationResponse(),
+  inpatientAdmissionResponse: mockInpatientAdmissionResponse(),
+  ...createAndGetWardPatientGrouping(mockInpatientAdmissions, mockAdmissionLocation, mockInpatientRequest),
+};
+jest.mocked(useAppContext).mockReturnValue(mockWardPatientGroupDetails);
 describe('Ward Metrics', () => {
   it('Should display metrics of in the ward ', () => {
     mockUseWardLocation.mockReturnValueOnce({
@@ -68,10 +90,11 @@ describe('Ward Metrics', () => {
       errorFetchingLocation: null,
       invalidLocation: true,
     });
-    const bedMetrics = getWardMetrics(mockWardBeds);
+    const bedMetrics = getWardMetrics(mockWardBeds, mockWardPatientGroupDetails);
     renderWithSwr(<WardMetrics />);
     for (let [key, value] of Object.entries(bedMetrics)) {
-      expect(screen.getByText(value)).toBeInTheDocument();
+      const fieldName = wardMetrics.find((metric) => metric.name == key)?.defaultTranslation;
+      expect(screen.getByText(fieldName)).toBeInTheDocument();
     }
   });
 });
diff --git a/packages/esm-ward-app/src/ward-view/ward-view.resource.ts b/packages/esm-ward-app/src/ward-view/ward-view.resource.ts
index b7c39ed8e..c934107e0 100644
--- a/packages/esm-ward-app/src/ward-view/ward-view.resource.ts
+++ b/packages/esm-ward-app/src/ward-view/ward-view.resource.ts
@@ -1,5 +1,14 @@
 import { type Patient } from '@openmrs/esm-framework';
-import type { AdmissionLocationFetchResponse, Bed, BedLayout, InpatientAdmission, InpatientRequest, WardMetrics } from '../types';
+import type {
+  AdmissionLocationFetchResponse,
+  Bed,
+  BedLayout,
+  InpatientAdmission,
+  InpatientRequest,
+  WardMetrics,
+  WardPatientGroupDetails,
+} from '../types';
+import type { TFunction } from 'i18next';
 
 // the server side has 2 slightly incompatible types for Bed
 export function bedLayoutToBed(bedLayout: BedLayout): Bed {
@@ -25,7 +34,7 @@ export function filterBeds(admissionLocation: AdmissionLocationFetchResponse): B
 }
 
 //TODO: This implementation will change when the api is ready
-export function getWardMetrics(beds: Bed[]): WardMetrics {
+export function getWardMetrics(beds: Bed[], wardPatientGroup: WardPatientGroupDetails): WardMetrics {
   const bedMetrics = {
     patients: '--',
     freeBeds: '--',
@@ -36,8 +45,12 @@ export function getWardMetrics(beds: Bed[]): WardMetrics {
   const occupiedBeds = beds.filter((bed) => bed.status === 'OCCUPIED');
   const patients = occupiedBeds.length;
   const freeBeds = total - patients;
-  const capacity = total != 0 ? Math.trunc((patients / total) * 100) : 0;
-  return { patients: patients.toString(), freeBeds: freeBeds.toString(), capacity: capacity.toString() + '%' };
+  const capacity = total != 0 ? Math.trunc((wardPatientGroup.totalPatientsCount / total) * 100) : 0;
+  return {
+    patients: wardPatientGroup?.totalPatientsCount.toString() ?? '--',
+    freeBeds: freeBeds.toString(),
+    capacity: capacity.toString(),
+  };
 }
 
 export function getInpatientAdmissionsUuidMap(inpatientAdmissions: InpatientAdmission[]) {
@@ -53,8 +66,7 @@ export function createAndGetWardPatientGrouping(
   admissionLocation: AdmissionLocationFetchResponse,
   inpatientRequests: InpatientRequest[],
 ) {
-  
-  const inpatientAdmissionsByPatientUuid =  getInpatientAdmissionsUuidMap(inpatientAdmissions);
+  const inpatientAdmissionsByPatientUuid = getInpatientAdmissionsUuidMap(inpatientAdmissions);
 
   const wardAdmittedPatientsWithBed = new Map<string, InpatientAdmission>();
   const wardUnadmittedPatientsWithBed = new Map<string, Patient>();
@@ -77,6 +89,7 @@ export function createAndGetWardPatientGrouping(
       }
     });
   });
+
   const wardUnassignedPatientsList =
     inpatientAdmissions?.filter((inpatientAdmission) => {
       allWardPatientUuids.add(inpatientAdmission.patient.uuid);
@@ -86,7 +99,10 @@ export function createAndGetWardPatientGrouping(
       );
     }) ?? [];
 
-  for(const inpatientRequest of inpatientRequests){
+  //excluding inpatientRequests
+  const totalPatientsCount = allWardPatientUuids.size;
+
+  for (const inpatientRequest of inpatientRequests ?? []) {
     allWardPatientUuids.add(inpatientRequest.patient.uuid);
   }
 
@@ -96,6 +112,33 @@ export function createAndGetWardPatientGrouping(
     wardPatientPendingCount,
     bedLayouts,
     wardUnassignedPatientsList,
-    allWardPatientUuids
+    allWardPatientUuids,
+    totalPatientsCount,
   };
 }
+
+export function getWardMetricNameTranslation(name: string, t: TFunction) {
+  switch (name) {
+    case 'patients':
+      return t('patients', 'Patients');
+    case 'freeBeds':
+      return t('freeBeds', 'Free beds');
+    case 'capacity':
+      return t('capacity', 'Capacity');
+    case 'pendingOut':
+      return t('pendingOut', 'Pending out');
+  }
+}
+
+export function getWardMetricValueTranslation(name: string, t: TFunction, value: string) {
+  switch (name) {
+    case 'patients':
+      return t('patientsMetricValue', '{{ metricValue }}', { metricValue: value });
+    case 'freeBeds':
+      return t('freeBedsMetricValue', '{{ metricValue }}', { metricValue: value });
+    case 'capacity':
+      return t('capacityMetricValue', '{{ metricValue }} %', { metricValue: value });
+    case 'pendingOut':
+      return t('pendingOutMetricValue', '{{ metricValue }}', { metricValue: value });
+  }
+}
diff --git a/packages/esm-ward-app/translations/en.json b/packages/esm-ward-app/translations/en.json
index 2e229e58f..db470028f 100644
--- a/packages/esm-ward-app/translations/en.json
+++ b/packages/esm-ward-app/translations/en.json
@@ -9,6 +9,8 @@
   "bedShare": "Bed share",
   "bedSwap": "Bed swap",
   "cancel": "Cancel",
+  "capacity": "Capacity",
+  "capacityMetricValue": "{{ metricValue }} %",
   "chooseAnOption": "Choose an option",
   "clinicalNoteLabel": "Write your notes",
   "discharge": "Discharge",
@@ -27,6 +29,8 @@
   "female": "Female",
   "fetchingEmrConfigurationFailed": "Fetching EMR configuration failed. Try refreshing the page or contact your system administrator.",
   "fetchingPatientNotesFailed": "Fetching patient notes failed. Try refreshing the page or contact your system administrator.",
+  "freeBeds": "Free beds",
+  "freeBedsMetricValue": "{{ metricValue }}",
   "inpatientNotesWorkspaceTitle": "In-patient notes",
   "invalidElementIdCopy": "The configuration provided is invalid. It contains the following unknown element ID:",
   "invalidLocationSpecified": "Invalid location specified",
@@ -50,8 +54,12 @@
   "patientNoteNowVisible": "It should be now visible in the notes history",
   "patientNoteSaveError": "Error saving patient note",
   "patientNotesDidntLoad": "Patient notes didn't load",
+  "patients": "Patients",
+  "patientsMetricValue": "{{ metricValue }}",
   "patientTransferRequestCreated": "Patient transfer request created",
   "patientWasDischarged": "Patient was discharged",
+  "pendingOut": "Pending out",
+  "pendingOutMetricValue": "{{ metricValue }}",
   "pleaseSelectBed": "Please select a bed",
   "pleaseSelectTransferLocation": "Please select transfer location",
   "pleaseSelectTransferType": "Please select transfer type",

From 17dc81b0db0a537201c1ca3c38fad30d3d1eff86 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 00:53:09 +0300
Subject: [PATCH 05/12] (chore) Update translations from Transifex (#1316)

Co-authored-by: OpenMRS Bot <infrastructure@openmrs.org>
Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
---
 .../esm-appointments-app/translations/am.json |  2 +-
 .../esm-appointments-app/translations/ar.json |  2 +-
 .../esm-appointments-app/translations/es.json |  2 +-
 .../esm-appointments-app/translations/fr.json |  8 +--
 .../esm-appointments-app/translations/he.json |  2 +-
 .../esm-appointments-app/translations/km.json |  2 +-
 .../esm-appointments-app/translations/zh.json |  2 +-
 .../translations/zh_CN.json                   |  2 +-
 .../translations/am.json                      |  1 -
 .../translations/ar.json                      |  1 -
 .../translations/es.json                      |  1 -
 .../translations/fr.json                      |  1 -
 .../translations/he.json                      |  1 -
 .../translations/km.json                      |  1 -
 .../translations/zh.json                      |  1 -
 .../translations/zh_CN.json                   |  1 -
 .../translations/fr.json                      |  2 +-
 .../translations/am.json                      |  2 +
 .../translations/ar.json                      |  2 +
 .../translations/es.json                      |  2 +
 .../translations/fr.json                      |  2 +
 .../translations/he.json                      |  2 +
 .../translations/km.json                      |  2 +
 .../translations/zh.json                      |  2 +
 .../translations/zh_CN.json                   |  2 +
 .../translations/am.json                      |  6 +-
 .../translations/ar.json                      |  8 ++-
 .../translations/es.json                      |  6 +-
 .../translations/fr.json                      | 64 ++++++++++---------
 .../translations/he.json                      |  8 ++-
 .../translations/km.json                      |  8 ++-
 .../translations/zh.json                      |  8 ++-
 .../translations/zh_CN.json                   |  8 ++-
 33 files changed, 94 insertions(+), 70 deletions(-)

diff --git a/packages/esm-appointments-app/translations/am.json b/packages/esm-appointments-app/translations/am.json
index eba4a0bf1..b42ceb724 100644
--- a/packages/esm-appointments-app/translations/am.json
+++ b/packages/esm-appointments-app/translations/am.json
@@ -27,7 +27,7 @@
   "appointments": "Appointments",
   "Appointments": "Appointments",
   "appointments_lower": "appointments",
-  "appointmentsCalendar": "Appointments Calendar",
+  "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "Appointment scheduled",
   "appointmentService": "Appointment service",
   "appointmentServiceCreate": "Appointment service created successfully",
diff --git a/packages/esm-appointments-app/translations/ar.json b/packages/esm-appointments-app/translations/ar.json
index e50ea396c..a6ddb2098 100644
--- a/packages/esm-appointments-app/translations/ar.json
+++ b/packages/esm-appointments-app/translations/ar.json
@@ -27,7 +27,7 @@
   "appointments": "موعد",
   "Appointments": "Appointments",
   "appointments_lower": "appointments",
-  "appointmentsCalendar": "تقويم المواعيد",
+  "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "تم جدولة الموعد",
   "appointmentService": "خدمة الموعد",
   "appointmentServiceCreate": "تم إنشاء خدمة الموعد بنجاح",
diff --git a/packages/esm-appointments-app/translations/es.json b/packages/esm-appointments-app/translations/es.json
index aafac45a5..784d82588 100644
--- a/packages/esm-appointments-app/translations/es.json
+++ b/packages/esm-appointments-app/translations/es.json
@@ -27,7 +27,7 @@
   "appointments": "Citas",
   "Appointments": "Appointments",
   "appointments_lower": "appointments",
-  "appointmentsCalendar": "Calendario de Citas",
+  "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "Cita programada",
   "appointmentService": "Servicio de citas",
   "appointmentServiceCreate": "Servicio de citas creado exitosamente",
diff --git a/packages/esm-appointments-app/translations/fr.json b/packages/esm-appointments-app/translations/fr.json
index 0944bbb3e..88b9821e1 100644
--- a/packages/esm-appointments-app/translations/fr.json
+++ b/packages/esm-appointments-app/translations/fr.json
@@ -27,7 +27,7 @@
   "appointments": "Rendez-vous",
   "Appointments": "Rendez-vous",
   "appointments_lower": "rendez-vous",
-  "appointmentsCalendar": "Calendrier des Rendez-vous",
+  "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "Rendez-vous planifié",
   "appointmentService": "Service du rendez-vous",
   "appointmentServiceCreate": "Service du rendez-vous créé avec succès",
@@ -89,7 +89,7 @@
   "expected": "Attendus",
   "filterTable": "Filter table",
   "gender": "Genre",
-  "highestServiceVolume": "Highest volume service: {{time}}",
+  "highestServiceVolume": "Service le plus utilisé: {{time}}",
   "identifier": "Identifiant",
   "invalidNumber": "Number is not valid",
   "invalidTime": "Invalid time",
@@ -109,7 +109,7 @@
   "noEncountersFound": "Aucune rencontre trouvée",
   "noPastAppointments": "Il n'y a pas de rendez-vous passé à afficher pour ce patient",
   "noPreviousVisitFound": "Aucune visite précédente trouvée",
-  "notArrived": "Not arrived",
+  "notArrived": "Non arrivé(s)",
   "note": "Note",
   "notes": "Notes",
   "noUpcomingAppointments": "Il n'y a pas de rendez-vous à venir à afficher pour ce patient",
@@ -126,7 +126,7 @@
   "previousPage": "Page précédente",
   "provider": "Fournisseur",
   "providers": "Fournisseurs",
-  "providersBooked": "Providers booked: {{time}}",
+  "providersBooked": "Prestataires reservés: {{time}}",
   "recurringAppointment": "Recurring Appointment",
   "recurringAppointmentShouldHaveEndDate": "A recurring appointment should have an end date",
   "repeatEvery": "Repeat every",
diff --git a/packages/esm-appointments-app/translations/he.json b/packages/esm-appointments-app/translations/he.json
index 507f0a208..f57c467d3 100644
--- a/packages/esm-appointments-app/translations/he.json
+++ b/packages/esm-appointments-app/translations/he.json
@@ -27,7 +27,7 @@
   "appointments": "תורים",
   "Appointments": "Appointments",
   "appointments_lower": "appointments",
-  "appointmentsCalendar": "לוח שנה של התורים",
+  "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "התור נקבע",
   "appointmentService": "שירות התור",
   "appointmentServiceCreate": "שירות התור נוצר בהצלחה",
diff --git a/packages/esm-appointments-app/translations/km.json b/packages/esm-appointments-app/translations/km.json
index 5b4baa9d7..3b556ec48 100644
--- a/packages/esm-appointments-app/translations/km.json
+++ b/packages/esm-appointments-app/translations/km.json
@@ -27,7 +27,7 @@
   "appointments": "ការណាត់ជួប",
   "Appointments": "Appointments",
   "appointments_lower": "appointments",
-  "appointmentsCalendar": "Appointments Calendar",
+  "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "ការណាត់ជួបតាមកាលវិភាគ",
   "appointmentService": "សេវាកម្មណាត់ជួប",
   "appointmentServiceCreate": "សេវាកម្មណាត់ជួបត្រូវបានបង្កើតដោយជោគជ័យ",
diff --git a/packages/esm-appointments-app/translations/zh.json b/packages/esm-appointments-app/translations/zh.json
index 08ce37cfc..14e091c4a 100644
--- a/packages/esm-appointments-app/translations/zh.json
+++ b/packages/esm-appointments-app/translations/zh.json
@@ -27,7 +27,7 @@
   "appointments": "预约",
   "Appointments": "预约",
   "appointments_lower": "预约",
-  "appointmentsCalendar": "预约日历",
+  "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "预约已安排",
   "appointmentService": "预约服务",
   "appointmentServiceCreate": "预约服务创建成功",
diff --git a/packages/esm-appointments-app/translations/zh_CN.json b/packages/esm-appointments-app/translations/zh_CN.json
index 08ce37cfc..14e091c4a 100644
--- a/packages/esm-appointments-app/translations/zh_CN.json
+++ b/packages/esm-appointments-app/translations/zh_CN.json
@@ -27,7 +27,7 @@
   "appointments": "预约",
   "Appointments": "预约",
   "appointments_lower": "预约",
-  "appointmentsCalendar": "预约日历",
+  "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "预约已安排",
   "appointmentService": "预约服务",
   "appointmentServiceCreate": "预约服务创建成功",
diff --git a/packages/esm-bed-management-app/translations/am.json b/packages/esm-bed-management-app/translations/am.json
index c85ffb050..dba1d2c0e 100644
--- a/packages/esm-bed-management-app/translations/am.json
+++ b/packages/esm-bed-management-app/translations/am.json
@@ -15,7 +15,6 @@
   "bedTagPlaceholder": "",
   "bedType": "Add Bed Type",
   "bedTypePlaceholder": "",
-  "cancel": "Cancel",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
diff --git a/packages/esm-bed-management-app/translations/ar.json b/packages/esm-bed-management-app/translations/ar.json
index c85ffb050..dba1d2c0e 100644
--- a/packages/esm-bed-management-app/translations/ar.json
+++ b/packages/esm-bed-management-app/translations/ar.json
@@ -15,7 +15,6 @@
   "bedTagPlaceholder": "",
   "bedType": "Add Bed Type",
   "bedTypePlaceholder": "",
-  "cancel": "Cancel",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
diff --git a/packages/esm-bed-management-app/translations/es.json b/packages/esm-bed-management-app/translations/es.json
index c85ffb050..dba1d2c0e 100644
--- a/packages/esm-bed-management-app/translations/es.json
+++ b/packages/esm-bed-management-app/translations/es.json
@@ -15,7 +15,6 @@
   "bedTagPlaceholder": "",
   "bedType": "Add Bed Type",
   "bedTypePlaceholder": "",
-  "cancel": "Cancel",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
diff --git a/packages/esm-bed-management-app/translations/fr.json b/packages/esm-bed-management-app/translations/fr.json
index 4286a7586..0ca64a745 100644
--- a/packages/esm-bed-management-app/translations/fr.json
+++ b/packages/esm-bed-management-app/translations/fr.json
@@ -15,7 +15,6 @@
   "bedTagPlaceholder": "",
   "bedType": "Add Bed Type",
   "bedTypePlaceholder": "",
-  "cancel": "Annuler",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choisir un type de lit",
   "chooseOccupiedStatus": "Choose occupied status",
diff --git a/packages/esm-bed-management-app/translations/he.json b/packages/esm-bed-management-app/translations/he.json
index c85ffb050..dba1d2c0e 100644
--- a/packages/esm-bed-management-app/translations/he.json
+++ b/packages/esm-bed-management-app/translations/he.json
@@ -15,7 +15,6 @@
   "bedTagPlaceholder": "",
   "bedType": "Add Bed Type",
   "bedTypePlaceholder": "",
-  "cancel": "Cancel",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
diff --git a/packages/esm-bed-management-app/translations/km.json b/packages/esm-bed-management-app/translations/km.json
index c85ffb050..dba1d2c0e 100644
--- a/packages/esm-bed-management-app/translations/km.json
+++ b/packages/esm-bed-management-app/translations/km.json
@@ -15,7 +15,6 @@
   "bedTagPlaceholder": "",
   "bedType": "Add Bed Type",
   "bedTypePlaceholder": "",
-  "cancel": "Cancel",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
diff --git a/packages/esm-bed-management-app/translations/zh.json b/packages/esm-bed-management-app/translations/zh.json
index c85ffb050..dba1d2c0e 100644
--- a/packages/esm-bed-management-app/translations/zh.json
+++ b/packages/esm-bed-management-app/translations/zh.json
@@ -15,7 +15,6 @@
   "bedTagPlaceholder": "",
   "bedType": "Add Bed Type",
   "bedTypePlaceholder": "",
-  "cancel": "Cancel",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
diff --git a/packages/esm-bed-management-app/translations/zh_CN.json b/packages/esm-bed-management-app/translations/zh_CN.json
index c85ffb050..dba1d2c0e 100644
--- a/packages/esm-bed-management-app/translations/zh_CN.json
+++ b/packages/esm-bed-management-app/translations/zh_CN.json
@@ -15,7 +15,6 @@
   "bedTagPlaceholder": "",
   "bedType": "Add Bed Type",
   "bedTypePlaceholder": "",
-  "cancel": "Cancel",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
diff --git a/packages/esm-patient-list-management-app/translations/fr.json b/packages/esm-patient-list-management-app/translations/fr.json
index 9a4ebe1ff..558e9874f 100644
--- a/packages/esm-patient-list-management-app/translations/fr.json
+++ b/packages/esm-patient-list-management-app/translations/fr.json
@@ -65,7 +65,7 @@
   "removePatientFromListConfirmation": "Are you sure you want to remove {{patientName}} from this list?",
   "searchForAListToAddThisPatientTo": "Rechercher une liste à laquelle ajouter ce patient.",
   "searchForList": "Rechercher une liste",
-  "searchThisList": "Search this list",
+  "searchThisList": "Recherchez dans cette liste",
   "sex": "Sexe",
   "starList": "Mettre en favori",
   "starred": "favori",
diff --git a/packages/esm-patient-registration-app/translations/am.json b/packages/esm-patient-registration-app/translations/am.json
index 9a7e5b919..756bdc9c5 100644
--- a/packages/esm-patient-registration-app/translations/am.json
+++ b/packages/esm-patient-registration-app/translations/am.json
@@ -4,6 +4,7 @@
   "allFieldsRequiredText": "All fields are required unless marked optional",
   "autoGeneratedPlaceholderText": "Auto-generated",
   "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
   "birthdayRequired": "Birthday is required",
   "birthFieldLabelText": "Birth",
   "cancel": "Cancel",
@@ -72,6 +73,7 @@
   "no": "No",
   "nonCodedCauseOfDeath": "Non-coded cause of death",
   "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonsensicalYears": "Estimated years cannot be more than 140",
   "numberInNameDubious": "Number in name is dubious",
   "obsFieldUnknownDatatype": "Concept for obs field '{{fieldDefinitionId}}' has unknown datatype '{{datatypeName}}'",
   "optional": "optional",
diff --git a/packages/esm-patient-registration-app/translations/ar.json b/packages/esm-patient-registration-app/translations/ar.json
index 5784b4d33..49c9496ef 100644
--- a/packages/esm-patient-registration-app/translations/ar.json
+++ b/packages/esm-patient-registration-app/translations/ar.json
@@ -4,6 +4,7 @@
   "allFieldsRequiredText": "جميع الحقول مطلوبة ما لم يتم التأشير عليها بأنها اختيارية",
   "autoGeneratedPlaceholderText": "تم إنشاؤه تلقائيًا",
   "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
   "birthdayRequired": "Birthday is required",
   "birthFieldLabelText": "الميلاد",
   "cancel": "إلغاء",
@@ -72,6 +73,7 @@
   "no": "لا",
   "nonCodedCauseOfDeath": "Non-coded cause of death",
   "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonsensicalYears": "Estimated years cannot be more than 140",
   "numberInNameDubious": "Number in name is dubious",
   "obsFieldUnknownDatatype": "Concept for obs field '{{fieldDefinitionId}}' has unknown datatype '{{datatypeName}}'",
   "optional": "اختياري",
diff --git a/packages/esm-patient-registration-app/translations/es.json b/packages/esm-patient-registration-app/translations/es.json
index 684d3386a..7687b950b 100644
--- a/packages/esm-patient-registration-app/translations/es.json
+++ b/packages/esm-patient-registration-app/translations/es.json
@@ -4,6 +4,7 @@
   "allFieldsRequiredText": "Todos los campos son obligatorios a menos que se indique como opcionales",
   "autoGeneratedPlaceholderText": "Autogenerado",
   "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
   "birthdayRequired": "Cumpleaños es obligatorio",
   "birthFieldLabelText": "Nacimiento",
   "cancel": "Cancelar",
@@ -72,6 +73,7 @@
   "no": "No",
   "nonCodedCauseOfDeath": "Non-coded cause of death",
   "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonsensicalYears": "Estimated years cannot be more than 140",
   "numberInNameDubious": "Número en nombre es dudoso",
   "obsFieldUnknownDatatype": "El concepto para el campo de observación '{{fieldDefinitionId}}' tiene un tipo de datos desconocido '{{datatypeName}}'",
   "optional": "Opcional",
diff --git a/packages/esm-patient-registration-app/translations/fr.json b/packages/esm-patient-registration-app/translations/fr.json
index 5089f379e..18bb7314a 100644
--- a/packages/esm-patient-registration-app/translations/fr.json
+++ b/packages/esm-patient-registration-app/translations/fr.json
@@ -4,6 +4,7 @@
   "allFieldsRequiredText": "Tous les champs sont requis sauf si explicitement indiqués facultatifs",
   "autoGeneratedPlaceholderText": "Auto-généré",
   "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
   "birthdayRequired": "La date de naissance est requise",
   "birthFieldLabelText": "Naissance",
   "cancel": "Annuler",
@@ -72,6 +73,7 @@
   "no": "Non",
   "nonCodedCauseOfDeath": "Non-coded cause of death",
   "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonsensicalYears": "Estimated years cannot be more than 140",
   "numberInNameDubious": "Le chiffre dans le nom est suspect",
   "obsFieldUnknownDatatype": "Le concept pour le champ d'observation '{{fieldDefinitionId}}' a un type de données inconnu '{{datatypeName}}'",
   "optional": "Optionnel",
diff --git a/packages/esm-patient-registration-app/translations/he.json b/packages/esm-patient-registration-app/translations/he.json
index 6908f4a20..49f5e38f0 100644
--- a/packages/esm-patient-registration-app/translations/he.json
+++ b/packages/esm-patient-registration-app/translations/he.json
@@ -4,6 +4,7 @@
   "allFieldsRequiredText": "כל השדות נדרשים אלא אם צוין אחרת",
   "autoGeneratedPlaceholderText": "נוצר אוטומטית",
   "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
   "birthdayRequired": "תאריך הלידה נדרש",
   "birthFieldLabelText": "לידה",
   "cancel": "ביטול",
@@ -72,6 +73,7 @@
   "no": "לא",
   "nonCodedCauseOfDeath": "Non-coded cause of death",
   "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonsensicalYears": "Estimated years cannot be more than 140",
   "numberInNameDubious": "מספר בשם חשוד",
   "obsFieldUnknownDatatype": "Concept for obs field '{{fieldDefinitionId}}' has unknown datatype '{{datatypeName}}'",
   "optional": "אופציונלי",
diff --git a/packages/esm-patient-registration-app/translations/km.json b/packages/esm-patient-registration-app/translations/km.json
index 0420b675d..c9aba5f11 100644
--- a/packages/esm-patient-registration-app/translations/km.json
+++ b/packages/esm-patient-registration-app/translations/km.json
@@ -4,6 +4,7 @@
   "allFieldsRequiredText": "តម្រូវឱ្យបំពេញគ្រប់កន្លែងចំហរទាំងអស់ លុះត្រាតែមានសម្គាល់ថាជាជម្រើស",
   "autoGeneratedPlaceholderText": "ទាញចេញទិន្នន័យដោយស្វ័យប្រវត្តិ",
   "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
   "birthdayRequired": "តម្រូវឱ្យបំពេញថ្ងៃខែឆ្នាំកំណើត",
   "birthFieldLabelText": "ថ្ងៃខែឆ្នាំកំណើត",
   "cancel": "បោះបង់ចោល",
@@ -72,6 +73,7 @@
   "no": "ទេ",
   "nonCodedCauseOfDeath": "Non-coded cause of death",
   "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonsensicalYears": "Estimated years cannot be more than 140",
   "numberInNameDubious": "លេខគឺជាឈ្មោះគួរឱ្យសង្ស័យ",
   "obsFieldUnknownDatatype": "Concept for obs field '{{fieldDefinitionId}}' has unknown datatype '{{datatypeName}}'",
   "optional": "ជាជម្រើស",
diff --git a/packages/esm-patient-registration-app/translations/zh.json b/packages/esm-patient-registration-app/translations/zh.json
index 5605bc328..7008353b0 100644
--- a/packages/esm-patient-registration-app/translations/zh.json
+++ b/packages/esm-patient-registration-app/translations/zh.json
@@ -4,6 +4,7 @@
   "allFieldsRequiredText": "所有字段都是必填的，除非标记为可选。",
   "autoGeneratedPlaceholderText": "自动生成",
   "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
   "birthdayRequired": "生日是必填项",
   "birthFieldLabelText": "出生",
   "cancel": "取消",
@@ -72,6 +73,7 @@
   "no": "否",
   "nonCodedCauseOfDeath": "Non-coded cause of death",
   "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonsensicalYears": "Estimated years cannot be more than 140",
   "numberInNameDubious": "姓名中含有数字",
   "obsFieldUnknownDatatype": "obs字段'{{fieldDefinitionId}}'的概念具有未知数据类型'{{datatypeName}}'",
   "optional": "可选的",
diff --git a/packages/esm-patient-registration-app/translations/zh_CN.json b/packages/esm-patient-registration-app/translations/zh_CN.json
index 5605bc328..7008353b0 100644
--- a/packages/esm-patient-registration-app/translations/zh_CN.json
+++ b/packages/esm-patient-registration-app/translations/zh_CN.json
@@ -4,6 +4,7 @@
   "allFieldsRequiredText": "所有字段都是必填的，除非标记为可选。",
   "autoGeneratedPlaceholderText": "自动生成",
   "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
   "birthdayRequired": "生日是必填项",
   "birthFieldLabelText": "出生",
   "cancel": "取消",
@@ -72,6 +73,7 @@
   "no": "否",
   "nonCodedCauseOfDeath": "Non-coded cause of death",
   "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonsensicalYears": "Estimated years cannot be more than 140",
   "numberInNameDubious": "姓名中含有数字",
   "obsFieldUnknownDatatype": "obs字段'{{fieldDefinitionId}}'的概念具有未知数据类型'{{datatypeName}}'",
   "optional": "可选的",
diff --git a/packages/esm-service-queues-app/translations/am.json b/packages/esm-service-queues-app/translations/am.json
index bd383fb87..a172806bc 100644
--- a/packages/esm-service-queues-app/translations/am.json
+++ b/packages/esm-service-queues-app/translations/am.json
@@ -161,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
   "patientHasActiveVisit": "The patient already has an active visit",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
   "patientNotInQueue": "The patient is not in the queue",
@@ -203,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "Error updating queue entry",
   "queueEntryUpdateSuccessfully": "Queue Entry Updated Successfully",
-  "queueLocation": "Queue Location",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
   "queueName": "Queue name",
   "queuePriority": "Queue priority",
@@ -254,7 +255,7 @@
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
-  "serviceIsRequired": "Status is required",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
   "sex": "Sex",
@@ -280,6 +281,7 @@
   "today": "Today",
   "totalPatients": "Total Patients",
   "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
diff --git a/packages/esm-service-queues-app/translations/ar.json b/packages/esm-service-queues-app/translations/ar.json
index cf07f6ab8..437861454 100644
--- a/packages/esm-service-queues-app/translations/ar.json
+++ b/packages/esm-service-queues-app/translations/ar.json
@@ -161,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "المريض الذي يحضر الخدمة",
   "patientHasActiveVisit": "لدى المريض زيارة نشطة بالفعل",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "قائمة المرضى",
   "patientName": "اسم المريض",
   "patientNotInQueue": "المريض ليس في الطابور",
@@ -203,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "خطأ في تحديث دخول الطابور",
   "queueEntryUpdateSuccessfully": "تم تحديث دخول الطابور بنجاح",
-  "queueLocation": "موقع الطابور",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
   "queueName": "اسم الطابور",
   "queuePriority": "أولوية الطابور",
@@ -212,7 +213,7 @@
   "queueRoomAddFailed": "خطأ في إضافة غرفة الانتظار",
   "queueRoomName": "اسم غرفة الانتظار",
   "queueRoomUpdatedSuccessfully": "تم تحديث غرفة الانتظار بنجاح",
-  "queuesClearedSuccessfully": "تم مسح الطوابير بنجاح",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
   "queueScreen": "شاشة الطابور",
   "queueService": "خدمة الطابور",
   "queueStatus": "حالة الطابور",
@@ -254,7 +255,7 @@
   "serve": "خدمة",
   "servePatient": "خدمة المريض",
   "service": "خدمة",
-  "serviceIsRequired": "Status is required",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "طابور الخدمة",
   "serviceQueues": "طوابير الخدمة",
   "sex": "الجنس",
@@ -280,6 +281,7 @@
   "today": "اليوم",
   "totalPatients": "Total Patients",
   "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "نموذج الترياج",
diff --git a/packages/esm-service-queues-app/translations/es.json b/packages/esm-service-queues-app/translations/es.json
index bd383fb87..a172806bc 100644
--- a/packages/esm-service-queues-app/translations/es.json
+++ b/packages/esm-service-queues-app/translations/es.json
@@ -161,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
   "patientHasActiveVisit": "The patient already has an active visit",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
   "patientNotInQueue": "The patient is not in the queue",
@@ -203,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "Error updating queue entry",
   "queueEntryUpdateSuccessfully": "Queue Entry Updated Successfully",
-  "queueLocation": "Queue Location",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
   "queueName": "Queue name",
   "queuePriority": "Queue priority",
@@ -254,7 +255,7 @@
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
-  "serviceIsRequired": "Status is required",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
   "sex": "Sex",
@@ -280,6 +281,7 @@
   "today": "Today",
   "totalPatients": "Total Patients",
   "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
diff --git a/packages/esm-service-queues-app/translations/fr.json b/packages/esm-service-queues-app/translations/fr.json
index 2db1a2a0d..712e74f7d 100644
--- a/packages/esm-service-queues-app/translations/fr.json
+++ b/packages/esm-service-queues-app/translations/fr.json
@@ -22,7 +22,7 @@
   "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "Liste de patients attendus",
-  "all": "All",
+  "all": "Tout",
   "and": "And",
   "anotherVisitType": "Commencer un autre type de visite",
   "any": "Any",
@@ -161,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
   "patientHasActiveVisit": "The patient already has an active visit",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
   "patientNotInQueue": "The patient is not in the queue",
@@ -203,62 +204,62 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "Error updating queue entry",
   "queueEntryUpdateSuccessfully": "Queue Entry Updated Successfully",
-  "queueLocation": "Queue Location",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
-  "queueName": "Queue name",
-  "queuePriority": "Queue priority",
+  "queueName": "Nom de la file d'attente",
+  "queuePriority": "Priorité dans la file d'attente",
   "queueRoom": "Queue room",
   "queueRoomAddedSuccessfully": "Queue room added successfully",
   "queueRoomAddFailed": "Error adding queue room",
   "queueRoomName": "Queue room name",
   "queueRoomUpdatedSuccessfully": "Queue room updated successfully",
-  "queuesClearedSuccessfully": "Files d'attente vidées avec succès",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
   "queueScreen": "Queue screen",
-  "queueService": "Queue service",
-  "queueStatus": "Queue status",
+  "queueService": "Service d'attente",
+  "queueStatus": "Statut de la file d'attente",
   "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
   "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
-  "refills": "Refills",
-  "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit?",
+  "recommended": "Recommandée",
+  "refills": "Recharges",
+  "removeFromQueueAndEndVisit": "Retirer le patient de la file d'attente et mettre fin à la visite active",
   "removePatient": "Remove patient",
   "removePatientFromQueue": "Remove patient from queue",
-  "removeQueueEntryError": "Error removing queue entry",
+  "removeQueueEntryError": "Erreur lors de la suppression d'une entrée dans la file d'attente",
   "requeue": "Requeue",
   "retainLocation": "Retain location",
-  "returnDate": "Return Date",
+  "returnDate": "Date de retour",
   "room": "Room",
   "rRate": "R. Rate",
-  "save": "Save",
+  "save": "Sauvegarder",
   "scheduledAppointmentsList": "Liste des patients avec un rendez-vous planifié",
   "scheduledToday": "Prévu pour aujourd'hui",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
+  "search": "Recherche",
+  "searchboxPlaceholder": "Rechercher un nom ou un numéro d'identification de patient",
   "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
+  "searchForPatient": "Recherche d'un patient",
   "searchPatient": "Search Patient",
-  "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
+  "searchThisList": "Rechercher dans cette liste",
+  "secondaryHelperText": "Tapez le nom ou le numéro d'identification unique du patient.",
   "selectALocation": "Select a location",
-  "selectAVisitType": "Select visit type",
+  "selectAVisitType": "Sélectionnez le type de visite",
   "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
+  "selectOption": "Sélectionner une option",
   "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Sélectionnez un emplacement de file d'attente",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
-  "selectService": "Select a service",
+  "selectService": "Sélectionner un service",
   "selectServiceType": "Sélectionner un type de service",
   "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
-  "serviceIsRequired": "Status is required",
-  "serviceQueue": "Service queue",
+  "serviceIsRequired": "Service is required",
+  "serviceQueue": "File d'attente",
   "serviceQueues": "Files d'attente",
-  "sex": "Sex",
-  "sortBy": "Sort by",
+  "sex": "Sexe",
+  "sortBy": "Trier par",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "La tranche d'âge de départ n'est pas valide",
@@ -266,20 +267,21 @@
   "startVisit": "Commencer une visite",
   "startVisitError": "Erreur lors du démarrage de la visite",
   "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
-  "status": "Status",
+  "status": "Statut",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
   "success": "Success",
-  "temperature": "Temperature",
-  "ticketNumber": "Ticket number",
-  "time": "Time",
+  "temperature": "Température",
+  "ticketNumber": "Ticket Number",
+  "time": "Temps",
   "timeCannotBeInFuture": "Time cannot be in the future",
   "timeCannotBePriorToPreviousQueueEntry": "L’heure ne peut être antérieure au début de la file d’attente précédente: {{time}}",
   "timeOfTransition": "Time of transition",
-  "tirageNotYetCompleted": "Triage has not yet been completed",
-  "today": "Today",
+  "tirageNotYetCompleted": "Le triage n'est pas encore terminé",
+  "today": "Aujourd'hui",
   "totalPatients": "Total Patients",
   "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
diff --git a/packages/esm-service-queues-app/translations/he.json b/packages/esm-service-queues-app/translations/he.json
index bf918c744..6ee50bbde 100644
--- a/packages/esm-service-queues-app/translations/he.json
+++ b/packages/esm-service-queues-app/translations/he.json
@@ -161,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "המטופל משתתף בשירות",
   "patientHasActiveVisit": "למטופל כבר יש ביקור פעיל",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "רשימת המטופלים",
   "patientName": "שם המטופל",
   "patientNotInQueue": "המטופל אינו בתור",
@@ -203,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "שגיאה בעדכון סטטוס רשומת תור",
   "queueEntryUpdateSuccessfully": "עודכן בהצלחה סטטוס רשומת התור",
-  "queueLocation": "מיקום התור",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
   "queueName": "שם התור",
   "queuePriority": "עדיפות התור",
@@ -212,7 +213,7 @@
   "queueRoomAddFailed": "שגיאה בהוספת חדר תור",
   "queueRoomName": "שם חדר התור",
   "queueRoomUpdatedSuccessfully": "חדר התור עודכן בהצלחה",
-  "queuesClearedSuccessfully": "התורים נוקו בהצלחה",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
   "queueScreen": "מסך התור",
   "queueService": "שירות התור",
   "queueStatus": "מצב התור",
@@ -254,7 +255,7 @@
   "serve": "שרת",
   "servePatient": "שרת מטופל",
   "service": "שירות",
-  "serviceIsRequired": "Status is required",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "תור השירות",
   "serviceQueues": "תורי השירות",
   "sex": "מגדר",
@@ -280,6 +281,7 @@
   "today": "היום",
   "totalPatients": "Total Patients",
   "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "טופס טריאז'",
diff --git a/packages/esm-service-queues-app/translations/km.json b/packages/esm-service-queues-app/translations/km.json
index b89314465..2975f41f5 100644
--- a/packages/esm-service-queues-app/translations/km.json
+++ b/packages/esm-service-queues-app/translations/km.json
@@ -161,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
   "patientHasActiveVisit": "អ្នកជំងឺបានមកពិនិត្យជំងឺសកម្មរួចហើយ",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "បញ្ជីអ្នកជំងឺ",
   "patientName": "Patient name",
   "patientNotInQueue": "The patient is not in the queue",
@@ -203,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "កំហុសក្នុងការធ្វើបច្ចុប្បន្នភាពបញ្ចូលតាមជួរ",
   "queueEntryUpdateSuccessfully": "ការបញ្ចូលតាមជួរត្រូវបានធ្វើបច្ចុប្បន្នភាពដោយជោគជ័យ",
-  "queueLocation": "Queue Location",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
   "queueName": "ឈ្មោះជួរ",
   "queuePriority": "អាទិភាពជួរ",
@@ -212,7 +213,7 @@
   "queueRoomAddFailed": "Error adding queue room",
   "queueRoomName": "Queue room name",
   "queueRoomUpdatedSuccessfully": "Queue room updated successfully",
-  "queuesClearedSuccessfully": "ជួរត្រូវបានជម្រះដោយជោគជ័យ",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
   "queueScreen": "Queue screen",
   "queueService": "សេវាកម្មជួរ",
   "queueStatus": "ស្ថានភាពជួរ",
@@ -254,7 +255,7 @@
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "សេវា",
-  "serviceIsRequired": "Status is required",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "ជួរសេវាកម្ម",
   "serviceQueues": "ជួរនៃសេវា",
   "sex": "ភេទ",
@@ -280,6 +281,7 @@
   "today": "ថ្ងៃនេះ",
   "totalPatients": "Total Patients",
   "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "ទម្រង់បែងចែកជំងឺដំបូង",
diff --git a/packages/esm-service-queues-app/translations/zh.json b/packages/esm-service-queues-app/translations/zh.json
index 8d8bf80a5..bbdc72680 100644
--- a/packages/esm-service-queues-app/translations/zh.json
+++ b/packages/esm-service-queues-app/translations/zh.json
@@ -161,6 +161,7 @@
   "patientAlreadyInQueue": "患者已在队列中",
   "patientAttendingService": "患者就诊服务",
   "patientHasActiveVisit": "该患者已经有一个进行中的就诊",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "患者列表",
   "patientName": "患者姓名",
   "patientNotInQueue": "患者不在队列中",
@@ -203,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "更新队列条目状态时出现错误",
   "queueEntryUpdateSuccessfully": "队列条目更新成功",
-  "queueLocation": "候诊地点",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "候诊地点是必填项",
   "queueName": "队列名称",
   "queuePriority": "队列优先级",
@@ -212,7 +213,7 @@
   "queueRoomAddFailed": "添加候诊室时出现错误",
   "queueRoomName": "候诊室名称",
   "queueRoomUpdatedSuccessfully": "候诊室更新成功",
-  "queuesClearedSuccessfully": "队列已成功清空",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
   "queueScreen": "队列显示屏",
   "queueService": "队列服务",
   "queueStatus": "队列状态",
@@ -254,7 +255,7 @@
   "serve": "接待",
   "servePatient": "接待患者",
   "service": "服务",
-  "serviceIsRequired": "状态是必填项",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "服务队列",
   "serviceQueues": "服务队列",
   "sex": "性别",
@@ -280,6 +281,7 @@
   "today": "今日",
   "totalPatients": "Total Patients",
   "transition": "转诊",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "转诊患者",
   "transitionPatientStatusOrQueue": "选择一个新的状态或队列用于患者的转诊。",
   "triageForm": "分诊表",
diff --git a/packages/esm-service-queues-app/translations/zh_CN.json b/packages/esm-service-queues-app/translations/zh_CN.json
index 8b29df39a..bbdc72680 100644
--- a/packages/esm-service-queues-app/translations/zh_CN.json
+++ b/packages/esm-service-queues-app/translations/zh_CN.json
@@ -161,6 +161,7 @@
   "patientAlreadyInQueue": "患者已在队列中",
   "patientAttendingService": "患者就诊服务",
   "patientHasActiveVisit": "该患者已经有一个进行中的就诊",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "患者列表",
   "patientName": "患者姓名",
   "patientNotInQueue": "患者不在队列中",
@@ -203,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "更新队列条目状态时出现错误",
   "queueEntryUpdateSuccessfully": "队列条目更新成功",
-  "queueLocation": "队列地点",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "候诊地点是必填项",
   "queueName": "队列名称",
   "queuePriority": "队列优先级",
@@ -212,7 +213,7 @@
   "queueRoomAddFailed": "添加候诊室时出现错误",
   "queueRoomName": "候诊室名称",
   "queueRoomUpdatedSuccessfully": "候诊室更新成功",
-  "queuesClearedSuccessfully": "队列已成功清空",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
   "queueScreen": "队列显示屏",
   "queueService": "队列服务",
   "queueStatus": "队列状态",
@@ -254,7 +255,7 @@
   "serve": "接待",
   "servePatient": "接待患者",
   "service": "服务",
-  "serviceIsRequired": "状态是必填项",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "服务队列",
   "serviceQueues": "服务队列",
   "sex": "性别",
@@ -280,6 +281,7 @@
   "today": "今日",
   "totalPatients": "Total Patients",
   "transition": "转诊",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "转诊患者",
   "transitionPatientStatusOrQueue": "选择一个新的状态或队列用于患者的转诊。",
   "triageForm": "分诊表",

From fbeab757f6efa00d7318f816ad4e3d4eb7812e7d Mon Sep 17 00:00:00 2001
From: chibongho <cbho@pih.org>
Date: Tue, 24 Sep 2024 10:31:24 -0400
Subject: [PATCH 06/12] =?UTF-8?q?(fix)=20-=20O3-3996=20-=20Ward=20App=20-?=
 =?UTF-8?q?=20fix=20styling=20for=20patient=20card=20footer=20and=20?=
 =?UTF-8?q?=E2=80=A6=20(#1325)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* (fix) - O3-3996 - Ward App - fix styling for patient card footer and mother child row

* fix typo
---
 .../esm-ward-app/src/beds/occupied-bed.scss   |  1 +
 .../card-rows/mother-child-row.extension.tsx  |  2 +-
 .../card-rows/mother-child-row.scss           |  5 +++-
 .../ward-patient-card.component.tsx           | 24 ++++++++++---------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/esm-ward-app/src/beds/occupied-bed.scss b/packages/esm-ward-app/src/beds/occupied-bed.scss
index 142d33f58..5d946193d 100644
--- a/packages/esm-ward-app/src/beds/occupied-bed.scss
+++ b/packages/esm-ward-app/src/beds/occupied-bed.scss
@@ -5,6 +5,7 @@
   display: flex;
   flex-direction: column;
   background-color: vars.$ui-02;
+  height: fit-content;
 }
 
 .bedDivider {
diff --git a/packages/esm-ward-app/src/ward-patient-card/card-rows/mother-child-row.extension.tsx b/packages/esm-ward-app/src/ward-patient-card/card-rows/mother-child-row.extension.tsx
index bf5a36169..ec40f6103 100644
--- a/packages/esm-ward-app/src/ward-patient-card/card-rows/mother-child-row.extension.tsx
+++ b/packages/esm-ward-app/src/ward-patient-card/card-rows/mother-child-row.extension.tsx
@@ -94,7 +94,7 @@ const MotherChildRowExtension: WardPatientCard = ({ patient }) => {
             <div className={styles.motherOrBabyIconDiv}>
               <Icon className={styles.motherOrBabyIcon} size={24} />
             </div>
-            <div className={wardPatientCardStyles.dotSeparatedChildren}>
+            <div className={classNames(styles.motherOrBabyRowElementsDiv, wardPatientCardStyles.dotSeparatedChildren)}>
               <WardPatientName patient={patientB} />
               <WardPatientIdentifier patient={patientB} />
               <WardPatientAge patient={patientB} />
diff --git a/packages/esm-ward-app/src/ward-patient-card/card-rows/mother-child-row.scss b/packages/esm-ward-app/src/ward-patient-card/card-rows/mother-child-row.scss
index c8ca3f53c..2aecd480e 100644
--- a/packages/esm-ward-app/src/ward-patient-card/card-rows/mother-child-row.scss
+++ b/packages/esm-ward-app/src/ward-patient-card/card-rows/mother-child-row.scss
@@ -5,8 +5,11 @@
   display: flex;
 }
 
-.motherOrBabyIconDiv {
+.motherOrBabyRowElementsDiv {
   flex: 1;
+}
+
+.motherOrBabyIconDiv {
   display: flex;
   align-items: center;
 }
diff --git a/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx b/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
index d7b87084a..1e5d60416 100644
--- a/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
+++ b/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
@@ -32,6 +32,18 @@ const WardPatientCard: WardPatientCard = (wardPatient) => {
         ))}
         <ExtensionSlot name={headerExtensionSlotName} state={wardPatient} />
       </div>
+      {footerRowElements.length > 0 && (
+        <div className={styles.wardPatientCardRow}>
+          {footerRowElements.map((elementId, i) => (
+            <WardPatientCardElement
+              key={`ward-card-${patient.uuid}-footer-${i}`}
+              elementId={elementId}
+              {...wardPatient}
+            />
+          ))}
+          <ExtensionSlot name={footerExtensionSlotName} state={wardPatient} />
+        </div>
+      )}
       <ExtensionSlot
         name="ward-patient-card-pending-items-slot"
         state={wardPatient}
@@ -40,18 +52,8 @@ const WardPatientCard: WardPatientCard = (wardPatient) => {
       <ExtensionSlot
         name={rowsExtensionSlotName}
         state={wardPatient}
-        className={classNames(styles.wardPatientCardRow, styles.wardPatientCardExtensionSlot)}
+        className={classNames(styles.wardPatientCardExtensionSlot)}
       />
-      <div className={styles.wardPatientCardRow}>
-        {footerRowElements.map((elementId, i) => (
-          <WardPatientCardElement
-            key={`ward-card-${patient.uuid}-footer-${i}`}
-            elementId={elementId}
-            {...wardPatient}
-          />
-        ))}
-        <ExtensionSlot name={footerExtensionSlotName} state={wardPatient} />
-      </div>
       <button
         className={styles.wardPatientCardButton}
         onClick={() => {

From b3d1e4ab1d8a610b7a803002fc0ba6e7316e81fc Mon Sep 17 00:00:00 2001
From: chibongho <cbho@pih.org>
Date: Tue, 24 Sep 2024 22:05:18 -0400
Subject: [PATCH 07/12] =?UTF-8?q?(fix)=20-=20O3-4015=20-=20Ward=20App=20-?=
 =?UTF-8?q?=20patient=20should=20get=20unassigned=20from=20bed=20at=20old?=
 =?UTF-8?q?=20l=E2=80=A6=20(#1326)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* (fix) - O3-4015 - Ward App - patient get unassigned from bed at old location upon transfer to new location

* address PR comment
---
 .../admit-patient-form.test.tsx               |  7 ++---
 .../admit-patient-form.workspace.tsx          | 27 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.test.tsx b/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.test.tsx
index 48b2660ab..e2d4ab634 100644
--- a/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.test.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.test.tsx
@@ -322,7 +322,6 @@ describe('Testing AdmitPatientForm', () => {
   });
 
   it('should admit patient if no beds are configured', async () => {
-    const replacedProperty = jest.replaceProperty(mockWardPatientGroupDetails(), 'bedLayouts', []);
     // @ts-ignore - we only need these two keys for now
     mockedOpenmrsFetch.mockResolvedValue({
       ok: true,
@@ -335,7 +334,7 @@ describe('Testing AdmitPatientForm', () => {
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
     await user.click(admitButton);
-    expect(mockedOpenmrsFetch).toHaveBeenCalledTimes(1);
+    expect(mockedOpenmrsFetch).toHaveBeenCalledTimes(2);
     expect(mockedOpenmrsFetch).toHaveBeenCalledWith('/ws/rest/v1/encounter', {
       method: 'POST',
       headers: {
@@ -354,11 +353,13 @@ describe('Testing AdmitPatientForm', () => {
         ],
       },
     });
+    expect(mockedOpenmrsFetch).toHaveBeenCalledWith(`/ws/rest/v1/beds/1?patientUuid=${mockPatientAlice.uuid}`, {
+      method: 'DELETE',
+    });
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'success',
       subtitle: 'Patient admitted successfully to Inpatient Ward',
       title: 'Patient admitted successfully',
     });
-    replacedProperty.restore();
   });
 });
diff --git a/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx
index 5799d0bde..1f892fd25 100644
--- a/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx
@@ -1,18 +1,16 @@
+import { Button, ButtonSet, Column, Dropdown, DropdownSkeleton, Form, InlineNotification, Row } from '@carbon/react';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { showSnackbar, useAppContext, useFeatureFlag, useSession } from '@openmrs/esm-framework';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { z } from 'zod';
 import { Controller, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
 import { useTranslation } from 'react-i18next';
-import { Button, ButtonSet, Column, Dropdown, DropdownSkeleton, Form, InlineNotification, Row } from '@carbon/react';
-import { showSnackbar, useAppContext, useFeatureFlag, useSession } from '@openmrs/esm-framework';
-import { filterBeds } from '../../ward-view/ward-view.resource';
-import type { BedLayout, WardPatientGroupDetails } from '../../types';
-import { assignPatientToBed, createEncounter } from '../../ward.resource';
-import { useInpatientRequest } from '../../hooks/useInpatientRequest';
+import { z } from 'zod';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import useWardLocation from '../../hooks/useWardLocation';
-import type { AdmitPatientFormWorkspaceProps } from './types';
+import type { BedLayout, WardPatientGroupDetails } from '../../types';
+import { assignPatientToBed, createEncounter, removePatientFromBed } from '../../ward.resource';
 import styles from './admit-patient-form.scss';
+import type { AdmitPatientFormWorkspaceProps } from './types';
 
 const AdmitPatientFormWorkspace: React.FC<AdmitPatientFormWorkspaceProps> = ({
   patient,
@@ -25,11 +23,11 @@ const AdmitPatientFormWorkspace: React.FC<AdmitPatientFormWorkspaceProps> = ({
   const { location } = useWardLocation();
   const { currentProvider } = useSession();
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const { mutate: mutateInpatientRequest } = useInpatientRequest();
   const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
   const [showErrorNotifications, setShowErrorNotifications] = useState(false);
   const wardPatientGrouping = useAppContext<WardPatientGroupDetails>('ward-patients-group');
   const { isLoading, mutate: mutateAdmissionLocation } = wardPatientGrouping?.admissionLocationResponse ?? {};
+  const { mutate: mutateInpatientRequest } = wardPatientGrouping?.inpatientRequestResponse ?? {};
   const beds = isLoading ? [] : wardPatientGrouping?.bedLayouts ?? [];
   const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
   const getBedRepresentation = useCallback((bedLayout: BedLayout) => {
@@ -92,8 +90,15 @@ const AdmitPatientFormWorkspace: React.FC<AdmitPatientFormWorkspaceProps> = ({
             if (response.ok) {
               if (bedSelected) {
                 return assignPatientToBed(values.bedId, patient.uuid, response.data.uuid);
+              } else {
+                const bed = wardPatientGrouping.bedLayouts.find((bedLayout) =>
+                  bedLayout.patients.some((p) => p.uuid == patient.uuid),
+                );
+                if (bed) {
+                  return removePatientFromBed(bed.bedId, patient.uuid);
+                }
+                return response;
               }
-              return response;
             }
           },
           (err: Error) => {

From d58e208d8ad47ae7635731bb7eb5145c7c1b09e3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 26 Sep 2024 12:32:55 +0300
Subject: [PATCH 08/12] (chore) Update translations from Transifex (#1328)

Co-authored-by: OpenMRS Bot <infrastructure@openmrs.org>
---
 .../translations/fr.json                      |  12 +-
 .../esm-appointments-app/translations/fr.json | 114 +++---
 .../translations/fr.json                      |  22 +-
 .../translations/fr.json                      |  34 +-
 .../translations/fr.json                      |  50 +--
 .../translations/fr.json                      |  20 +-
 .../translations/fr.json                      | 326 +++++++++---------
 7 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/packages/esm-active-visits-app/translations/fr.json b/packages/esm-active-visits-app/translations/fr.json
index 5045bfda9..9ef6ed733 100644
--- a/packages/esm-active-visits-app/translations/fr.json
+++ b/packages/esm-active-visits-app/translations/fr.json
@@ -1,13 +1,13 @@
 {
   "activeVisits": "Visites actives",
-  "age": "Age",
+  "age": "Âge",
   "allEncounters": "Toutes les visites",
-  "checkFilters": "Check the filters above",
+  "checkFilters": "Verifier les filtres ci-dessus",
   "diagnoses": "Diagnostic",
   "dose": "Dose",
   "encounterType": "Type de visite",
   "endDate": "Date de fin",
-  "filterTable": "Filtre de recherche",
+  "filterTable": "Filtrer le tableau",
   "gender": "Genre",
   "idNumber": "Identifiant",
   "indication": "Indication",
@@ -24,13 +24,13 @@
   "orderDurationAndUnit": "Pour {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Durée illimitée",
   "patients": "Patients",
-  "provider": "Fournisseur",
-  "quantity": "Quantity",
+  "provider": "Prestataire",
+  "quantity": "Quantité",
   "refills": "Recharges",
   "tests": "Tests",
   "thereIsNoInformationToDisplayHere": "Il n'y pas d'information à présenter ici",
   "time": "Heure",
-  "totalVisits": "Consultation total du jour",
+  "totalVisits": "Consultation Total du Jour",
   "visitStartTime": "Heure de la consultation",
   "visitSummary": "Compte rendu de la consultation",
   "visitType": "Type de consultation"
diff --git a/packages/esm-appointments-app/translations/fr.json b/packages/esm-appointments-app/translations/fr.json
index 88b9821e1..466505034 100644
--- a/packages/esm-appointments-app/translations/fr.json
+++ b/packages/esm-appointments-app/translations/fr.json
@@ -18,7 +18,7 @@
   "appointmentEndError": "Erreur lors de la clôture du rendez-vous",
   "appointmentFormError": "Erreur lors de la planification du rendez-vous",
   "appointmentHistory": "Historique de Rendez-vous",
-  "appointmentMetrics": "Indicateurs de rendez-vous",
+  "appointmentMetrics": "Métriques de rendez-vous",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Écrire une note additionnelle",
   "appointmentNotePlaceholder": "Écrire une note additionnelle ici",
@@ -27,12 +27,12 @@
   "appointments": "Rendez-vous",
   "Appointments": "Rendez-vous",
   "appointments_lower": "rendez-vous",
-  "appointmentsCalendar": "Appointments calendar",
-  "appointmentScheduled": "Rendez-vous planifié",
+  "appointmentsCalendar": "Calendrier des rendez-vous",
+  "appointmentScheduled": "Rendez-vous programmé",
   "appointmentService": "Service du rendez-vous",
   "appointmentServiceCreate": "Service du rendez-vous créé avec succès",
   "appointmentServiceName": "Nom du service du rendez-vous",
-  "appointmentsScheduledForToday": "rendez-vous planifiés aujourd’hui",
+  "appointmentsScheduledForToday": "rendez-vous programmés pour aujourd'hui",
   "appointmentsTable": "Tableau des rendez-vous",
   "appointmentStatus": "Statut du rendez-vous",
   "appointmentToFulfill": "Sélectionner le rendez-vous à compléter",
@@ -45,36 +45,36 @@
   "cancelAppointment": "Annuler le rendez-vous",
   "cancelAppointmentModalConfirmationText": "Voulez-vous vraiment annuler ce rendez-vous?",
   "cancelled": "Annulé",
-  "checkedIn": "Arrivé(e)",
-  "checkedOut": "Parti(e)",
-  "checkFilters": "Check the filters above",
-  "checkIn": "Check In",
-  "checkOut": "Check out",
-  "chooseAppointmentType": "Choose appointment type",
-  "chooseLocation": "Choose a location",
-  "chooseProvider": "Choose a provider",
-  "chooseService": "Select service",
+  "checkedIn": "Enregistré",
+  "checkedOut": "Sorti",
+  "checkFilters": "Vérifiez les filtres ci-dessus",
+  "checkIn": "Enregistrer",
+  "checkOut": "Sortie",
+  "chooseAppointmentType": "Choisir un type de rendez-vous",
+  "chooseLocation": "Choisir un emplacement",
+  "chooseProvider": "Choisir un prestataire",
+  "chooseService": "Sélectionner un service",
   "completed": "Complété",
   "Contact": "Contact {{index}}",
-  "countMore_one": "{{count}} more",
-  "countMore_other": "{{count}} more",
+  "countMore_one": "{{count}} de plus",
+  "countMore_other": "{{count}} de plus",
   "createAppointmentService": "Create appointment services",
   "createNewAppointment": "Créer un nouveau rendez-vous",
   "date": "Date",
-  "date&Time": "Date & time",
+  "date&Time": "Date et heure",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
-  "dateOfBirth": "Date of birth",
+  "dateOfBirth": "Date de naissance",
   "dateScheduled": "Date appointment issued",
   "dateScheduledDetail": "Date appointment issued",
-  "dateTime": "Date & Time",
-  "day": "Day",
-  "daysOfWeek": "Days of the week",
+  "dateTime": "Date et heure",
+  "day": "Jour",
+  "daysOfWeek": "Jours de la semaine",
   "discard": "Abandonner",
-  "download": "Download",
+  "download": "Télécharger",
   "durationErrorMessage": "Duration should be greater than zero",
-  "durationInMinutes": "Duration (minutes)",
+  "durationInMinutes": "Durée (minutes)",
   "durationMins": "Durée min",
-  "edit": "Edit",
+  "edit": "Modifier",
   "editAppointment": "Modifier le rendez-vous",
   "editAppointments": "Modifier le rendez-vous",
   "emptyStateText": "Pas de <1>{{displayText}}</1> à afficher",
@@ -83,33 +83,33 @@
   "endAppointmentAndVisitConfirmationMessage": "Checking the patient out will mark the appointment as complete, and close out the active visit for this patient.",
   "endAppointmentConfirmation": "Are you sure you want to check the patient out for this appointment?",
   "endAppointmentConfirmationMessage": "Checking the patient out will mark the appointment as complete.",
-  "endDate": "End date",
+  "endDate": "Date de fin",
   "endTime": "Heure de fin",
   "errorCreatingAppointmentService": "Error creating appointment service",
-  "expected": "Attendus",
-  "filterTable": "Filter table",
+  "expected": "Prévus:",
+  "filterTable": "Filtrer le tableau",
   "gender": "Genre",
   "highestServiceVolume": "Service le plus utilisé: {{time}}",
   "identifier": "Identifiant",
-  "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
-  "isRecurringAppointment": "Is this a recurring appointment?",
+  "invalidNumber": "Le numéro n'est pas valide",
+  "invalidTime": "Heure non valide",
+  "isRecurringAppointment": "S'agit-il d'un rendez-vous récurrent?",
   "itemsPerPage": "Eléments par page",
   "loading": "En cours de chargement",
   "location": "Emplacement",
   "medications": "Médicaments",
   "missed": "Manqué",
-  "next": "Next",
-  "nextMonth": "Next month",
+  "next": "Suivant",
+  "nextMonth": "Le mois suivant",
   "nextPage": "Page suivante",
   "no": "Non",
-  "noAppointmentsToDisplay": "No appointments to display",
-  "noContent": "No Content",
+  "noAppointmentsToDisplay": "Pas de rendez-vous prévus à afficher",
+  "noContent": "Pas de Contenu",
   "noCurrentAppointments": "Il n'y a pas de rendez-vous à afficher aujourd'hui pour ce patient",
   "noEncountersFound": "Aucune rencontre trouvée",
   "noPastAppointments": "Il n'y a pas de rendez-vous passé à afficher pour ce patient",
   "noPreviousVisitFound": "Aucune visite précédente trouvée",
-  "notArrived": "Non arrivé(s)",
+  "notArrived": "Pas arrivé(s)",
   "note": "Note",
   "notes": "Notes",
   "noUpcomingAppointments": "Il n'y a pas de rendez-vous à venir à afficher pour ce patient",
@@ -121,28 +121,28 @@
   "patientName": "Nom du patient",
   "patients": "Patients",
   "period": "Period",
-  "prev": "Prev",
-  "previousMonth": "Previous month",
+  "prev": "Préc",
+  "previousMonth": "Mois précédent",
   "previousPage": "Page précédente",
-  "provider": "Fournisseur",
-  "providers": "Fournisseurs",
+  "provider": "Prestataire",
+  "providers": "Prestataires",
   "providersBooked": "Prestataires reservés: {{time}}",
-  "recurringAppointment": "Recurring Appointment",
-  "recurringAppointmentShouldHaveEndDate": "A recurring appointment should have an end date",
-  "repeatEvery": "Repeat every",
+  "recurringAppointment": "Rendez-vous Récurrent",
+  "recurringAppointmentShouldHaveEndDate": "Un rendez-vous récurrent doit avoir une date de fin",
+  "repeatEvery": "Répéter chaque",
   "save": "Sauvegarder",
-  "saveAndClose": "Save and close",
+  "saveAndClose": "Sauvegarder et fermer",
   "scheduled": "Agendé",
   "scheduledAppointments": "Rendez-vous planifiés",
-  "scheduledForToday": "Prévu pour aujourd'hui",
-  "selectALocation": "Select a location",
-  "selectAppointmentStatus": "Select status",
+  "scheduledForToday": "Programmé(s) Pour Aujourd'hui",
+  "selectALocation": "Sélectionner un emplacement",
+  "selectAppointmentStatus": "Sélectionner le statut",
   "selectAppointmentType": "Sélectionnez un type de rendez-vous",
   "selectLocation": "Sélectionnez un emplacement",
-  "selectOption": "Select an option",
-  "selectProvider": "Select a provider",
-  "selectService": "Select a service",
-  "selectServiceType": "Select service type",
+  "selectOption": "Sélectionner une option",
+  "selectProvider": "Sélectionnez un prestataire",
+  "selectService": "Sélectionner un service",
+  "selectServiceType": "Sélectionner un type de service",
   "service": "Service",
   "serviceName": "Nom du service",
   "serviceType": "Type de service",
@@ -150,17 +150,17 @@
   "startDate": "Date de début",
   "startTime": "Heure de début",
   "status": "Statut",
-  "time": "Time",
+  "time": "Heure",
   "today": "Aujourd'hui",
-  "todays": "Aujourd'hui",
+  "todays": "Aujourd'hui: ",
   "type": "Type",
-  "unscheduled": "Unscheduled",
+  "unscheduled": "Non programmé",
   "unscheduledAppointments": "Rendez-vous non-planifiés",
   "unscheduledAppointments_lower": "rendez-vous non-planifiés",
-  "upcoming": "Upcoming",
-  "upcomingAppointments": "Upcoming appointments",
+  "upcoming": "À venir",
+  "upcomingAppointments": "À venir rendez-vous",
   "view": "Vue",
-  "vitals": "Vitals",
-  "week": "Week",
-  "yes": "Yes"
+  "vitals": "Signes Vitaux",
+  "week": "Semaine",
+  "yes": "Oui"
 }
diff --git a/packages/esm-bed-management-app/translations/fr.json b/packages/esm-bed-management-app/translations/fr.json
index 0ca64a745..eba7c6fef 100644
--- a/packages/esm-bed-management-app/translations/fr.json
+++ b/packages/esm-bed-management-app/translations/fr.json
@@ -1,24 +1,24 @@
 {
   "actions": "Actions",
-  "addBed": "Ajouter lit",
+  "addBed": "Ajouter un lit",
   "addBedTag": "Create Bed Tag",
   "addBedtype": "Add Bed Type",
   "addBedType": "Create Bed type",
   "allocationStatus": "Allocated",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
+  "bedIdPlaceholder": "exemple : BMW-201",
   "bedLocation": "Emplacement",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
-  "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedManagement": "Gestion du lit",
+  "bedName": "Nom du lit",
+  "beds": "Lits",
+  "bedTag": "Nom de l'étiquette du lit",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedType": "Ajouter un type de lit",
   "bedTypePlaceholder": "",
-  "checkFilters": "Check the filters above",
+  "checkFilters": "Vérifiez les filtres ci-dessus",
   "chooseBedtype": "Choisir un type de lit",
   "chooseOccupiedStatus": "Choose occupied status",
-  "createNewBed": "Create a new bed",
+  "createNewBed": "Créer un nouveau lit",
   "description": "Description",
   "displayName": "Display Name",
   "displayNamePlaceholder": "",
@@ -32,7 +32,7 @@
   "formCreated": "Add bed Type",
   "formSaved": "Bed Type",
   "headerTitle": "",
-  "ids": "Id",
+  "ids": "Identifiant",
   "location": "Emplacements",
   "manageBeds": "Manage Beds",
   "name": "Nom",
@@ -44,7 +44,7 @@
   "required": "Requis",
   "save": "Enregistrer",
   "saveSuccessMessage": "was saved successfully.",
-  "selectBedLocation": "Select a bed location",
+  "selectBedLocation": "Sélectionner un emplacement de lit",
   "viewBeds": "Voir lits",
   "wardAllocation": "Ward Allocation",
   "yes": "Oui"
diff --git a/packages/esm-patient-list-management-app/translations/fr.json b/packages/esm-patient-list-management-app/translations/fr.json
index 558e9874f..2c6921868 100644
--- a/packages/esm-patient-list-management-app/translations/fr.json
+++ b/packages/esm-patient-list-management-app/translations/fr.json
@@ -5,17 +5,17 @@
   "allLists": "Toutes les listes",
   "backToListsPage": "Retour sur la page des listes",
   "cancel": "Annuler",
-  "checkFilters": "Check the filters above",
+  "checkFilters": "Vérifiez les filtres ci-dessus",
   "configureList": "Configurez votre liste de patients à l'aide des champs ci-dessous",
   "confirmDeletePatientList": "Are you sure you want to delete this patient list?",
   "created": "Created",
   "createdOn": "Créé le",
   "createList": "Créer une liste",
   "createNewPatientList": "Créer une nouvelle liste de patients",
-  "createPatientList": "Create patient list",
+  "createPatientList": "Créer une liste de patients",
   "deleted": "Supprimé",
   "deletedPatientList": "Liste des patients supprimés",
-  "deletePatientList": "Delete patient list",
+  "deletePatientList": "Supprimer la liste des patients",
   "editList": "Modifier la liste",
   "editNameDescription": "Modifier le Nom/ la Description",
   "editPatientListHeader": "Modifier la liste des patients",
@@ -47,7 +47,7 @@
   "newPatientListNameLabel": "Nom de la liste",
   "nextPage": "Page suivante",
   "noMatchingLists": "Aucun liste à afficher",
-  "noMatchingPatients": "No matching patients to display",
+  "noMatchingPatients": "Aucun patient correspondant à afficher",
   "noOfPatients": "No. of patients",
   "noPatientListFound": "Aucune liste de patients trouvée",
   "noPatientsInList": "Il n'y a pas de patient dans cette liste",
@@ -59,25 +59,25 @@
   "patientRemovedFromList": "Patient removed from list",
   "patients": "Patients",
   "previousPage": "Page précédente",
-  "problemCreatingList": "There was a problem creating the list",
-  "problemUpdatingList": "There was a problem updating the list",
-  "removeFromList": "Remove from list",
-  "removePatientFromListConfirmation": "Are you sure you want to remove {{patientName}} from this list?",
+  "problemCreatingList": "Problème lors de la création de la liste",
+  "problemUpdatingList": "Problème lors de la mise à jour de la liste",
+  "removeFromList": "Supprimer la liste",
+  "removePatientFromListConfirmation": "Êtes-vous sûr de vouloir retirer {{patientName}} de cette liste?",
   "searchForAListToAddThisPatientTo": "Rechercher une liste à laquelle ajouter ce patient.",
   "searchForList": "Rechercher une liste",
   "searchThisList": "Recherchez dans cette liste",
   "sex": "Sexe",
-  "starList": "Mettre en favori",
-  "starred": "favori",
-  "starredLists": "Listes de favoris",
-  "starringPatientListFailed": "Marquage des listes de patients comme favoris/non favoris échec du marquage",
+  "starList": "Étoile de la liste",
+  "starred": "étoilé",
+  "starredLists": "Listes etoilées",
+  "starringPatientListFailed": "Marquage des listes de patients étoilées / non étoilées a échoué",
   "startDate": "Date de début",
-  "submitting": "Submitting",
+  "submitting": "En cours de soumission",
   "successAddPatientToList": "Patient ajouté à la liste",
   "successfullyAdded": "Ajouté avec succès",
-  "systemDefined": "system-defined",
-  "systemLists": "Listes systemes",
-  "unstarList": "Enlever comme favori",
+  "systemDefined": "définie par le système",
+  "systemLists": "Listes du système",
+  "unstarList": "Enlever comme étoilée",
   "updated": "Updated",
-  "userDefined": "user-defined"
+  "userDefined": "définie par I'utilisateur"
 }
diff --git a/packages/esm-patient-registration-app/translations/fr.json b/packages/esm-patient-registration-app/translations/fr.json
index 18bb7314a..acf75badb 100644
--- a/packages/esm-patient-registration-app/translations/fr.json
+++ b/packages/esm-patient-registration-app/translations/fr.json
@@ -1,14 +1,14 @@
 {
-  "addRelationshipButtonText": "Ajouter un lien de parenté",
+  "addRelationshipButtonText": "Ajouter une relation",
   "addressHeader": "Adresse",
   "allFieldsRequiredText": "Tous les champs sont requis sauf si explicitement indiqués facultatifs",
-  "autoGeneratedPlaceholderText": "Auto-généré",
-  "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "autoGeneratedPlaceholderText": "Généré automatiquement",
+  "birthdayNotInTheFuture": "La date de naissance ne peut pas être dans le futur",
   "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
   "birthdayRequired": "La date de naissance est requise",
   "birthFieldLabelText": "Naissance",
   "cancel": "Annuler",
-  "causeOfDeathInputLabel": "Cause of death",
+  "causeOfDeathInputLabel": "Cause du décès",
   "closeOverlay": "Fermer la superposition",
   "codedPersonAttributeAnswerSetEmpty": "Le champ d'attribut de personne codé '{{codedPersonAttributeFieldId}}' a été défini avec un ensemble de concepts de réponse UUID '{{answerConceptSetUuid}}' qui n'a pas de réponses de concept.",
   "codedPersonAttributeAnswerSetInvalid": "Le champ d'attribut de personne codé '{{codedPersonAttributeFieldId}}' a été défini avec un UUID d'ensemble de concepts de réponse invalide '{{answerConceptSetUuid}}'.",
@@ -17,14 +17,14 @@
   "configureIdentifiers": "Configurer les identifiants",
   "confirmDiscardChangesBody": "Your unsaved changes will be lost if you proceed to discard the form",
   "confirmDiscardChangesTitle": "Are you sure you want to discard these changes?",
-  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
-  "contactSection": "Détails du contact",
-  "createNewPatient": "Create new patient",
-  "dateOfBirthLabelText": "Date of birth",
-  "deathCauseRequired": "Cause of death is required",
+  "confirmIdentifierDeletionText": "Voulez-vous vraiment supprimer cet identifiant?",
+  "contactSection": "Coordonnées du contact",
+  "createNewPatient": "Créer un nouveau patient",
+  "dateOfBirthLabelText": "Date de naissance",
+  "deathCauseRequired": "La date du décès est requise",
   "deathDateInFuture": "Death date cannot be in future",
-  "deathDateInputLabel": "Date of death",
-  "deathDateRequired": "Death date is required",
+  "deathDateInputLabel": "Date du décès",
+  "deathDateRequired": "La date du décès est requise",
   "deathdayInvalidDate": "Death date and time cannot be before the birthday",
   "deathdayIsRequired": "Death date is required when the patient is marked as deceased.",
   "deathdayNotInTheFuture": "",
@@ -33,11 +33,11 @@
   "deathTimeFormatRequired": "Time format is required",
   "deathTimeInvalid": "Time doesn't match the format 'hh:mm'",
   "deathTimeRequired": "Death time is required",
-  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalHeading": "Supprimer l'identifiant?",
   "deleteIdentifierModalText": " has a value of ",
   "deleteIdentifierTooltip": "Supprimer",
   "deleteRelationshipTooltipText": "Supprimer",
-  "demographicsSection": "Informations de base",
+  "demographicsSection": "Informations basiques",
   "discard": "Abandonner",
   "dobToggleLabelText": "Date de naissance connue?",
   "editIdentifierTooltip": "Éditer",
@@ -51,7 +51,7 @@
   "estimatedAgeInYearsLabelText": "Âge estimé en années",
   "familyNameLabelText": "Nom de famille",
   "familyNameRequired": "Le nom de famille est requis",
-  "female": "Femme",
+  "female": "Féminin",
   "fieldsWithErrors": "The following fields have errors: ",
   "fullNameLabelText": "Nom et prénom",
   "genderLabelText": "Sexe",
@@ -62,12 +62,12 @@
   "identifierValueRequired": "La valeur de l'identifiant est requise",
   "idFieldLabelText": "Identifiants",
   "IDInstructions": "Sélectionnez les identifiants que vous souhaitez ajouter pour ce patient:",
-  "invalidEmail": "Invalid email",
+  "invalidEmail": "Courriel non valide",
   "invalidInput": "Entrée invalide",
-  "isDeadInputLabel": "Is dead",
+  "isDeadInputLabel": "Est décédé(e)",
   "jumpTo": "Aller à",
-  "male": "Homme",
-  "middleNameLabelText": "Deuxième prénom",
+  "male": "Masculin",
+  "middleNameLabelText": "Deuxième Prénom",
   "negativeMonths": "Estimated months cannot be negative",
   "negativeYears": "Estimated years cannot be negative",
   "no": "Non",
@@ -78,10 +78,10 @@
   "obsFieldUnknownDatatype": "Le concept pour le champ d'observation '{{fieldDefinitionId}}' a un type de données inconnu '{{datatypeName}}'",
   "optional": "Optionnel",
   "other": "Autre",
-  "patientNameKnown": "Le nom du patient est connu?",
+  "patientNameKnown": "Le nom du patient est-il connu?",
   "patientRegistrationBreadcrumb": "Enregistrement du patient",
   "refreshOrContactAdmin": "Try refreshing the page or contact your system administrator",
-  "registerPatient": "Register patient",
+  "registerPatient": "Enregistrer un patient",
   "registerPatientSuccessSnackbarSubtitle": "Le patient peut maintenant être trouvé en le recherchant par son nom ou son numéro d'identification",
   "registerPatientSuccessSnackbarTitle": "Nouveau patient créé",
   "registrationErrorSnackbarTitle": "Échec de l'enregistrement du patient",
@@ -91,12 +91,12 @@
   "relationshipRemovedText": "Relation supprimée",
   "relationshipsSection": "Relations",
   "relationshipToPatient": "Relation avec le patient",
-  "relativeFullNameLabelText": "Full name",
-  "relativeNamePlaceholder": "Prénom Nom de famille",
-  "removeIdentifierButton": "Remove Identifier",
+  "relativeFullNameLabelText": "Nom complet",
+  "relativeNamePlaceholder": "Prénom et Nom de famille",
+  "removeIdentifierButton": "Supprimer l'identifiant",
   "resetIdentifierTooltip": "Réinitialiser",
   "restoreRelationshipActionButton": "Restaurer",
-  "searchAddress": "Rechercher une adresse",
+  "searchAddress": "Rechercher l'adresse",
   "searchIdentifierPlaceholder": "Rechercher un identifiant",
   "selectAnOption": "Sélectionner une option",
   "sexFieldLabelText": "Sexe",
@@ -107,7 +107,7 @@
   "unableToFetch": "Unable to fetch person attribute type - {{personattributetype}}",
   "unknown": "Inconnu",
   "unknownPatientAttributeType": "Le type d'attribut de patient a un format inconnu {{personAttributeTypeFormat}}",
-  "updatePatient": "Update patient",
+  "updatePatient": "Mettre à jour le patient",
   "updatePatientErrorSnackbarTitle": "Échec de la mise à jour des détails du patient",
   "updatePatientSuccessSnackbarSubtitle": "Les informations du patient ont été mises à jour avec succès",
   "updatePatientSuccessSnackbarTitle": "Détails du patient mis à jour",
diff --git a/packages/esm-patient-search-app/translations/fr.json b/packages/esm-patient-search-app/translations/fr.json
index bed440469..210588ccb 100644
--- a/packages/esm-patient-search-app/translations/fr.json
+++ b/packages/esm-patient-search-app/translations/fr.json
@@ -1,26 +1,26 @@
 {
-  "age": "Age",
+  "age": "Âge",
   "any": "N'importe quel",
   "apply": "Appliquer",
   "clear": "Effacer",
   "clearSearch": "Effacer",
   "closeSearch": "Close Search Panel",
   "countOfFiltersApplied": "Filtres appliqués",
-  "dayOfBirth": "Day of Birth",
+  "dayOfBirth": "Jour de Naissance",
   "error": "Erreur",
   "errorCopy": "Désolé, une erreur s'est produite. Vous pouvez tenter de rafraîchir la page, ou bien contacter l'administrateur du site et transmettre le message d'erreur ci-dessus.",
-  "female": "Femme",
+  "female": "Féminin",
   "filtersAppliedText": "Rechercher les requêtes ajoutées",
-  "male": "Homme",
-  "monthOfBirth": "Month of Birth",
+  "male": "Masculin",
+  "monthOfBirth": "Mois de Naissance",
   "nextPage": "Page suivante",
   "noPatientChartsFoundMessage": "Désolé, aucun dossier de patient n'a été trouvé",
   "other": "Autre",
   "phoneNumber": "Numéro de téléphone",
   "postcode": "Code postal",
   "previousPage": "Page précédente",
-  "recentSearchResultsCount_one": "{{count}} recent search result",
-  "recentSearchResultsCount_other": "{{count}} recent search results",
+  "recentSearchResultsCount_one": "{{count}} résultat de recherche récent",
+  "recentSearchResultsCount_other": "{{count}} résultats de recherche récents",
   "refineSearch": "Affiner la recherche",
   "refineSearchHeaderText": "Ajouter un critère de recherche supplémentaire",
   "refineSearchTabletBannerText": "Vous ne trouvez pas la personne recherchée?",
@@ -30,10 +30,10 @@
   "searchingText": "Recherche",
   "searchPatient": "Rechercher un patient",
   "searchResults": "Résultats de recherche",
-  "searchResultsCount_one": "{{count}} search result",
-  "searchResultsCount_other": "{{count}} search results",
+  "searchResultsCount_one": "{{count}} résultat de recherche",
+  "searchResultsCount_other": "{{count}} résultats de recherche",
   "sex": "Sexe",
   "trySearchWithPatientUniqueID": "Essayez de chercher par l'identifiant unique du patient",
   "unknown": "Inconnu",
-  "yearOfBirth": "Year of Birth"
+  "yearOfBirth": "Année de Naissance"
 }
diff --git a/packages/esm-service-queues-app/translations/fr.json b/packages/esm-service-queues-app/translations/fr.json
index 712e74f7d..5e11f053b 100644
--- a/packages/esm-service-queues-app/translations/fr.json
+++ b/packages/esm-service-queues-app/translations/fr.json
@@ -1,49 +1,49 @@
 {
   "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",
-  "addNewQueueServiceRoom": "Add new queue service room",
+  "activeVisits": "Visites Actives",
+  "activeVisitsNotInQueue": "Visites actives non dans la file d'attente",
+  "addAProviderQueueRoom": "Ajouter une salle d'attente pour les prestataires des service?",
+  "addEntry": "Ajouter une entrée",
+  "addisitToQueueTooltip": "Ajouter",
+  "addNewQueueService": "Ajouter un nouveau service de file d'attente",
+  "addNewQueueServiceRoom": "Ajouter une nouvelle salle de service de file d'attente",
   "addNewService": "Ajouter un nouveau service",
-  "addNewServiceRoom": "Add new service room",
+  "addNewServiceRoom": "Ajouter une nouvelle salle de service",
   "addPatientToQueue": "Ajouter un patient à la file d'attente",
-  "addProviderQueueRoom": "Add provider queue room",
+  "addProviderQueueRoom": "Ajouter une salle d'attente pour les prestataires des service",
   "addQueue": "Ajouter une file d'attente",
-  "addQueueName": "Please add a queue name",
+  "addQueueName": "Veuillez ajouter un nom de file d'attente",
   "addQueueRoom": "Ajouter une salle d'attente",
-  "addQueueRoomName": "Please add a queue room name",
-  "addQueueRoomService": "Please add a queue room service",
-  "addRoom": "Add room",
-  "addToQueue": "Add to queue",
+  "addQueueRoomName": "Veuillez ajouter un nom de salle de file d'attente",
+  "addQueueRoomService": "Veuillez ajouter un service de salle de file d'attente",
+  "addRoom": "Ajouter une salle",
+  "addToQueue": "Ajouter à la file d'attente",
   "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
-  "age": "Age",
+  "advancedSearch": "Recherche avancée",
+  "age": "Âge",
   "alistOfClients": "Liste de patients attendus",
   "all": "Tout",
-  "and": "And",
+  "and": "Et",
   "anotherVisitType": "Commencer un autre type de visite",
-  "any": "Any",
-  "applyFilters": "Apply filters",
-  "averageWaitTime": "Temps d'attente moyen du jour",
-  "backToScheduledVisits": "Back to scheduled visits",
-  "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
-  "between": "Between",
-  "bmi": "Bmi",
-  "bp": "Bp",
-  "call": "Call",
+  "any": "N'importe quel",
+  "applyFilters": "Appliquer les filtres",
+  "averageWaitTime": "Temps moyen d'attente du jour",
+  "backToScheduledVisits": "Retour aux visites programmées",
+  "backToSearchResults": "Retour aux résultats de recherche",
+  "backToSimpleSearch": "Retour à la recherche simple",
+  "between": "Entre",
+  "bmi": "IMC",
+  "bp": "TA",
+  "call": "Appeler",
   "cancel": "Annuler",
   "checkedInPatients": "Patients arrivés",
-  "checkFilters": "Check the filters above",
-  "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
-  "clearAllQueueEntries": "Clear all queue entries?",
-  "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
-  "clearQueue": "Clear queue",
-  "clinicMetrics": "Indicateurs cliniques",
+  "checkFilters": "Vérifiez les filtres ci-dessus",
+  "chooseRoom": "Selectionner une salle",
+  "chooseService": "Sélectionner un service",
+  "clearAllQueueEntries": "Effacer toutes les entrées de la file d'attente ?",
+  "clearAllQueueEntriesWarningMessage": "L'effacement de toutes les entrées de la file d'attente supprimera tous les patients de la file d'attente.",
+  "clearQueue": "Effacer la file d'attente",
+  "clinicMetrics": "Parametres de I'Etablissement de soins",
   "configurePriorities": "Please configure priorities to continue.",
   "configureServices": "Please configure services to continue.",
   "configureStatus": "Please configure status to continue.",
@@ -51,25 +51,25 @@
   "confirmMoveBackQueueAndStatus": "Are you sure you want to move patient back to queue \"{{queue}}\" with status \"{{status}}\"?",
   "confirmMoveBackStatus": "Are you sure you want to move patient back to status \"{{status}}\"?",
   "confirmRemovePatientFromQueue": "Are you sure you want to remove this patient from this queue?",
-  "currentValueFormatted": "{{value}} (Current)",
-  "currentVisit": "Current visit",
+  "currentValueFormatted": "{{value}} (Actuel)",
+  "currentVisit": "Visite en cours",
   "date": "Date",
-  "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
-  "delete": "Delete",
-  "deleteQueueEntry": "Delete queue entry",
-  "discard": "Discard",
+  "date&Time": "Date et heure",
+  "dateAndTimeOfVisit": "Date et heure de la visite",
+  "dateOfBirth": "Date de naissance",
+  "delete": "Supprimer",
+  "deleteQueueEntry": "Supprimer l'entrée dans la file d'attente.",
+  "discard": "Abandonner",
   "dose": "Dose",
-  "edit": "Edit",
-  "editPatientDetails": "Edit patient details",
-  "editQueueEntry": "Edit queue entry",
+  "edit": "Modifier",
+  "editPatientDetails": "Modifier les détails du patient",
+  "editQueueEntry": "Modifier l'entrée dans la file d'attente.",
   "editQueueEntryInstruction": "Edit fields of existing queue entry",
-  "encounterType": "Encounter type",
-  "endAgeRangeInvalid": "End age range is not valid",
-  "endDate": "End date",
-  "endVisit": "End Visit",
-  "endVisitWarningMessage": "Ending this visit will remove this patient from the queue and will not allow you to fill another encounter form for this patient",
+  "encounterType": "Type de Rencontre",
+  "endAgeRangeInvalid": "La fin de la tranche d'âge n'est pas valide",
+  "endDate": "Date de fin",
+  "endVisit": "Fin de la visite",
+  "endVisitWarningMessage": "Ending this visit will not allow you to fill another encounter form for this patient",
   "enterCommentHere": "Enter Comment here",
   "errorAddingQueue": "Erreur lors de l'ajout de la file d'attente",
   "errorAddingQueueRoom": "Error adding queue room",
@@ -77,70 +77,70 @@
   "errorFetchingAppointments": "Error fetching appointments",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
+  "facility": "Facilité",
   "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
-  "femaleLabelText": "Female",
-  "fields": "of the following fields",
-  "filter": "Filter (1)",
-  "filterByService": "Filter by service :",
-  "filterByStatus": "Filter by status :",
+  "female": "Féminin",
+  "femaleLabelText": "Féminin",
+  "fields": "des champs suivants",
+  "filter": "Filtre",
+  "filterByService": "Filtrer par service :",
+  "filterByStatus": "Filtrer par statut",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
+  "firstName": "Prénom",
+  "firstNameSort": "Prénom (a-z)",
   "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
   "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
-  "gender": "Gender",
-  "heartRate": "Heart rate",
-  "height": "Height",
+  "gender": "Genre",
+  "heartRate": "Fréquence cardiaque",
+  "height": "Hauteur",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
   "idNumber": "ID Number",
   "indication": "Indication",
-  "invalidQueue": "Invalid Queue",
+  "invalidQueue": "File d'attente non valide",
   "invalidtableConfig": "Invalid table configuration",
-  "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last visit",
+  "lastEncounter": "Dernière rencontre",
+  "lastName": "Nom de famille",
+  "lastNameSort": "Nom de famille (a-z)",
+  "lastVisit": "Dernière visite",
   "lastVisitDate": "Date",
-  "loading": "Loading...",
-  "location": "Location",
-  "male": "Male",
-  "maleLabelText": "Male",
+  "loading": "Chargement...",
+  "location": "Emplacement",
+  "male": "Masculin",
+  "maleLabelText": "Masculin",
   "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
+  "middleName": "Deuxième prénom",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
-  "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
+  "missingLocation": "L'emplacement est manquant",
+  "missingPriority": "Veuillez sélectionner une priorité",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
-  "missingService": "Missing service",
+  "missingService": "Service manquant",
   "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Déplacer le patient vers le service suivant?",
   "moveToNextService": "Déplacer vers le service suivant",
-  "name": "Name",
+  "name": "Nom",
   "nextPage": "Page suivante",
   "noActiveVisitsForLocation": "Il n'y a pas de visite en cours pour cet emplacement",
-  "noAppointmentsFound": "No appointments found",
+  "noAppointmentsFound": "Aucun rendez-vous trouvé",
   "noColumnsDefined": "No table columns defined. Check Configuration",
-  "noEncountersFound": "No encounters found",
-  "noLastEncounter": "There is no last encounter to display for this patient",
+  "noEncountersFound": "Aucune rencontre trouvée",
+  "noLastEncounter": "Il n'y a pas de dernier rendez-vous à afficher pour ce patient",
   "noLocationsAvailable": "Aucun emplacement disponible",
-  "noMedicationsFound": "No medications found",
-  "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
-  "noPatientsToDisplay": "No patients to display",
+  "noMedicationsFound": "Aucun médicament trouvé",
+  "noNotesFound": "Aucune note trouvée",
+  "noPatientFoundMessage": "Désolé, aucun patient n'a été trouvé",
+  "noPatientsToDisplay": "Aucun patient affiché",
   "noPreviousVisitFound": "Aucune visite précédente trouvée",
-  "noPrioritiesConfigured": "No priorities configured",
+  "noPrioritiesConfigured": "Aucune priorité n'est configurée",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
+  "noResultsFound": "Aucun résultat trouvé",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
@@ -149,42 +149,42 @@
   "notes": "Notes",
   "noVisitsNotInQueueFound": "No visits currently not in queue found",
   "noVisitTypesMatchingSearch": "Il n'y a pas de visite correspondante à cette recherche",
-  "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
-  "onTime": "On time",
-  "or": "Or",
-  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
-  "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
-  "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
+  "noVitalsFound": "Aucune donnée vitale n'a été trouvée",
+  "oldest": "Le plus ancien en premier",
+  "onTime": "À temps",
+  "or": "ou",
+  "orderDurationAndUnit": "Pour {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Durée indéfinie",
+  "orInProperFormat": "Ou",
+  "orPatientName": "OU le nom(s) du patient",
+  "patientAge": "Âge",
+  "patientAlreadyInQueue": "Patient déjà dans la file d'attente",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
+  "patientHasActiveVisit": "Le patient a déjà une visite active",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
-  "patientList": "Patient list",
-  "patientName": "Patient name",
-  "patientNotInQueue": "The patient is not in the queue",
-  "patientRemoved": "Patient removed",
+  "patientList": "Liste de patients",
+  "patientName": "Nom du patient",
+  "patientNotInQueue": "Le patient n'est pas dans la file d'attente",
+  "patientRemoved": "Patient enlevé",
   "patientRemovedFailed": "Error removing patient from queue",
   "patientRemovedSuccessfully": "Paient removed from queue successfully",
   "patientRequeued": "Patient has been requeued",
-  "patients": "Patients",
+  "patients": "Les patients",
   "patientsCurrentlyInQueue": "Patients actuellement en file d'attente",
-  "personalDetails": "Personal details",
-  "phoneNumber": "Phone Number",
+  "personalDetails": "Détails personnels",
+  "phoneNumber": "Numéro de téléphone",
   "pleaseSelectLocation": "Veuillez sélectionner un emplacement",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
+  "pleaseSelectService": "Veuillez sélectionner un service",
+  "postCode": "Code postal",
   "previousPage": "Page précédente",
   "previousVisit": "Visite précédente",
-  "primaryHelperText": "Search for a patient",
-  "priority": "Priority",
-  "priorityComment": "Priority comment",
-  "priorityIsRequired": "Priority is required",
-  "program": "Program",
-  "provider": "Provider",
-  "quantity": "Quantity",
+  "primaryHelperText": "Recherche d'un patient",
+  "priority": "Priorité",
+  "priorityComment": "Commentaire sur la priorité",
+  "priorityIsRequired": "La priorité est requise",
+  "program": "Programme",
+  "provider": "Prestataire",
+  "quantity": "Quantité",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
   "queueEntryAddFailed": "Error adding queue entry status",
@@ -202,19 +202,19 @@
   "queueEntryTransitionFailed": "Error transitioning queue entry",
   "queueEntryTransitionUndoFailed": "Error undoing transition",
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
-  "queueEntryUpdateFailed": "Error updating queue entry",
-  "queueEntryUpdateSuccessfully": "Queue Entry Updated Successfully",
-  "queueLocation": "Queue location",
-  "queueLocationRequired": "Queue location is required",
+  "queueEntryUpdateFailed": "Erreur lors de la mise à jour du statut de l'entrée dans la file d'attente",
+  "queueEntryUpdateSuccessfully": "Entrée de la file d'attente mise à jour avec succès",
+  "queueLocation": "Emplacement de la file d'attente",
+  "queueLocationRequired": "Emplacement de la file d'attente est requis",
   "queueName": "Nom de la file d'attente",
   "queuePriority": "Priorité dans la file d'attente",
-  "queueRoom": "Queue room",
-  "queueRoomAddedSuccessfully": "Queue room added successfully",
-  "queueRoomAddFailed": "Error adding queue room",
-  "queueRoomName": "Queue room name",
-  "queueRoomUpdatedSuccessfully": "Queue room updated successfully",
-  "queuesClearedSuccessfully": "Queues cleared successfully",
-  "queueScreen": "Queue screen",
+  "queueRoom": "Salle d'attente",
+  "queueRoomAddedSuccessfully": "Salle de file d'attente ajoutée avec succès",
+  "queueRoomAddFailed": "Erreur lors de l'ajout d'une salle d'attente",
+  "queueRoomName": "Nom de la salle d'attente",
+  "queueRoomUpdatedSuccessfully": "Salle de file d'attente mise à jour avec succès.",
+  "queuesClearedSuccessfully": "Files d'attente vidées avec succès",
+  "queueScreen": "Ecran de file d'attente",
   "queueService": "Service d'attente",
   "queueStatus": "Statut de la file d'attente",
   "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
@@ -222,87 +222,87 @@
   "recommended": "Recommandée",
   "refills": "Recharges",
   "removeFromQueueAndEndVisit": "Retirer le patient de la file d'attente et mettre fin à la visite active",
-  "removePatient": "Remove patient",
-  "removePatientFromQueue": "Remove patient from queue",
+  "removePatient": "Retirer le patient",
+  "removePatientFromQueue": "Retirer un patient de la file d'attente",
   "removeQueueEntryError": "Erreur lors de la suppression d'une entrée dans la file d'attente",
   "requeue": "Requeue",
-  "retainLocation": "Retain location",
+  "retainLocation": "Conserver l'emplacement",
   "returnDate": "Date de retour",
-  "room": "Room",
-  "rRate": "R. Rate",
+  "room": "Chambre",
+  "rRate": "Fréquence Respiratoire",
   "save": "Sauvegarder",
   "scheduledAppointmentsList": "Liste des patients avec un rendez-vous planifié",
-  "scheduledToday": "Prévu pour aujourd'hui",
+  "scheduledToday": "Programmé(s) pour aujourd'hui",
   "search": "Recherche",
   "searchboxPlaceholder": "Rechercher un nom ou un numéro d'identification de patient",
-  "searchForAVisitType": "Search for a visit type",
+  "searchForAVisitType": "Recherche d'un type de visite",
   "searchForPatient": "Recherche d'un patient",
-  "searchPatient": "Search Patient",
+  "searchPatient": "Rechercher un patient",
   "searchThisList": "Rechercher dans cette liste",
   "secondaryHelperText": "Tapez le nom ou le numéro d'identification unique du patient.",
-  "selectALocation": "Select a location",
+  "selectALocation": "Sélectionnez un emplacement",
   "selectAVisitType": "Sélectionnez le type de visite",
-  "selectFacility": "Select a facility",
+  "selectFacility": "Sélectionner un établissement",
   "selectOption": "Sélectionner une option",
-  "selectProgramType": "Select program type",
-  "selectQueue": "Select a queue",
+  "selectProgramType": "Sélectionner le type de programme",
+  "selectQueue": "Sélectionner une file d'attente",
   "selectQueueLocation": "Sélectionnez un emplacement de file d'attente",
-  "selectQueueService": "Select a queue service",
-  "selectRoom": "Select a room",
+  "selectQueueService": "Sélectionner un service de file d'attente",
+  "selectRoom": "Selectionner une salle",
   "selectService": "Sélectionner un service",
   "selectServiceType": "Sélectionner un type de service",
-  "selectVisitType": "Please select a Visit Type",
-  "serve": "Serve",
-  "servePatient": "Serve patient",
+  "selectVisitType": "Veuillez sélectionner un type de visite",
+  "serve": "Servir",
+  "servePatient": "Servir le patient",
   "service": "Service",
-  "serviceIsRequired": "Service is required",
+  "serviceIsRequired": "Le service est requis",
   "serviceQueue": "File d'attente",
   "serviceQueues": "Files d'attente",
   "sex": "Sexe",
   "sortBy": "Trier par",
-  "sortWeight": "Sort weight",
+  "sortWeight": "Trier le poids",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "La tranche d'âge de départ n'est pas valide",
   "startAVisit": "Commencer une visite",
   "startVisit": "Commencer une visite",
   "startVisitError": "Erreur lors du démarrage de la visite",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
+  "startVisitQueueSuccessfully": "Le patient a été ajouté à la liste des visites actives et à la file d'attente.",
   "status": "Statut",
-  "statusIsRequired": "Status is required",
-  "submitting": "Submitting...",
-  "success": "Success",
+  "statusIsRequired": "Le statut est requis",
+  "submitting": "Envoi en cours...",
+  "success": "Succès",
   "temperature": "Température",
-  "ticketNumber": "Ticket Number",
+  "ticketNumber": "Numéro de Ticket",
   "time": "Temps",
   "timeCannotBeInFuture": "Time cannot be in the future",
   "timeCannotBePriorToPreviousQueueEntry": "L’heure ne peut être antérieure au début de la file d’attente précédente: {{time}}",
   "timeOfTransition": "Time of transition",
   "tirageNotYetCompleted": "Le triage n'est pas encore terminé",
   "today": "Aujourd'hui",
-  "totalPatients": "Total Patients",
+  "totalPatients": "Nombre total de patients",
   "transition": "Transition",
   "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
-  "triageForm": "Triage form",
-  "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
+  "triageForm": "Formulaire de triage",
+  "triageNote": "Note de triage",
+  "trySearchWithPatientUniqueID": "Essayez de faire une recherche avec le numéro d'identification unique du patient.",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
-  "unknown": "Unknown",
-  "updateEntry": "Update entry",
+  "unknown": "Inconnue",
+  "updateEntry": "Mettre à jour l'entrée",
   "updateRoom": "Update room",
-  "useTodaysDate": "Use today's date",
+  "useTodaysDate": "Utiliser la date d'aujourd'hui",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
+  "visitStartTime": "Heure de la consultation",
   "visitTabs": "Visit tabs",
-  "visitType": "Visit Type",
-  "vitals": "Vitals",
-  "vitalsForm": "Vitals form",
-  "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
-  "waitingFor": "En attente",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "visitType": "Type de Consultation",
+  "vitals": "Signes Vitaux",
+  "vitalsForm": "Formulaire de signes vitaux",
+  "vitalsNotRecordedForVisit": "Les constantes pas encore enregistrées pour ce patient à cette visite",
+  "waitingFor": "En attente de",
+  "weight": "Poids",
+  "years": "Années",
+  "youngest": "Le plus jeune en premier"
 }

From 70be1105f992938f2d65456e1b488783b4b60f3d Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Thu, 26 Sep 2024 21:41:51 +0300
Subject: [PATCH 09/12] (fix) Show discard changes confirmation modal when
 fields get touched (#1323)

This PR tweaks the logic for showing the discard changes confirmation modal in the patient registration form. Previously, the modal was being shown in cases where the user had not made any changes. Now, the modal will only be shown when the user has made changes and attempts to navigate away from the form. This is done by checking whether any of the form fields have been [touched](https://formik.org/docs/api/formik#touched--field-string-boolean-). This aligns with the expected behavior of the form and provides a better user experience.

Also, this PR refactors the `DeleteIdentifierConfirmationModal` to leverage Carbon's ModalHeader, ModalBody, and ModalFooter components. It also refactors its registration in the `routes.json` file so it leverages the `modal` property of the route definition. This aligns with our best practices for registering modals.
---
 .../field/dob/dob.component.tsx               | 24 +++++++++---
 .../field/gender/gender-field.component.tsx   |  3 +-
 .../field/gender/gender-field.test.tsx        |  1 +
 .../field/name/name-field.component.tsx       |  6 ++-
 .../patient-registration.component.tsx        |  2 +-
 .../src/routes.json                           | 10 ++---
 .../delete-identifier-confirmation.modal.tsx  | 37 +++++++++++--------
 .../delete-identifier-confirmation.scss       | 34 -----------------
 .../delete-identifier-confirmation.test.tsx   |  3 +-
 .../translations/en.json                      |  2 +-
 10 files changed, 57 insertions(+), 65 deletions(-)
 delete mode 100644 packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.scss

diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx
index 7b1500bf2..6599103ec 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx
@@ -30,7 +30,7 @@ export const DobField: React.FC = () => {
   const [birthdate, birthdateMeta] = useField('birthdate');
   const [yearsEstimated, yearsEstimateMeta] = useField('yearsEstimated');
   const [monthsEstimated, monthsEstimateMeta] = useField('monthsEstimated');
-  const { setFieldValue } = useContext(PatientRegistrationContext);
+  const { setFieldValue, setFieldTouched } = useContext(PatientRegistrationContext);
   const today = new Date();
 
   const onToggle = useCallback(
@@ -39,6 +39,7 @@ export const DobField: React.FC = () => {
       setFieldValue('birthdate', '');
       setFieldValue('yearsEstimated', 0);
       setFieldValue('monthsEstimated', '');
+      setFieldTouched('birthdateEstimated', true, false);
     },
     [setFieldValue],
   );
@@ -46,8 +47,9 @@ export const DobField: React.FC = () => {
   const onDateChange = useCallback(
     (birthdate: Date) => {
       setFieldValue('birthdate', birthdate);
+      setFieldTouched('birthdate', true, false);
     },
-    [setFieldValue],
+    [setFieldValue, setFieldTouched],
   );
 
   const onEstimatedYearsChange = useCallback(
@@ -80,7 +82,10 @@ export const DobField: React.FC = () => {
     setFieldValue('yearsEstimated', years);
     setFieldValue('monthsEstimated', months > 0 ? months : '');
     setFieldValue('birthdate', calcBirthdate(years, months, dateOfBirth));
-  }, [setFieldValue, monthsEstimateMeta, yearsEstimateMeta, dateOfBirth]);
+    setFieldTouched('yearsEstimated', true, false);
+    setFieldTouched('monthsEstimated', true, false);
+    setFieldTouched('birthdate', true, false);
+  }, [setFieldValue, setFieldTouched, monthsEstimateMeta, yearsEstimateMeta, dateOfBirth]);
 
   return (
     <div className={styles.halfWidthInDesktopView}>
@@ -103,6 +108,7 @@ export const DobField: React.FC = () => {
               id="birthdate"
               {...birthdate}
               onChange={onDateChange}
+              onBlur={() => setFieldTouched('birthdate', true, false)}
               maxDate={today}
               labelText={t('dateOfBirthLabelText', 'Date of birth')}
               isInvalid={!!(birthdateMeta.touched && birthdateMeta.error)}
@@ -125,7 +131,11 @@ export const DobField: React.FC = () => {
                 min={0}
                 required
                 {...yearsEstimated}
-                onBlur={updateBirthdate}
+                onBlur={(e) => {
+                  yearsEstimated.onBlur(e);
+                  setFieldTouched('yearsEstimated', true, false);
+                  updateBirthdate();
+                }}
               />
             </div>
             <div className={styles.dobField}>
@@ -141,7 +151,11 @@ export const DobField: React.FC = () => {
                 min={0}
                 {...monthsEstimated}
                 required={!yearsEstimateMeta.value}
-                onBlur={updateBirthdate}
+                onBlur={(e) => {
+                  monthsEstimated.onBlur(e);
+                  setFieldTouched('monthsEstimated', true, false);
+                  updateBirthdate();
+                }}
               />
             </div>
           </div>
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx
index 9052b0574..75fa4663a 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx
@@ -11,11 +11,12 @@ export const GenderField: React.FC = () => {
   const { fieldConfigurations } = useConfig<RegistrationConfig>();
   const { t } = useTranslation();
   const [field, meta] = useField('gender');
-  const { setFieldValue } = useContext(PatientRegistrationContext);
+  const { setFieldValue, setFieldTouched } = useContext(PatientRegistrationContext);
   const fieldConfigs = fieldConfigurations?.gender;
 
   const setGender = (gender: string) => {
     setFieldValue('gender', gender);
+    setFieldTouched('gender', true, false);
   };
   /**
    * DO NOT REMOVE THIS COMMENT HERE, ADDS TRANSLATION FOR SEX OPTIONS
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.test.tsx
index a83591b60..92fbf407a 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.test.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.test.tsx
@@ -12,6 +12,7 @@ jest.mock('react', () => ({
   ...(jest.requireActual('react') as any),
   useContext: jest.fn(() => ({
     setFieldValue: jest.fn(),
+    setFieldTouched: jest.fn(),
   })),
 }));
 
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
index 4095e4440..f2b4e2147 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
@@ -21,7 +21,7 @@ function checkNumber(value: string) {
 
 export const NameField = () => {
   const { t } = useTranslation();
-  const { setCapturePhotoProps, currentPhoto, setFieldValue } = useContext(PatientRegistrationContext);
+  const { setCapturePhotoProps, currentPhoto, setFieldValue, setFieldTouched } = useContext(PatientRegistrationContext);
   const {
     fieldConfigurations: {
       name: {
@@ -48,6 +48,7 @@ export const NameField = () => {
           imageData: dataUri,
           dateTime: photoDateTime,
         });
+        setFieldTouched('photo', true, false);
       }
     },
     [setCapturePhotoProps],
@@ -63,6 +64,9 @@ export const NameField = () => {
       setFieldValue('familyName', defaultUnknownFamilyName);
       setUnknownPatient('true');
     }
+    setFieldTouched('givenName', true);
+    setFieldTouched('familyName', true);
+    setFieldTouched(`attributes.${unidentifiedPatientAttributeTypeUuid}`, true, false);
   };
 
   const firstNameField = (
diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx
index 2db6ba576..55b250bda 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.component.tsx
@@ -161,7 +161,7 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
       onSubmit={onFormSubmit}>
       {(props) => (
         <Form className={styles.form}>
-          <BeforeSavePrompt when={props.dirty} redirect={target} />
+          <BeforeSavePrompt when={Object.keys(props.touched).length > 0} redirect={target} />
           <div className={styles.formContainer}>
             <div>
               <div className={styles.stickyColumn}>
diff --git a/packages/esm-patient-registration-app/src/routes.json b/packages/esm-patient-registration-app/src/routes.json
index 8e55b60df..486834b48 100644
--- a/packages/esm-patient-registration-app/src/routes.json
+++ b/packages/esm-patient-registration-app/src/routes.json
@@ -45,18 +45,16 @@
       "slot": "patient-search-actions-slot",
       "online": true,
       "offline": true
-    },
-    {
-      "component": "deleteIdentifierConfirmationModal",
-      "name": "delete-identifier-confirmation-modal",
-      "online": true,
-      "offline": true
     }
   ],
   "modals": [
     {
       "name": "cancel-patient-edit-modal",
       "component": "cancelPatientEditModal"
+    },
+    {
+      "name": "delete-identifier-confirmation-modal",
+      "component": "deleteIdentifierConfirmationModal"
     }
   ]
 }
diff --git a/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.modal.tsx b/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.modal.tsx
index c626ad5ed..f62e89717 100644
--- a/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.modal.tsx
+++ b/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.modal.tsx
@@ -1,15 +1,16 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { Button } from '@carbon/react';
-import styles from './delete-identifier-confirmation.scss';
+import { Button, ModalBody, ModalHeader, ModalFooter } from '@carbon/react';
 
 interface DeleteIdentifierConfirmationModalProps {
+  closeModal: () => void;
   deleteIdentifier: (x: boolean) => void;
   identifierName: string;
   identifierValue: string;
 }
 
 const DeleteIdentifierConfirmationModal: React.FC<DeleteIdentifierConfirmationModalProps> = ({
+  closeModal,
   deleteIdentifier,
   identifierName,
   identifierValue,
@@ -17,24 +18,30 @@ const DeleteIdentifierConfirmationModal: React.FC<DeleteIdentifierConfirmationMo
   const { t } = useTranslation();
 
   return (
-    <div className={styles.modalContent}>
-      <h1 className={styles.productiveHeading}>{t('deleteIdentifierModalHeading', 'Remove identifier?')}</h1>
-      <h3 className={styles.modalSubtitle}>
-        {identifierName}
-        {t('deleteIdentifierModalText', ' has a value of ')} {identifierValue}
-      </h3>
-      <p className={styles.modalBody}>
-        {t('confirmIdentifierDeletionText', 'Are you sure you want to remove this identifier?')}
-      </p>
-      <div className={styles.buttonSet}>
+    <>
+      <ModalHeader
+        closeModal={closeModal}
+        title={t('deleteIdentifierModalHeading', 'Delete identifier?')}></ModalHeader>
+      <ModalBody>
+        <p>
+          {identifierName && identifierValue && (
+            <span>
+              <strong>{identifierName}</strong>
+              {t('deleteIdentifierModalText', ' has a value of ')} <strong>{identifierValue}</strong>.{' '}
+            </span>
+          )}
+          {t('confirmIdentifierDeletionText', 'Are you sure you want to delete this identifier?')}
+        </p>
+      </ModalBody>
+      <ModalFooter>
         <Button kind="secondary" size="lg" onClick={() => deleteIdentifier(false)}>
           {t('cancel', 'Cancel')}
         </Button>
         <Button kind="danger" size="lg" onClick={() => deleteIdentifier(true)}>
-          {t('removeIdentifierButton', 'Remove Identifier')}
+          {t('removeIdentifierButton', 'Remove identifier')}
         </Button>
-      </div>
-    </div>
+      </ModalFooter>
+    </>
   );
 };
 
diff --git a/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.scss b/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.scss
deleted file mode 100644
index cb98f12b6..000000000
--- a/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@openmrs/esm-styleguide/src/vars' as *;
-
-.productiveHeading {
-  @include type.type-style('heading-compact-02');
-}
-
-.modalContent {
-  width: 100%;
-  background-color: $ui-01;
-  padding: layout.$spacing-05;
-}
-
-.modalSubtitle {
-  @include type.type-style('body-compact-01');
-}
-
-.modalBody {
-  @include type.type-style('body-compact-01');
-  margin: layout.$spacing-05 0;
-}
-
-.buttonSet {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  margin-left: -(layout.$spacing-05);
-  margin-right: -(layout.$spacing-05);
-  margin-bottom: -(layout.$spacing-05);
-}
-
-.buttonSet > button {
-  max-width: unset !important;
-}
diff --git a/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.test.tsx b/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.test.tsx
index 785a851bb..2066906d0 100644
--- a/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.test.tsx
+++ b/packages/esm-patient-registration-app/src/widgets/delete-identifier-confirmation.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import DeleteIdentifierConfirmationModal from './delete-identifier-confirmation.modal';
 
-describe('DeleteIdentifierConfirmationModal component', () => {
+describe('DeleteIdentifierConfirmationModal', () => {
   const mockDeleteIdentifier = jest.fn();
   const mockIdentifierName = 'Identifier Name';
   const mockIdentifierValue = 'Identifier Value';
@@ -13,6 +13,7 @@ describe('DeleteIdentifierConfirmationModal component', () => {
 
     render(
       <DeleteIdentifierConfirmationModal
+        closeModal={jest.fn()}
         deleteIdentifier={mockDeleteIdentifier}
         identifierName={mockIdentifierName}
         identifierValue={mockIdentifierValue}
diff --git a/packages/esm-patient-registration-app/translations/en.json b/packages/esm-patient-registration-app/translations/en.json
index 756bdc9c5..ff2890d24 100644
--- a/packages/esm-patient-registration-app/translations/en.json
+++ b/packages/esm-patient-registration-app/translations/en.json
@@ -93,7 +93,7 @@
   "relationshipToPatient": "Relationship to patient",
   "relativeFullNameLabelText": "Full name",
   "relativeNamePlaceholder": "Firstname Familyname",
-  "removeIdentifierButton": "Remove Identifier",
+  "removeIdentifierButton": "Remove identifier",
   "resetIdentifierTooltip": "Reset",
   "restoreRelationshipActionButton": "Undo",
   "searchAddress": "Search address",

From 835898f7101455b62c7e208da80a63aa3270055e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 26 Sep 2024 23:02:03 +0300
Subject: [PATCH 10/12] (chore) Update translations from Transifex (#1329)

Co-authored-by: OpenMRS Bot <infrastructure@openmrs.org>
---
 .../translations/fr.json                      |  2 +-
 .../translations/fr.json                      | 34 +++++++++---------
 .../translations/fr.json                      |  4 +--
 .../translations/fr.json                      | 36 +++++++++----------
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/packages/esm-bed-management-app/translations/fr.json b/packages/esm-bed-management-app/translations/fr.json
index eba7c6fef..c17698032 100644
--- a/packages/esm-bed-management-app/translations/fr.json
+++ b/packages/esm-bed-management-app/translations/fr.json
@@ -43,7 +43,7 @@
   "pleaseFillField": "",
   "required": "Requis",
   "save": "Enregistrer",
-  "saveSuccessMessage": "was saved successfully.",
+  "saveSuccessMessage": "a été enregistré avec succès.",
   "selectBedLocation": "Sélectionner un emplacement de lit",
   "viewBeds": "Voir lits",
   "wardAllocation": "Ward Allocation",
diff --git a/packages/esm-patient-list-management-app/translations/fr.json b/packages/esm-patient-list-management-app/translations/fr.json
index 2c6921868..dc5293a18 100644
--- a/packages/esm-patient-list-management-app/translations/fr.json
+++ b/packages/esm-patient-list-management-app/translations/fr.json
@@ -7,8 +7,8 @@
   "cancel": "Annuler",
   "checkFilters": "Vérifiez les filtres ci-dessus",
   "configureList": "Configurez votre liste de patients à l'aide des champs ci-dessous",
-  "confirmDeletePatientList": "Are you sure you want to delete this patient list?",
-  "created": "Created",
+  "confirmDeletePatientList": "Êtes-vous sûr de vouloir supprimer cette liste de patients?",
+  "created": "Créé(e)",
   "createdOn": "Créé le",
   "createList": "Créer une liste",
   "createNewPatientList": "Créer une nouvelle liste de patients",
@@ -19,26 +19,26 @@
   "editList": "Modifier la liste",
   "editNameDescription": "Modifier le Nom/ la Description",
   "editPatientListHeader": "Modifier la liste des patients",
-  "emptyList": "This list has no patients",
+  "emptyList": "Cette liste ne contient aucun patient",
   "emptyStateIllustration": "Empty state illustration",
   "emptyStateText": "Il n'y a pas de liste de patient {{listType}} à afficher",
   "error": "Erreur",
   "errorAddPatientToList": "Patient non ajouté à la liste",
   "errorCopy": "Désolé, une erreur s’est produite à l’affichage. Vous pouvez tenter de rafraîchir la page, ou bien contacter l'administrateur du site et transmettre le message d'erreur ci-dessus.",
-  "errorCreatingList": "Error creating list",
-  "errorDeletingList": "Error deleting patient list",
-  "errorRemovingPatientFromList": "Failed to remove patient from list",
-  "errorUpdatingList": "Error updating list",
+  "errorCreatingList": "Erreur lors de la création de la liste",
+  "errorDeletingList": "Erreur lors de la suppression de la liste de patients",
+  "errorRemovingPatientFromList": "Échec de la suppression du patient de la liste",
+  "errorUpdatingList": "Erreur lors de la mise à jour de la liste",
   "identifier": "Identifiant",
   "items": "eléments",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} eléments",
-  "listCreated": "List created successfully",
+  "listCreated": "Liste créée avec succès",
   "listDescriptionPlaceholder": "par ex. Les patients atteints d'asthme diagnostiqué qui peuvent être disposés à faire partie d'une étude de recherche universitaire",
-  "listName": "List name",
+  "listName": "Nom de la liste",
   "listNamePlaceholder": "par ex. Participants potentiels de la recherche",
-  "listType": "List type",
-  "listUpdated": "List updated successfully",
-  "listUpToDate": "The list is now up to date",
+  "listType": "Type de liste",
+  "listUpdated": "Liste mise à jour avec succès",
+  "listUpToDate": "La liste est maintenant à jour",
   "myLists": "Mes listes",
   "name": "Nom",
   "newList": "Nouvelle liste",
@@ -48,15 +48,15 @@
   "nextPage": "Page suivante",
   "noMatchingLists": "Aucun liste à afficher",
   "noMatchingPatients": "Aucun patient correspondant à afficher",
-  "noOfPatients": "No. of patients",
+  "noOfPatients": "Nombre de patients",
   "noPatientListFound": "Aucune liste de patients trouvée",
   "noPatientsInList": "Il n'y a pas de patient dans cette liste",
   "offlinePatients": "Patients hors ligne",
   "openPatientList": "Ajouter à la liste",
-  "patientListMemberCount_one": "This list has {{count}} patient",
-  "patientListMemberCount_other": "This list has {{count}} patients",
+  "patientListMemberCount_one": "Cette liste a {{count}} patient",
+  "patientListMemberCount_other": "Cette liste a {{count}} patients",
   "patientLists": "Listes de patients",
-  "patientRemovedFromList": "Patient removed from list",
+  "patientRemovedFromList": "Patient retiré de la liste",
   "patients": "Patients",
   "previousPage": "Page précédente",
   "problemCreatingList": "Problème lors de la création de la liste",
@@ -78,6 +78,6 @@
   "systemDefined": "définie par le système",
   "systemLists": "Listes du système",
   "unstarList": "Enlever comme étoilée",
-  "updated": "Updated",
+  "updated": "Mis à jour",
   "userDefined": "définie par I'utilisateur"
 }
diff --git a/packages/esm-patient-search-app/translations/fr.json b/packages/esm-patient-search-app/translations/fr.json
index 210588ccb..733ba4e71 100644
--- a/packages/esm-patient-search-app/translations/fr.json
+++ b/packages/esm-patient-search-app/translations/fr.json
@@ -4,8 +4,8 @@
   "apply": "Appliquer",
   "clear": "Effacer",
   "clearSearch": "Effacer",
-  "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "Filtres appliqués",
+  "closeSearch": "Fermer le Panneau de Recherche",
+  "countOfFiltersApplied": "filtres appliqués",
   "dayOfBirth": "Jour de Naissance",
   "error": "Erreur",
   "errorCopy": "Désolé, une erreur s'est produite. Vous pouvez tenter de rafraîchir la page, ou bien contacter l'administrateur du site et transmettre le message d'erreur ci-dessus.",
diff --git a/packages/esm-service-queues-app/translations/fr.json b/packages/esm-service-queues-app/translations/fr.json
index 5e11f053b..071bd4c38 100644
--- a/packages/esm-service-queues-app/translations/fr.json
+++ b/packages/esm-service-queues-app/translations/fr.json
@@ -108,7 +108,7 @@
   "male": "Masculin",
   "maleLabelText": "Masculin",
   "match": "Match",
-  "medications": "Medications",
+  "medications": "Médicaments",
   "middleName": "Deuxième prénom",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
@@ -185,8 +185,8 @@
   "program": "Programme",
   "provider": "Prestataire",
   "quantity": "Quantité",
-  "queueAddedSuccessfully": "Queue added successfully",
-  "queueEntryAddedSuccessfully": "Queue entry added successfully",
+  "queueAddedSuccessfully": "File d'attente ajoutée avec succès",
+  "queueEntryAddedSuccessfully": "Entrée dans la file d'attente ajoutée avec succès",
   "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
@@ -197,11 +197,11 @@
   "queueEntryRemoved": "Queue entry removed",
   "queueEntryRemovedSuccessfully": "",
   "queueEntryStatusUpdateFailed": "Error updating queue entry status",
-  "queueEntryTransitioned": "Queue entry transitioned",
-  "queueEntryTransitionedSuccessfully": "Queue entry transitioned successfully",
-  "queueEntryTransitionFailed": "Error transitioning queue entry",
-  "queueEntryTransitionUndoFailed": "Error undoing transition",
-  "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
+  "queueEntryTransitioned": "Entrée dans la file d'attente transitionnée",
+  "queueEntryTransitionedSuccessfully": "Entrée dans la file d'attente transitionnée avec succès",
+  "queueEntryTransitionFailed": "Erreur lors de la transition de l'entrée dans la file d'attente",
+  "queueEntryTransitionUndoFailed": "Erreur lors de l'annulation de la transition",
+  "queueEntryTransitionUndoSuccessful": "Annulation de la transition de l'entrée dans la file d'attente réussie",
   "queueEntryUpdateFailed": "Erreur lors de la mise à jour du statut de l'entrée dans la file d'attente",
   "queueEntryUpdateSuccessfully": "Entrée de la file d'attente mise à jour avec succès",
   "queueLocation": "Emplacement de la file d'attente",
@@ -276,27 +276,27 @@
   "time": "Temps",
   "timeCannotBeInFuture": "Time cannot be in the future",
   "timeCannotBePriorToPreviousQueueEntry": "L’heure ne peut être antérieure au début de la file d’attente précédente: {{time}}",
-  "timeOfTransition": "Time of transition",
+  "timeOfTransition": "Heure de la transition",
   "tirageNotYetCompleted": "Le triage n'est pas encore terminé",
   "today": "Aujourd'hui",
   "totalPatients": "Nombre total de patients",
   "transition": "Transition",
-  "TransitionLatestQueueEntry": "Transition patient to latest queue",
-  "transitionPatient": "Transition patient",
-  "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
+  "TransitionLatestQueueEntry": "Transitionner le patient vers la file d'attente la plus récente",
+  "transitionPatient": "Transition du patient",
+  "transitionPatientStatusOrQueue": "Sélectionnez un nouveau statut ou une file d'attente vers laquelle le patient doit être transféré.",
   "triageForm": "Formulaire de triage",
   "triageNote": "Note de triage",
   "trySearchWithPatientUniqueID": "Essayez de faire une recherche avec le numéro d'identification unique du patient.",
-  "undoQueueEntryTransitionSuccess": "Undo transition success",
-  "undoTransition": "Undo transition",
-  "unexpectedServerResponse": "Unexpected Server Response",
+  "undoQueueEntryTransitionSuccess": "Annuler la transition réussie",
+  "undoTransition": "Annuler la transition",
+  "unexpectedServerResponse": "Réponse du serveur inattendue",
   "unknown": "Inconnue",
   "updateEntry": "Mettre à jour l'entrée",
-  "updateRoom": "Update room",
+  "updateRoom": "Mettre à jour la salle",
   "useTodaysDate": "Utiliser la date d'aujourd'hui",
-  "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
+  "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid non configuré",
   "visitStartTime": "Heure de la consultation",
-  "visitTabs": "Visit tabs",
+  "visitTabs": "Onglets de visite",
   "visitType": "Type de Consultation",
   "vitals": "Signes Vitaux",
   "vitalsForm": "Formulaire de signes vitaux",

From 33b89e8dcde8dec5b05fdb62e9e7ea10d42e160a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:46:58 +0300
Subject: [PATCH 11/12] (chore) Update translations from Transifex (#1330)

Co-authored-by: OpenMRS Bot <infrastructure@openmrs.org>
---
 .../translations/es.json                      |  14 +-
 .../esm-appointments-app/translations/es.json | 138 +++++++--------
 .../esm-appointments-app/translations/fr.json |  24 +--
 .../translations/es.json                      |  82 ++++-----
 .../translations/fr.json                      |  30 ++--
 .../translations/am.json                      |   2 +-
 .../translations/ar.json                      |   2 +-
 .../translations/es.json                      |  80 ++++-----
 .../translations/fr.json                      |  50 +++---
 .../translations/he.json                      |   2 +-
 .../translations/km.json                      |   2 +-
 .../translations/zh.json                      |   2 +-
 .../translations/zh_CN.json                   |   2 +-
 .../translations/es.json                      | 160 +++++++++---------
 .../translations/fr.json                      | 102 +++++------
 15 files changed, 346 insertions(+), 346 deletions(-)

diff --git a/packages/esm-active-visits-app/translations/es.json b/packages/esm-active-visits-app/translations/es.json
index 5e7899bb1..08ec3ff89 100644
--- a/packages/esm-active-visits-app/translations/es.json
+++ b/packages/esm-active-visits-app/translations/es.json
@@ -16,21 +16,21 @@
   "noActiveVisitsForLocation": "No hay visitas activas para esta ubicación.",
   "noDiagnosesFound": "No se encontraron diagnósticos",
   "noEncountersFound": "No se encontraron encuentros",
-  "noMedicationsFound": "No se encontraron medicaciones",
-  "noNotesToShowForPatient": "No hay notas para mostrar de este paciente",
+  "noMedicationsFound": "No se encontraron medicamentos",
+  "noNotesToShowForPatient": "No hay notas para mostrar para este paciente",
   "noObservationsFound": "No se encontraron observaciones",
   "notes": "Notas",
   "noVisitsToDisplay": "No hay visitas para mostrar",
-  "orderDurationAndUnit": "para {{duration}} {{durationUnit}}",
+  "orderDurationAndUnit": "por {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Duración indefinida",
-  "patients": "Patients",
+  "patients": "Pacientes",
   "provider": "Proveedor",
   "quantity": "Cantidad",
-  "refills": "Recargas",
+  "refills": "Reposiciones",
   "tests": "Pruebas",
   "thereIsNoInformationToDisplayHere": "No hay información para mostrar aquí",
-  "time": "Tiempo",
-  "totalVisits": "Total Visits Today",
+  "time": "Hora",
+  "totalVisits": "Total de Visitas Hoy",
   "visitStartTime": "Tiempo de Visita",
   "visitSummary": "Resumen de Visita",
   "visitType": "Tipo de Visita"
diff --git a/packages/esm-appointments-app/translations/es.json b/packages/esm-appointments-app/translations/es.json
index 784d82588..d65589c12 100644
--- a/packages/esm-appointments-app/translations/es.json
+++ b/packages/esm-appointments-app/translations/es.json
@@ -8,34 +8,34 @@
   "appointmentCancelled": "Cita cancelada",
   "appointmentCancelledSuccessfully": "Cita cancelada con éxito",
   "appointmentColor": "Color de la cita",
-  "appointmentConflict": "Appointment conflict",
-  "appointmentEdited": "Appointment edited",
-  "appointmentEditError": "Error editing appointment",
-  "appointmentEnded": "Appointment ended",
-  "appointmentEndedAndVisitClosedSuccessfully": "Appointment successfully ended and visit successfully closed.",
-  "appointmentEndedButVisitNotClosedError": "Appointment ended, but error closing visit",
-  "appointmentEndedSuccessfully": "Appointment successfully ended.",
-  "appointmentEndError": "Error ending appointment",
+  "appointmentConflict": "Conflicto en las citas",
+  "appointmentEdited": "Cita editada",
+  "appointmentEditError": "Error al editar cita",
+  "appointmentEnded": "Cita finalizada",
+  "appointmentEndedAndVisitClosedSuccessfully": "Cita finalizada con éxito y visita cerrada con éxito ",
+  "appointmentEndedButVisitNotClosedError": "Cita finalizada, pero hubo un error al cerrar la visita",
+  "appointmentEndedSuccessfully": "Cita finalizada con éxito ",
+  "appointmentEndError": "Error al finalizar cita",
   "appointmentFormError": "Error al programar la cita",
   "appointmentHistory": "Historial de citas",
   "appointmentMetrics": "Métricas de citas",
   "appointmentMetricsLoadError": "",
-  "appointmentNoteLabel": "Write an additional note",
-  "appointmentNotePlaceholder": "Write any additional points here",
+  "appointmentNoteLabel": "Escriba una nota adicional",
+  "appointmentNotePlaceholder": "Escriba algún punto adicional aquí",
   "appointmentNotes": "Notas de cita",
   "appointmentNowVisible": "Ahora es visible en la página de Citas",
   "appointments": "Citas",
-  "Appointments": "Appointments",
-  "appointments_lower": "appointments",
-  "appointmentsCalendar": "Appointments calendar",
+  "Appointments": "Citas",
+  "appointments_lower": "citas",
+  "appointmentsCalendar": "Calendario de citas",
   "appointmentScheduled": "Cita programada",
   "appointmentService": "Servicio de citas",
   "appointmentServiceCreate": "Servicio de citas creado exitosamente",
   "appointmentServiceName": "Nombre del servicio de citas",
-  "appointmentsScheduledForToday": "appointments scheduled for today",
-  "appointmentsTable": "Appointments table",
+  "appointmentsScheduledForToday": "citas agendadas para hoy",
+  "appointmentsTable": "Tabla de citas",
   "appointmentStatus": "Appointment status",
-  "appointmentToFulfill": "Select appointment to fulfill",
+  "appointmentToFulfill": "Seleccione cita para completar",
   "appointmentType": "Tipo de cita",
   "appointmentType_title": "Tipo de cita",
   "back": "Atrás",
@@ -47,113 +47,113 @@
   "cancelled": "Cancelada",
   "checkedIn": "Checked in",
   "checkedOut": "Completada",
-  "checkFilters": "Check the filters above",
+  "checkFilters": "Compruebe los filtros anteriores",
   "checkIn": "Registrar",
   "checkOut": "Finalizar",
-  "chooseAppointmentType": "Choose appointment type",
-  "chooseLocation": "Choose a location",
-  "chooseProvider": "Choose a provider",
+  "chooseAppointmentType": "Escoja un tipo de cita",
+  "chooseLocation": "Escoja una ubicación",
+  "chooseProvider": "Escoja un proveedor",
   "chooseService": "Seleccionar servicio",
   "completed": "Completado",
-  "Contact": "Contact {{index}}",
-  "countMore_one": "{{count}} more",
-  "countMore_other": "{{count}} more",
+  "Contact": "Contacto {{index}}",
+  "countMore_one": "{{count}} más",
+  "countMore_other": "{{count}} más",
   "createAppointmentService": "Crear servicios de citas",
   "createNewAppointment": "Crear nueva cita",
   "date": "Fecha",
   "date&Time": "Date & time",
-  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
-  "dateOfBirth": "Date of birth",
-  "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
-  "dateTime": "Date & Time",
-  "day": "Day",
-  "daysOfWeek": "Days of the week",
+  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "La fecha en que se emitió la cita no puede ser posterior a la fecha de la cita",
+  "dateOfBirth": "Fecha de nacimiento",
+  "dateScheduled": "Fecha de emisión de la cita",
+  "dateScheduledDetail": "Fecha de emisión de la cita",
+  "dateTime": "Fecha y hora",
+  "day": "Día",
+  "daysOfWeek": "Días de la semana",
   "discard": "Descartar",
   "download": "Descargar",
-  "durationErrorMessage": "Duration should be greater than zero",
-  "durationInMinutes": "Duration (minutes)",
+  "durationErrorMessage": "La duración debería ser mayor a cero",
+  "durationInMinutes": "Duración (minutos)",
   "durationMins": "Duración (min)",
   "edit": "Editar",
   "editAppointment": "Editar cita",
   "editAppointments": "Editar cita",
-  "emptyStateText": "There are no <1>{{displayText}}</1> to display",
+  "emptyStateText": "No hay <1>{{displayText}}</1> para mostrar",
   "encounters": "Encuentros",
   "encounterType": "Tipo de encuentro",
-  "endAppointmentAndVisitConfirmationMessage": "Checking the patient out will mark the appointment as complete, and close out the active visit for this patient.",
-  "endAppointmentConfirmation": "Are you sure you want to check the patient out for this appointment?",
-  "endAppointmentConfirmationMessage": "Checking the patient out will mark the appointment as complete.",
-  "endDate": "End date",
+  "endAppointmentAndVisitConfirmationMessage": "Marcar al paciente como dado de alta indicará que la cita está completa y cerrará la visita activa para este paciente.",
+  "endAppointmentConfirmation": "¿Está seguro de que desea marcar al paciente como dado de alta para esta cita?",
+  "endAppointmentConfirmationMessage": "Marcar al paciente como dado de alta indicará que la cita está completa.",
+  "endDate": "Fecha de finalización",
   "endTime": "Hora de finalización",
   "errorCreatingAppointmentService": "Error creating appointment service",
   "expected": "Expected",
-  "filterTable": "Filter table",
+  "filterTable": "Filtrar tabla",
   "gender": "Género",
-  "highestServiceVolume": "Highest volume service: {{time}}",
+  "highestServiceVolume": "Servicio de mayor volumen: {{time}}",
   "identifier": "Identificador",
-  "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
-  "isRecurringAppointment": "Is this a recurring appointment?",
-  "itemsPerPage": "Items per page",
+  "invalidNumber": "El número no es válido",
+  "invalidTime": "Hora inválida",
+  "isRecurringAppointment": "¿Esta es una cita recurrente?",
+  "itemsPerPage": "Elementos por página",
   "loading": "Loading",
   "location": "Ubicación",
   "medications": "Medicamentos",
   "missed": "Perdida",
-  "next": "Next",
-  "nextMonth": "Next month",
-  "nextPage": "Next page",
+  "next": "Siguiente",
+  "nextMonth": "Siguiente mes",
+  "nextPage": "Siguiente página",
   "no": "No",
-  "noAppointmentsToDisplay": "No appointments to display",
-  "noContent": "No Content",
+  "noAppointmentsToDisplay": "No hay citas para mostrar",
+  "noContent": "No hay contenido",
   "noCurrentAppointments": "No hay citas programadas que mostrar para hoy para este paciente",
   "noEncountersFound": "No se encontraron encuentros",
   "noPastAppointments": "No hay citas anteriores para mostrar para este paciente",
   "noPreviousVisitFound": "No se encontraron visitas anteriores",
   "notArrived": "No ha llegado",
-  "note": "Note",
+  "note": "Nota",
   "notes": "Notas",
   "noUpcomingAppointments": "No hay próximas citas para mostrar para este paciente",
   "noUpcomingAppointmentsForPatient": "No hay próximas citas para mostrar para este paciente",
-  "pageNumber": "Page number",
+  "pageNumber": "Número de página",
   "past": "Anterior",
   "patientDetails": "Detalles del paciente",
-  "patientDoubleBooking": "Patient already booked for an appointment at this time",
+  "patientDoubleBooking": "El paciente ya agendó una cita para esta hora",
   "patientName": "Nombre del paciente",
   "patients": "Pacientes",
-  "period": "Period",
-  "prev": "Prev",
-  "previousMonth": "Previous month",
-  "previousPage": "Previous page",
+  "period": "Periodo",
+  "prev": "Ant",
+  "previousMonth": "Mes anterior",
+  "previousPage": "Página anterior",
   "provider": "Proveedor",
   "providers": "Proveedores",
-  "providersBooked": "Providers booked: {{time}}",
-  "recurringAppointment": "Recurring Appointment",
-  "recurringAppointmentShouldHaveEndDate": "A recurring appointment should have an end date",
-  "repeatEvery": "Repeat every",
+  "providersBooked": "Proveedores agendados: {{time}}",
+  "recurringAppointment": "Cita recurrente",
+  "recurringAppointmentShouldHaveEndDate": "Una cita recurrente debería tener una fecha de finalización",
+  "repeatEvery": "Repetir cada",
   "save": "Guardar",
-  "saveAndClose": "Save and close",
+  "saveAndClose": "Guardar y cerrar",
   "scheduled": "Programada",
   "scheduledAppointments": "Citas programadas",
-  "scheduledForToday": "Scheduled For Today",
-  "selectALocation": "Select a location",
+  "scheduledForToday": "Agendada Para Hoy",
+  "selectALocation": "Seleccionar una ubicación",
   "selectAppointmentStatus": "Seleccionar estado",
   "selectAppointmentType": "Seleccionar tipo de cita",
   "selectLocation": "Seleccionar ubicación",
   "selectOption": "Seleccionar una opción",
-  "selectProvider": "Select a provider",
+  "selectProvider": "Seleccionar un proveedor",
   "selectService": "Seleccionar servicio",
   "selectServiceType": "Seleccionar tipo de servicio",
   "service": "Servicio",
   "serviceName": "Nombre del servicio",
   "serviceType": "Tipo de servicio",
-  "serviceUnavailable": "Appointment time is outside of service hours",
-  "startDate": "Start date",
+  "serviceUnavailable": "La hora de la cita está fuera de las horas de servicio",
+  "startDate": "Fecha de inicio",
   "startTime": "Hora de inicio",
-  "status": "Status",
+  "status": "Estado",
   "time": "Tiempo",
   "today": "Hoy",
-  "todays": "Today's",
-  "type": "Type",
+  "todays": "Hoy día es",
+  "type": "Tip",
   "unscheduled": "No programada",
   "unscheduledAppointments": "Citas no programadas",
   "unscheduledAppointments_lower": "citas no programadas",
@@ -161,6 +161,6 @@
   "upcomingAppointments": "Próximas citas",
   "view": "Ver",
   "vitals": "Signos vitales",
-  "week": "Week",
+  "week": "Semana",
   "yes": "Sí"
 }
diff --git a/packages/esm-appointments-app/translations/fr.json b/packages/esm-appointments-app/translations/fr.json
index 466505034..d30f5b8a4 100644
--- a/packages/esm-appointments-app/translations/fr.json
+++ b/packages/esm-appointments-app/translations/fr.json
@@ -58,20 +58,20 @@
   "Contact": "Contact {{index}}",
   "countMore_one": "{{count}} de plus",
   "countMore_other": "{{count}} de plus",
-  "createAppointmentService": "Create appointment services",
+  "createAppointmentService": "Créer des services de rendez-vous",
   "createNewAppointment": "Créer un nouveau rendez-vous",
   "date": "Date",
   "date&Time": "Date et heure",
-  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
+  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "La date du rendez-vous ne peut pas être postérieure à la date du rendez-vous",
   "dateOfBirth": "Date de naissance",
-  "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
+  "dateScheduled": "Date de rendez vous émise",
+  "dateScheduledDetail": "Date de rendez vous émise",
   "dateTime": "Date et heure",
   "day": "Jour",
   "daysOfWeek": "Jours de la semaine",
   "discard": "Abandonner",
   "download": "Télécharger",
-  "durationErrorMessage": "Duration should be greater than zero",
+  "durationErrorMessage": "La durée doit être supérieure à zéro",
   "durationInMinutes": "Durée (minutes)",
   "durationMins": "Durée min",
   "edit": "Modifier",
@@ -80,12 +80,12 @@
   "emptyStateText": "Pas de <1>{{displayText}}</1> à afficher",
   "encounters": "Rencontres",
   "encounterType": "Type de rencontre",
-  "endAppointmentAndVisitConfirmationMessage": "Checking the patient out will mark the appointment as complete, and close out the active visit for this patient.",
-  "endAppointmentConfirmation": "Are you sure you want to check the patient out for this appointment?",
-  "endAppointmentConfirmationMessage": "Checking the patient out will mark the appointment as complete.",
+  "endAppointmentAndVisitConfirmationMessage": " La sortie du patient marquera le rendez-vous comme terminé et clôturera la visite active pour ce patient.",
+  "endAppointmentConfirmation": " Etes-vous sûr de vouloir enregistrer le patient pour ce rendez-vous ?",
+  "endAppointmentConfirmationMessage": " La sortie du patient marquera le rendez-vous comme terminé.",
   "endDate": "Date de fin",
   "endTime": "Heure de fin",
-  "errorCreatingAppointmentService": "Error creating appointment service",
+  "errorCreatingAppointmentService": " Erreur lors de la création du service de rendez-vous",
   "expected": "Prévus:",
   "filterTable": "Filtrer le tableau",
   "gender": "Genre",
@@ -117,10 +117,10 @@
   "pageNumber": "Numéro de page",
   "past": "Passé",
   "patientDetails": "Détails du patient",
-  "patientDoubleBooking": "Patient already booked for an appointment at this time",
+  "patientDoubleBooking": "Le patient a déjà un rendez vous à cette date",
   "patientName": "Nom du patient",
   "patients": "Patients",
-  "period": "Period",
+  "period": "Période",
   "prev": "Préc",
   "previousMonth": "Mois précédent",
   "previousPage": "Page précédente",
@@ -146,7 +146,7 @@
   "service": "Service",
   "serviceName": "Nom du service",
   "serviceType": "Type de service",
-  "serviceUnavailable": "Appointment time is outside of service hours",
+  "serviceUnavailable": "L'heure du rendez-vous est en dehors des heures de service",
   "startDate": "Date de début",
   "startTime": "Heure de début",
   "status": "Statut",
diff --git a/packages/esm-bed-management-app/translations/es.json b/packages/esm-bed-management-app/translations/es.json
index dba1d2c0e..3a191820d 100644
--- a/packages/esm-bed-management-app/translations/es.json
+++ b/packages/esm-bed-management-app/translations/es.json
@@ -1,51 +1,51 @@
 {
-  "actions": "Actions",
-  "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
-  "allocationStatus": "Allocated",
-  "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
-  "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
-  "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "actions": "Acciones",
+  "addBed": "Añadir cama",
+  "addBedTag": "Crear Etiqueta de Cama",
+  "addBedtype": "Añadir Tipo de Cama",
+  "addBedType": "Crear Tipo de Cama",
+  "allocationStatus": "Asignado",
+  "bedId": "ID de la Cama",
+  "bedIdPlaceholder": "p. ej. BMW-201",
+  "bedLocation": "Ubicación",
+  "bedManagement": "Administración de Camas",
+  "bedName": "Nombre de la Cama",
+  "beds": "Camas",
+  "bedTag": "Nombre de la Etiqueta de la Cama",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedType": "Añadir Tipo de Cama",
   "bedTypePlaceholder": "",
-  "checkFilters": "Check the filters above",
-  "chooseBedtype": "Choose a bed type",
-  "chooseOccupiedStatus": "Choose occupied status",
-  "createNewBed": "Create a new bed",
-  "description": "Description",
-  "displayName": "Display Name",
+  "checkFilters": "Compruebe los filtros anteriores",
+  "chooseBedtype": "Elija un tipo de cama",
+  "chooseOccupiedStatus": "Elija el estado ocupado",
+  "createNewBed": "Crear una nueva cama",
+  "description": "Descripción",
+  "displayName": "Mostrar Nombre",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
-  "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBed": "Editar etiqueta",
+  "editBedTag": "Editar Etiqueta de la Cama",
+  "editBedType": "Editar Tipo de Cama",
   "error": "Error",
-  "errorCreatingForm": "Error creating bed",
-  "errorFetchingbedInformation": "Error fetching bed information",
-  "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
+  "errorCreatingForm": "Error al crear cama",
+  "errorFetchingbedInformation": "Error al obtener información de la cama",
+  "filterByOccupancyStatus": "Filtrar por estado de ocupación",
+  "formCreated": "Añadir Tipo de Cama",
+  "formSaved": "Tipo de Cama",
   "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
-  "name": "Name",
+  "location": "Ubicaciones",
+  "manageBeds": "Administrar Camas",
+  "name": "Nombre",
   "no": "No",
-  "No data": "No data to display",
-  "occupancyStatus": "Occupied",
-  "or": "or",
+  "No data": "No hay datos para mostrar",
+  "occupancyStatus": "Ocupada",
+  "or": "o",
   "pleaseFillField": "",
-  "required": "Required",
-  "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
-  "selectBedLocation": "Select a bed location",
-  "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
-  "yes": "Yes"
+  "required": "Obligatorio",
+  "save": "Guardar",
+  "saveSuccessMessage": "fue guardado exitosamente.",
+  "selectBedLocation": "Seleccione una ubicación para la cama",
+  "viewBeds": "Ver camas",
+  "wardAllocation": "Asignación de sala",
+  "yes": "Sí"
 }
diff --git a/packages/esm-bed-management-app/translations/fr.json b/packages/esm-bed-management-app/translations/fr.json
index c17698032..2ed9929f3 100644
--- a/packages/esm-bed-management-app/translations/fr.json
+++ b/packages/esm-bed-management-app/translations/fr.json
@@ -1,11 +1,11 @@
 {
   "actions": "Actions",
   "addBed": "Ajouter un lit",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
-  "allocationStatus": "Allocated",
-  "bedId": "Bed ID",
+  "addBedTag": "Créer une étiquette de lit",
+  "addBedtype": "Ajouter type de lit",
+  "addBedType": "Créer Type de lit",
+  "allocationStatus": "Attribué",
+  "bedId": "Identifiant du Lit",
   "bedIdPlaceholder": "exemple : BMW-201",
   "bedLocation": "Emplacement",
   "bedManagement": "Gestion du lit",
@@ -17,24 +17,24 @@
   "bedTypePlaceholder": "",
   "checkFilters": "Vérifiez les filtres ci-dessus",
   "chooseBedtype": "Choisir un type de lit",
-  "chooseOccupiedStatus": "Choose occupied status",
+  "chooseOccupiedStatus": " Choisissez le statut occupé",
   "createNewBed": "Créer un nouveau lit",
   "description": "Description",
   "displayName": "Display Name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
-  "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBed": "Afficher un tag",
+  "editBedTag": "Afficher un Tag de lit",
+  "editBedType": "Afficher un type de lit",
   "error": "Erreur",
-  "errorCreatingForm": "Error creating bed",
-  "errorFetchingbedInformation": "Error fetching bed information",
-  "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
+  "errorCreatingForm": "Erreur lors de la création du lit",
+  "errorFetchingbedInformation": " Erreur lors de la récupération des informations sur le lit",
+  "filterByOccupancyStatus": "Filtrer par statut d'occupation",
+  "formCreated": "Ajouter un type de lit",
+  "formSaved": "Type de lit",
   "headerTitle": "",
   "ids": "Identifiant",
   "location": "Emplacements",
-  "manageBeds": "Manage Beds",
+  "manageBeds": "Gestion des lits",
   "name": "Nom",
   "no": "Non",
   "No data": "Pas de données à afficher",
diff --git a/packages/esm-patient-registration-app/translations/am.json b/packages/esm-patient-registration-app/translations/am.json
index 756bdc9c5..ff2890d24 100644
--- a/packages/esm-patient-registration-app/translations/am.json
+++ b/packages/esm-patient-registration-app/translations/am.json
@@ -93,7 +93,7 @@
   "relationshipToPatient": "Relationship to patient",
   "relativeFullNameLabelText": "Full name",
   "relativeNamePlaceholder": "Firstname Familyname",
-  "removeIdentifierButton": "Remove Identifier",
+  "removeIdentifierButton": "Remove identifier",
   "resetIdentifierTooltip": "Reset",
   "restoreRelationshipActionButton": "Undo",
   "searchAddress": "Search address",
diff --git a/packages/esm-patient-registration-app/translations/ar.json b/packages/esm-patient-registration-app/translations/ar.json
index 49c9496ef..d41dfda59 100644
--- a/packages/esm-patient-registration-app/translations/ar.json
+++ b/packages/esm-patient-registration-app/translations/ar.json
@@ -93,7 +93,7 @@
   "relationshipToPatient": "العلاقة بالمريض",
   "relativeFullNameLabelText": "Full name",
   "relativeNamePlaceholder": "الاسم الأول اسم العائلة",
-  "removeIdentifierButton": "Remove Identifier",
+  "removeIdentifierButton": "Remove identifier",
   "resetIdentifierTooltip": "إعادة تعيين",
   "restoreRelationshipActionButton": "تراجع",
   "searchAddress": "ابحث عن العنوان",
diff --git a/packages/esm-patient-registration-app/translations/es.json b/packages/esm-patient-registration-app/translations/es.json
index 7687b950b..0afa1e8eb 100644
--- a/packages/esm-patient-registration-app/translations/es.json
+++ b/packages/esm-patient-registration-app/translations/es.json
@@ -3,38 +3,38 @@
   "addressHeader": "Dirección",
   "allFieldsRequiredText": "Todos los campos son obligatorios a menos que se indique como opcionales",
   "autoGeneratedPlaceholderText": "Autogenerado",
-  "birthdayNotInTheFuture": "Birthday cannot be in future",
-  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
+  "birthdayNotInTheFuture": "La fecha de nacimiento no puede ser en el futuro",
+  "birthdayNotOver140YearsAgo": "La fecha de nacimiento no puede ser de hace más de 140 años",
   "birthdayRequired": "Cumpleaños es obligatorio",
   "birthFieldLabelText": "Nacimiento",
   "cancel": "Cancelar",
-  "causeOfDeathInputLabel": "Cause of death",
+  "causeOfDeathInputLabel": "Causa de muerte",
   "closeOverlay": "Cerrar superposición",
   "codedPersonAttributeAnswerSetEmpty": "El campo de atributo de persona codificado '{{codedPersonAttributeFieldId}}' se ha definido con un conjunto de conceptos de respuesta UUID '{{answerConceptSetUuid}}' que no tiene respuestas de concepto.",
   "codedPersonAttributeAnswerSetInvalid": "El campo de atributo de persona codificado '{{codedPersonAttributeFieldId}}' se ha definido con un UUID de conjunto de conceptos de respuesta no válido '{{answerConceptSetUuid}}'.",
   "codedPersonAttributeNoAnswerSet": "El campo de atributo de persona '{{codedPersonAttributeFieldId}}' es de tipo 'codificado' pero se ha definido sin UUID de conjunto de conceptos de respuesta. La clave 'answerConceptSetUuid' es requerida.",
   "configure": "Configurar",
   "configureIdentifiers": "Configurar identificadores",
-  "confirmDiscardChangesBody": "Your unsaved changes will be lost if you proceed to discard the form",
-  "confirmDiscardChangesTitle": "Are you sure you want to discard these changes?",
-  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
+  "confirmDiscardChangesBody": "Tus cambios sin guardar serán perdidos si procedes a descartar el formulario",
+  "confirmDiscardChangesTitle": "¿Estás seguro de que deseas descartar estos cambios?",
+  "confirmIdentifierDeletionText": "¿Estás seguro de que deseas eliminar este identificador?",
   "contactSection": "Detalles de Contacto",
-  "createNewPatient": "Create new patient",
-  "dateOfBirthLabelText": "Date of birth",
-  "deathCauseRequired": "Cause of death is required",
-  "deathDateInFuture": "Death date cannot be in future",
-  "deathDateInputLabel": "Date of death",
-  "deathDateRequired": "Death date is required",
-  "deathdayInvalidDate": "Death date and time cannot be before the birthday",
-  "deathdayIsRequired": "Death date is required when the patient is marked as deceased.",
+  "createNewPatient": "Crear nuevo paciente",
+  "dateOfBirthLabelText": "Fecha de nacimiento",
+  "deathCauseRequired": "La causa de muerte es obligatoria",
+  "deathDateInFuture": "La fecha de fallecimiento no puede ser en el futuro",
+  "deathDateInputLabel": "Fecha de fallecimiento",
+  "deathDateRequired": "La fecha de nacimiento es obligatoria",
+  "deathdayInvalidDate": "La fecha y hora del fallecimiento no pueden ser anteriores a la fecha de nacimiento",
+  "deathdayIsRequired": "La fecha de fallecimiento es obligatoria cuando el paciente se marca como fallecido",
   "deathdayNotInTheFuture": "",
   "deathSection": "Información de Fallecimiento",
-  "deathTimeFormatInvalid": "Time format is invalid",
-  "deathTimeFormatRequired": "Time format is required",
-  "deathTimeInvalid": "Time doesn't match the format 'hh:mm'",
-  "deathTimeRequired": "Death time is required",
-  "deleteIdentifierModalHeading": "Remove identifier?",
-  "deleteIdentifierModalText": " has a value of ",
+  "deathTimeFormatInvalid": "El formato de hora es inválido",
+  "deathTimeFormatRequired": "El formato de hora es obligatorio",
+  "deathTimeInvalid": "La hora no coincide con el formato 'hh:mm'",
+  "deathTimeRequired": "La hora de fallecimiento es requerida",
+  "deleteIdentifierModalHeading": "¿Eliminar identificador?",
+  "deleteIdentifierModalText": "tiene un valor de",
   "deleteIdentifierTooltip": "Eliminar",
   "deleteRelationshipTooltipText": "Eliminar",
   "demographicsSection": "Información Básica",
@@ -43,45 +43,45 @@
   "editIdentifierTooltip": "Editar",
   "editPatientDetails": "Modificar los datos del paciente",
   "editPatientDetailsBreadcrumb": "Editar detalles del paciente",
-  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "enterNonCodedCauseOfDeath": "Ingresar causa del fallecimiento no-codificada",
   "error": "Error",
-  "errorFetchingCodedCausesOfDeath": "Error fetching coded causes of death",
+  "errorFetchingCodedCausesOfDeath": "Error al obtener causas del fallecimiento codificadas",
   "errorFetchingOrderedFields": "Ocurrió un error al obtener campos ordenados para la jerarquía de direcciones",
   "estimatedAgeInMonthsLabelText": "Edad estimada en meses",
   "estimatedAgeInYearsLabelText": "Edad estimada en años",
   "familyNameLabelText": "Apellidos",
   "familyNameRequired": "Apellidos es obligatorio",
   "female": "Femenino",
-  "fieldsWithErrors": "The following fields have errors: ",
+  "fieldsWithErrors": "Los siguientes campos tienen errores:",
   "fullNameLabelText": "Nombre y Apellidos",
   "genderLabelText": "Sexo",
   "genderRequired": "El sexo es obligatorio",
-  "genderUnspecified": "Gender unspecified",
+  "genderUnspecified": "Género no especificado",
   "givenNameLabelText": "Nombre",
   "givenNameRequired": "El nombre es obligatorio",
   "identifierValueRequired": "El valor del identificador es obligatorio",
   "idFieldLabelText": "Identificadores",
   "IDInstructions": "Selecciona los identificadores que te gustaría agregar para este paciente:",
-  "invalidEmail": "Invalid email",
+  "invalidEmail": "Email inválido",
   "invalidInput": "Entrada no válida",
-  "isDeadInputLabel": "Is dead",
+  "isDeadInputLabel": "Está fallecido",
   "jumpTo": "Ir a",
   "male": "Masculino",
   "middleNameLabelText": "Segundo Nombre",
-  "negativeMonths": "Estimated months cannot be negative",
-  "negativeYears": "Estimated years cannot be negative",
+  "negativeMonths": "Los meses estimados no pueden ser negativos",
+  "negativeYears": "Los años estimados no pueden ser negativos",
   "no": "No",
-  "nonCodedCauseOfDeath": "Non-coded cause of death",
-  "nonCodedCauseOfDeathRequired": "Cause of death is required",
-  "nonsensicalYears": "Estimated years cannot be more than 140",
+  "nonCodedCauseOfDeath": "Causa del fallecimiento no-codificada",
+  "nonCodedCauseOfDeathRequired": "La causa del fallecimiento es obligatoria",
+  "nonsensicalYears": "Los años estimados no pueden ser mayores a 140",
   "numberInNameDubious": "Número en nombre es dudoso",
   "obsFieldUnknownDatatype": "El concepto para el campo de observación '{{fieldDefinitionId}}' tiene un tipo de datos desconocido '{{datatypeName}}'",
   "optional": "Opcional",
   "other": "Otro",
   "patientNameKnown": "¿Se sabe el nombre del paciente?",
   "patientRegistrationBreadcrumb": "Registro de Pacientes",
-  "refreshOrContactAdmin": "Try refreshing the page or contact your system administrator",
-  "registerPatient": "Register patient",
+  "refreshOrContactAdmin": "Intente refrescar la página o contactar al administrador de tu sistema",
+  "registerPatient": "Registrar paciente",
   "registerPatientSuccessSnackbarSubtitle": "El paciente ahora se puede encontrar buscándolo por su nombre o número de identificación",
   "registerPatientSuccessSnackbarTitle": "Nuevo paciente creado",
   "registrationErrorSnackbarTitle": "Error en el registro del paciente",
@@ -91,9 +91,9 @@
   "relationshipRemovedText": "Relación eliminada",
   "relationshipsSection": "Relaciones",
   "relationshipToPatient": "Relación con el paciente",
-  "relativeFullNameLabelText": "Full name",
+  "relativeFullNameLabelText": "Nombre completo",
   "relativeNamePlaceholder": "Nombre Apellido",
-  "removeIdentifierButton": "Remove Identifier",
+  "removeIdentifierButton": "Eliminar identificador",
   "resetIdentifierTooltip": "Resetear",
   "restoreRelationshipActionButton": "Deshacer",
   "searchAddress": "Buscar dirección",
@@ -102,15 +102,15 @@
   "sexFieldLabelText": "Sexo",
   "source": "Fuente",
   "submitting": "Enviando",
-  "timeFormat": "Time Format",
-  "timeOfDeathInputLabel": "Time of death (hh:mm)",
-  "unableToFetch": "Unable to fetch person attribute type - {{personattributetype}}",
+  "timeFormat": "Formato de hora",
+  "timeOfDeathInputLabel": "Hora del fallecimiento (hh:mm)",
+  "unableToFetch": "No se puede obtener el tipo de atributo de persona - {{personattributetype}}",
   "unknown": "Desconocido",
   "unknownPatientAttributeType": "El tipo de atributo del paciente tiene un formato desconocido {{personAttributeTypeFormat}}",
-  "updatePatient": "Update patient",
+  "updatePatient": "Actualizar paciente",
   "updatePatientErrorSnackbarTitle": "Error al actualizar los detalles del paciente",
   "updatePatientSuccessSnackbarSubtitle": "La información del paciente se ha actualizado correctamente",
   "updatePatientSuccessSnackbarTitle": "Detalles del paciente actualizados",
-  "yearsEstimateRequired": "Estimated years required",
+  "yearsEstimateRequired": "Los años estimados son obligatorios",
   "yes": "Sí"
 }
diff --git a/packages/esm-patient-registration-app/translations/fr.json b/packages/esm-patient-registration-app/translations/fr.json
index acf75badb..c7958fef2 100644
--- a/packages/esm-patient-registration-app/translations/fr.json
+++ b/packages/esm-patient-registration-app/translations/fr.json
@@ -4,7 +4,7 @@
   "allFieldsRequiredText": "Tous les champs sont requis sauf si explicitement indiqués facultatifs",
   "autoGeneratedPlaceholderText": "Généré automatiquement",
   "birthdayNotInTheFuture": "La date de naissance ne peut pas être dans le futur",
-  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
+  "birthdayNotOver140YearsAgo": "La date de naissance ne peut être antérieure à 140 ans",
   "birthdayRequired": "La date de naissance est requise",
   "birthFieldLabelText": "Naissance",
   "cancel": "Annuler",
@@ -15,26 +15,26 @@
   "codedPersonAttributeNoAnswerSet": "Le champ d'attribut de personne '{{codedPersonAttributeFieldId}}' est de type 'codé' mais a été défini sans UUID d'ensemble de concepts de réponse. La clé 'answerConceptSetUuid' est requise.",
   "configure": "Configurer",
   "configureIdentifiers": "Configurer les identifiants",
-  "confirmDiscardChangesBody": "Your unsaved changes will be lost if you proceed to discard the form",
-  "confirmDiscardChangesTitle": "Are you sure you want to discard these changes?",
+  "confirmDiscardChangesBody": " Vos modifications non enregistrées seront perdues si vous supprimez le formulaire.",
+  "confirmDiscardChangesTitle": " Êtes-vous sûr de vouloir annuler ces modifications ?",
   "confirmIdentifierDeletionText": "Voulez-vous vraiment supprimer cet identifiant?",
   "contactSection": "Coordonnées du contact",
   "createNewPatient": "Créer un nouveau patient",
   "dateOfBirthLabelText": "Date de naissance",
   "deathCauseRequired": "La date du décès est requise",
-  "deathDateInFuture": "Death date cannot be in future",
+  "deathDateInFuture": "La date de décès ne peut être dans le future",
   "deathDateInputLabel": "Date du décès",
   "deathDateRequired": "La date du décès est requise",
-  "deathdayInvalidDate": "Death date and time cannot be before the birthday",
-  "deathdayIsRequired": "Death date is required when the patient is marked as deceased.",
+  "deathdayInvalidDate": "La date et l'heure de décès ne peuvent être antérieures à la date de naissance",
+  "deathdayIsRequired": "La date de décès est obligatoire quand le patient est déclaré décédé",
   "deathdayNotInTheFuture": "",
   "deathSection": "Informations sur le décès",
-  "deathTimeFormatInvalid": "Time format is invalid",
-  "deathTimeFormatRequired": "Time format is required",
-  "deathTimeInvalid": "Time doesn't match the format 'hh:mm'",
-  "deathTimeRequired": "Death time is required",
+  "deathTimeFormatInvalid": "Format de temps invalide",
+  "deathTimeFormatRequired": "Un format de temps est obligatoire",
+  "deathTimeInvalid": "Le temps ne correspond pas au format 'hh:mm'",
+  "deathTimeRequired": "L'heure de décès est requis",
   "deleteIdentifierModalHeading": "Supprimer l'identifiant?",
-  "deleteIdentifierModalText": " has a value of ",
+  "deleteIdentifierModalText": "a une valeur de",
   "deleteIdentifierTooltip": "Supprimer",
   "deleteRelationshipTooltipText": "Supprimer",
   "demographicsSection": "Informations basiques",
@@ -43,20 +43,20 @@
   "editIdentifierTooltip": "Éditer",
   "editPatientDetails": "Modifier les détails du patient",
   "editPatientDetailsBreadcrumb": "Modifier les détails du patient",
-  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "enterNonCodedCauseOfDeath": " Entrez la cause du décès non codée",
   "error": "Erreur",
-  "errorFetchingCodedCausesOfDeath": "Error fetching coded causes of death",
+  "errorFetchingCodedCausesOfDeath": " Erreur lors de la récupération des causes de décès codées",
   "errorFetchingOrderedFields": "Une erreur s'est produite lors de la récupération des champs ordonnés pour la hiérarchie d'adresse",
   "estimatedAgeInMonthsLabelText": "Âge estimé en mois",
   "estimatedAgeInYearsLabelText": "Âge estimé en années",
   "familyNameLabelText": "Nom de famille",
   "familyNameRequired": "Le nom de famille est requis",
   "female": "Féminin",
-  "fieldsWithErrors": "The following fields have errors: ",
+  "fieldsWithErrors": "Ces lignes suivantes contiennent des erreurs:",
   "fullNameLabelText": "Nom et prénom",
   "genderLabelText": "Sexe",
   "genderRequired": "Le genre est requis",
-  "genderUnspecified": "Gender unspecified",
+  "genderUnspecified": "Genre non précisé",
   "givenNameLabelText": "Prénom",
   "givenNameRequired": "Le prénom est requis",
   "identifierValueRequired": "La valeur de l'identifiant est requise",
@@ -68,19 +68,19 @@
   "jumpTo": "Aller à",
   "male": "Masculin",
   "middleNameLabelText": "Deuxième Prénom",
-  "negativeMonths": "Estimated months cannot be negative",
-  "negativeYears": "Estimated years cannot be negative",
+  "negativeMonths": "L'estimation du mois ne peut être une valeur négative",
+  "negativeYears": "L'estimation de l'année ne peut être une valeur négative",
   "no": "Non",
-  "nonCodedCauseOfDeath": "Non-coded cause of death",
-  "nonCodedCauseOfDeathRequired": "Cause of death is required",
-  "nonsensicalYears": "Estimated years cannot be more than 140",
+  "nonCodedCauseOfDeath": "Cause de décès non-codé",
+  "nonCodedCauseOfDeathRequired": "La cause du décès est requise",
+  "nonsensicalYears": "L'âge estimé ne peut excéder 140 ans",
   "numberInNameDubious": "Le chiffre dans le nom est suspect",
   "obsFieldUnknownDatatype": "Le concept pour le champ d'observation '{{fieldDefinitionId}}' a un type de données inconnu '{{datatypeName}}'",
   "optional": "Optionnel",
   "other": "Autre",
   "patientNameKnown": "Le nom du patient est-il connu?",
   "patientRegistrationBreadcrumb": "Enregistrement du patient",
-  "refreshOrContactAdmin": "Try refreshing the page or contact your system administrator",
+  "refreshOrContactAdmin": "Essayer de rafraichir la page ou contacter l'administrateur",
   "registerPatient": "Enregistrer un patient",
   "registerPatientSuccessSnackbarSubtitle": "Le patient peut maintenant être trouvé en le recherchant par son nom ou son numéro d'identification",
   "registerPatientSuccessSnackbarTitle": "Nouveau patient créé",
@@ -102,15 +102,15 @@
   "sexFieldLabelText": "Sexe",
   "source": "Source",
   "submitting": "En cours de soumission",
-  "timeFormat": "Time Format",
-  "timeOfDeathInputLabel": "Time of death (hh:mm)",
-  "unableToFetch": "Unable to fetch person attribute type - {{personattributetype}}",
+  "timeFormat": "Format de temps",
+  "timeOfDeathInputLabel": "Heure de décès (hh:mm)",
+  "unableToFetch": " Impossible de récupérer le type d'attribut de la personne - {{personattributetype}}",
   "unknown": "Inconnu",
   "unknownPatientAttributeType": "Le type d'attribut de patient a un format inconnu {{personAttributeTypeFormat}}",
   "updatePatient": "Mettre à jour le patient",
   "updatePatientErrorSnackbarTitle": "Échec de la mise à jour des détails du patient",
   "updatePatientSuccessSnackbarSubtitle": "Les informations du patient ont été mises à jour avec succès",
   "updatePatientSuccessSnackbarTitle": "Détails du patient mis à jour",
-  "yearsEstimateRequired": "Estimated years required",
+  "yearsEstimateRequired": "estimation de l'année obligatoire",
   "yes": "Oui"
 }
diff --git a/packages/esm-patient-registration-app/translations/he.json b/packages/esm-patient-registration-app/translations/he.json
index 49f5e38f0..8bfd511eb 100644
--- a/packages/esm-patient-registration-app/translations/he.json
+++ b/packages/esm-patient-registration-app/translations/he.json
@@ -93,7 +93,7 @@
   "relationshipToPatient": "קשר למטופל",
   "relativeFullNameLabelText": "Full name",
   "relativeNamePlaceholder": "שם פרטי שם משפחה",
-  "removeIdentifierButton": "Remove Identifier",
+  "removeIdentifierButton": "Remove identifier",
   "resetIdentifierTooltip": "איפוס",
   "restoreRelationshipActionButton": "ביטול",
   "searchAddress": "חיפוש כתובת",
diff --git a/packages/esm-patient-registration-app/translations/km.json b/packages/esm-patient-registration-app/translations/km.json
index c9aba5f11..865a427a4 100644
--- a/packages/esm-patient-registration-app/translations/km.json
+++ b/packages/esm-patient-registration-app/translations/km.json
@@ -93,7 +93,7 @@
   "relationshipToPatient": "ការទាក់ទងទៅនឹងអ្នកជំងឺ",
   "relativeFullNameLabelText": "Full name",
   "relativeNamePlaceholder": "នាមត្រកូលនាមខ្លួន",
-  "removeIdentifierButton": "Remove Identifier",
+  "removeIdentifierButton": "Remove identifier",
   "resetIdentifierTooltip": "រៀបចំឡើងវិញ",
   "restoreRelationshipActionButton": "វិលត្រឡប់មកដើមវិញ",
   "searchAddress": "ស្វែងរកអាសយដ្ឋាន",
diff --git a/packages/esm-patient-registration-app/translations/zh.json b/packages/esm-patient-registration-app/translations/zh.json
index 7008353b0..ac7fedd3c 100644
--- a/packages/esm-patient-registration-app/translations/zh.json
+++ b/packages/esm-patient-registration-app/translations/zh.json
@@ -93,7 +93,7 @@
   "relationshipToPatient": "与患者的关系",
   "relativeFullNameLabelText": "Full name",
   "relativeNamePlaceholder": "名字 姓氏",
-  "removeIdentifierButton": "Remove Identifier",
+  "removeIdentifierButton": "Remove identifier",
   "resetIdentifierTooltip": "重置",
   "restoreRelationshipActionButton": "撤销",
   "searchAddress": "搜索地址",
diff --git a/packages/esm-patient-registration-app/translations/zh_CN.json b/packages/esm-patient-registration-app/translations/zh_CN.json
index 7008353b0..ac7fedd3c 100644
--- a/packages/esm-patient-registration-app/translations/zh_CN.json
+++ b/packages/esm-patient-registration-app/translations/zh_CN.json
@@ -93,7 +93,7 @@
   "relationshipToPatient": "与患者的关系",
   "relativeFullNameLabelText": "Full name",
   "relativeNamePlaceholder": "名字 姓氏",
-  "removeIdentifierButton": "Remove Identifier",
+  "removeIdentifierButton": "Remove identifier",
   "resetIdentifierTooltip": "重置",
   "restoreRelationshipActionButton": "撤销",
   "searchAddress": "搜索地址",
diff --git a/packages/esm-service-queues-app/translations/es.json b/packages/esm-service-queues-app/translations/es.json
index a172806bc..da09cae24 100644
--- a/packages/esm-service-queues-app/translations/es.json
+++ b/packages/esm-service-queues-app/translations/es.json
@@ -2,15 +2,15 @@
   "actions": "Actions",
   "activeVisits": "Active Visits",
   "activeVisitsNotInQueue": "Active visits not in queue",
-  "addAProviderQueueRoom": "Add a provider queue room?",
+  "addAProviderQueueRoom": "¿Agregar una sala de espera para el proveedor?",
   "addEntry": "Add entry",
   "addisitToQueueTooltip": "Add to queue",
-  "addNewQueueService": "Add New Queue Service",
+  "addNewQueueService": "Añadir Nuevo Servicio de Cola",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
   "addNewServiceRoom": "Add new service room",
   "addPatientToQueue": "Add patient to queue",
-  "addProviderQueueRoom": "Add provider queue room",
+  "addProviderQueueRoom": "Añadir Sala de Espera del Proveedor",
   "addQueue": "Add queue",
   "addQueueName": "Please add a queue name",
   "addQueueRoom": "Add queue room",
@@ -26,10 +26,10 @@
   "and": "And",
   "anotherVisitType": "Start another visit type",
   "any": "Any",
-  "applyFilters": "Apply filters",
+  "applyFilters": "Aplicar filtros",
   "averageWaitTime": "Average wait time today",
   "backToScheduledVisits": "Back to scheduled visits",
-  "backToSearchResults": "Back to search results",
+  "backToSearchResults": "Volver a los resultados de búsqueda",
   "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
@@ -41,50 +41,50 @@
   "chooseRoom": "Select a room",
   "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
-  "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
+  "clearAllQueueEntriesWarningMessage": "Limpiar todas las entradas en la cola eliminará todos los pacientes de las colas",
   "clearQueue": "Clear queue",
   "clinicMetrics": "Clinic metrics",
   "configurePriorities": "Please configure priorities to continue.",
   "configureServices": "Please configure services to continue.",
   "configureStatus": "Please configure status to continue.",
-  "confirmDeleteQueueEntry": "Are you sure you want to delete this queue entry?",
-  "confirmMoveBackQueueAndStatus": "Are you sure you want to move patient back to queue \"{{queue}}\" with status \"{{status}}\"?",
-  "confirmMoveBackStatus": "Are you sure you want to move patient back to status \"{{status}}\"?",
-  "confirmRemovePatientFromQueue": "Are you sure you want to remove this patient from this queue?",
-  "currentValueFormatted": "{{value}} (Current)",
+  "confirmDeleteQueueEntry": "¿Está seguro de que desea eliminar esta entrada de cola?",
+  "confirmMoveBackQueueAndStatus": "¿Está seguro de que desea mover el paciente atrás a la cola \"{{queue}}\" con el estado \"{{status}}\"?",
+  "confirmMoveBackStatus": "¿Está seguro de que desea mover el paciente de regreso al estado \"{{status}}\"?",
+  "confirmRemovePatientFromQueue": "¿Está seguro de que desea eliminar este paciente de esta cola?",
+  "currentValueFormatted": "{{value}} (Actual)",
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
   "dateAndTimeOfVisit": "Date and time of visit",
   "dateOfBirth": "Date of birth",
-  "delete": "Delete",
-  "deleteQueueEntry": "Delete queue entry",
+  "delete": "Eliminar",
+  "deleteQueueEntry": "Eliminar entrada de la cola",
   "discard": "Discard",
   "dose": "Dose",
-  "edit": "Edit",
+  "edit": "Editar",
   "editPatientDetails": "Edit patient details",
-  "editQueueEntry": "Edit queue entry",
-  "editQueueEntryInstruction": "Edit fields of existing queue entry",
+  "editQueueEntry": "Editar entrada de la colaq",
+  "editQueueEntryInstruction": "Editar campos de la entrada de la cola existente",
   "encounterType": "Encounter type",
   "endAgeRangeInvalid": "End age range is not valid",
   "endDate": "End date",
   "endVisit": "End Visit",
   "endVisitWarningMessage": "Ending this visit will remove this patient from the queue and will not allow you to fill another encounter form for this patient",
-  "enterCommentHere": "Enter Comment here",
+  "enterCommentHere": "Ingresar Comentario Aquí",
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
-  "errorLoadingQueueEntries": "Error loading queue entries",
+  "errorFetchingAppointments": "Error al obtener las citas",
+  "errorLoadingQueueEntries": "Error al cargar las entradas de la cola",
   "errorPostingToScreen": "Error posting to screen",
   "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
+  "failedToLoadRecommendedVisitTypes": "Fallo al cargar tipos de visita recomendados",
   "female": "Female",
   "femaleLabelText": "Female",
   "fields": "of the following fields",
   "filter": "Filter (1)",
-  "filterByService": "Filter by service :",
-  "filterByStatus": "Filter by status :",
+  "filterByService": "Filtrar por servicio:",
+  "filterByStatus": "Filtrar por estado:",
   "filterTable": "Filter table",
   "firstName": "First name",
   "firstNameSort": "First name (a-z)",
@@ -93,24 +93,24 @@
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
-  "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
+  "hourAndMinuteFormatted": "{{hours}} hora(s) y {{minutes}} minutos)",
   "idNumber": "ID Number",
   "indication": "Indication",
-  "invalidQueue": "Invalid Queue",
-  "invalidtableConfig": "Invalid table configuration",
+  "invalidQueue": "Cola Inválida",
+  "invalidtableConfig": "Tabla de configuración inválida",
   "lastEncounter": "Last encounter",
   "lastName": "Last name",
   "lastNameSort": "Last name (a-z)",
   "lastVisit": "Last visit",
   "lastVisitDate": "Date",
   "loading": "Loading...",
-  "location": "Location",
+  "location": "Ubicación",
   "male": "Male",
   "maleLabelText": "Male",
   "match": "Match",
   "medications": "Medications",
   "middleName": "Middle name",
-  "minuteFormatted": "{{minutes}} minute(s)",
+  "minuteFormatted": "{{minutes}} minuto(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
   "missingPriority": "Please select a priority",
@@ -118,16 +118,16 @@
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
-  "missingService": "Missing service",
+  "missingService": "Servicio faltante",
   "missingVisitType": "Missing visit type",
-  "modifyDefaultValue": "Modify default value",
+  "modifyDefaultValue": "Modificar valor por defecto",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
-  "nextPage": "Next page",
+  "nextPage": "Siguiente página",
   "noActiveVisitsForLocation": "There are no active visits to display for this location.",
   "noAppointmentsFound": "No appointments found",
-  "noColumnsDefined": "No table columns defined. Check Configuration",
+  "noColumnsDefined": "No hay columnas de la tabla definidas. Revisar Configuración",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
@@ -137,18 +137,18 @@
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
-  "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
-  "noPrioritiesForServiceTitle": "No priorities available",
+  "noPrioritiesForService": "El servicio seleccionado no tiene prioridades permitidas. Este es un error de configuración. Por favor, contacte a su administrador del sistema.",
+  "noPrioritiesForServiceTitle": "No hay prioridades disponibles",
   "noPriorityFound": "No priority found",
   "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
-  "notableConfig": "No table configuration",
+  "notableConfig": "No hay tabla de configuración",
   "notes": "Notes",
   "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
+  "noVisitTypesMatchingSearch": "No existen tipos de visita que coincidan con el texto a buscar",
   "noVitalsFound": "No vitals found",
   "oldest": "Oldest first",
   "onTime": "On time",
@@ -157,17 +157,17 @@
   "orderIndefiniteDuration": "Indefinite duration",
   "orInProperFormat": "Or",
   "orPatientName": "OR the patient's name(s)",
-  "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
+  "patientAge": "Edad",
+  "patientAlreadyInQueue": "El paciente ya está en la cola",
   "patientAttendingService": "Patient attending service",
   "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
   "patientNotInQueue": "The patient is not in the queue",
-  "patientRemoved": "Patient removed",
-  "patientRemovedFailed": "Error removing patient from queue",
-  "patientRemovedSuccessfully": "Paient removed from queue successfully",
+  "patientRemoved": "Paciente removido",
+  "patientRemovedFailed": "Error al eliminar el paciente de la cola",
+  "patientRemovedSuccessfully": "Paciente eliminado de la cola con éxito",
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
@@ -176,44 +176,44 @@
   "pleaseSelectLocation": "Please select a location",
   "pleaseSelectService": "Please select a service",
   "postCode": "Post code",
-  "previousPage": "Previous page",
+  "previousPage": "Página anterior",
   "previousVisit": "Previous visit",
   "primaryHelperText": "Search for a patient",
   "priority": "Priority",
-  "priorityComment": "Priority comment",
-  "priorityIsRequired": "Priority is required",
+  "priorityComment": "Comentario de prioridad",
+  "priorityIsRequired": "La prioridad es obligatoria",
   "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
-  "queueAddedSuccessfully": "Queue added successfully",
-  "queueEntryAddedSuccessfully": "Queue entry added successfully",
+  "queueAddedSuccessfully": "La cola fue añadida con éxito",
+  "queueEntryAddedSuccessfully": "La entrada en la cola fue añadida con éxito",
   "queueEntryAddFailed": "Error adding queue entry status",
-  "queueEntryDeleteFailed": "Error deleting queue entry",
-  "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
-  "queueEntryEdited": "Queue entry edited",
-  "queueEntryEditedSuccessfully": "Queue entry edited successfully",
-  "queueEntryEditingFailed": "Error editing queue entry",
+  "queueEntryDeleteFailed": "Error al eliminar la entrada de la cola",
+  "queueEntryDeleteSuccessful": "La entrada de la cola fue eliminada con éxito",
+  "queueEntryEdited": "Entrada de la cola editada",
+  "queueEntryEditedSuccessfully": "La entrada de la cola fue editada con éxito",
+  "queueEntryEditingFailed": "Error al editar entrada de la cola",
   "queueEntryError": "Error adding patient to the queue",
   "queueEntryRemoved": "Queue entry removed",
   "queueEntryRemovedSuccessfully": "",
   "queueEntryStatusUpdateFailed": "Error updating queue entry status",
-  "queueEntryTransitioned": "Queue entry transitioned",
-  "queueEntryTransitionedSuccessfully": "Queue entry transitioned successfully",
-  "queueEntryTransitionFailed": "Error transitioning queue entry",
-  "queueEntryTransitionUndoFailed": "Error undoing transition",
-  "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
+  "queueEntryTransitioned": "Entrada de la cola trasladada",
+  "queueEntryTransitionedSuccessfully": "Entrada de la cola trasladada exitosamente",
+  "queueEntryTransitionFailed": "Error al trasladar la entrada de la cola",
+  "queueEntryTransitionUndoFailed": "Error al deshacer el traslado",
+  "queueEntryTransitionUndoSuccessful": "Traslado de la entrada de la cola deshecho con éxito",
   "queueEntryUpdateFailed": "Error updating queue entry",
   "queueEntryUpdateSuccessfully": "Queue Entry Updated Successfully",
-  "queueLocation": "Queue location",
-  "queueLocationRequired": "Queue location is required",
+  "queueLocation": "Ubicación de la cola",
+  "queueLocationRequired": "La ubicación de la cola es obligatoria",
   "queueName": "Queue name",
   "queuePriority": "Queue priority",
   "queueRoom": "Queue room",
-  "queueRoomAddedSuccessfully": "Queue room added successfully",
+  "queueRoomAddedSuccessfully": "Sala de espera añadida con éxito",
   "queueRoomAddFailed": "Error adding queue room",
   "queueRoomName": "Queue room name",
   "queueRoomUpdatedSuccessfully": "Queue room updated successfully",
-  "queuesClearedSuccessfully": "Queues cleared successfully",
+  "queuesClearedSuccessfully": "Colas limpiadas con éxito",
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
@@ -222,8 +222,8 @@
   "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit?",
-  "removePatient": "Remove patient",
-  "removePatientFromQueue": "Remove patient from queue",
+  "removePatient": "Eliminar paciente",
+  "removePatientFromQueue": "Eliminar paciente de la cola",
   "removeQueueEntryError": "Error removing queue entry",
   "requeue": "Requeue",
   "retainLocation": "Retain location",
@@ -237,15 +237,15 @@
   "searchboxPlaceholder": "Search for a patient name or ID number",
   "searchForAVisitType": "Search for a visit type",
   "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
+  "searchPatient": "Buscar Paciente",
   "searchThisList": "Search this list",
   "secondaryHelperText": "Type the patient's name or unique ID number",
-  "selectALocation": "Select a location",
+  "selectALocation": "Seleccionar una ubicación",
   "selectAVisitType": "Select visit type",
   "selectFacility": "Select a facility",
   "selectOption": "Select an option",
   "selectProgramType": "Select program type",
-  "selectQueue": "Select a queue",
+  "selectQueue": "Seleccionar una cola",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
@@ -255,7 +255,7 @@
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
-  "serviceIsRequired": "Service is required",
+  "serviceIsRequired": "El servicio es obligatorio",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
   "sex": "Sex",
@@ -268,35 +268,35 @@
   "startVisitError": "Error starting visit",
   "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
-  "statusIsRequired": "Status is required",
-  "submitting": "Submitting...",
+  "statusIsRequired": "El estado es obligatorio",
+  "submitting": "Enviando...",
   "success": "Success",
   "temperature": "Temperature",
   "ticketNumber": "Ticket number",
   "time": "Time",
-  "timeCannotBeInFuture": "Time cannot be in the future",
-  "timeCannotBePriorToPreviousQueueEntry": "Time cannot be before start of previous queue entry: {{time}}",
-  "timeOfTransition": "Time of transition",
+  "timeCannotBeInFuture": "La hora no puede estar en el futuro",
+  "timeCannotBePriorToPreviousQueueEntry": "La hora no puede estar antes del inicio de la anterior entrada de la cola: {{time}}",
+  "timeOfTransition": "Hora del traslado",
   "tirageNotYetCompleted": "Triage has not yet been completed",
   "today": "Today",
-  "totalPatients": "Total Patients",
-  "transition": "Transition",
-  "TransitionLatestQueueEntry": "Transition patient to latest queue",
-  "transitionPatient": "Transition patient",
-  "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
+  "totalPatients": "Total de Pacientes",
+  "transition": "Traslado",
+  "TransitionLatestQueueEntry": "Paciente trasladado a la última cola",
+  "transitionPatient": "Trasladar paciente",
+  "transitionPatientStatusOrQueue": "Seleccione un nuevo estado o cola para el paciente a trasladar",
   "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",
+  "undoQueueEntryTransitionSuccess": "Traslado deshecho con éxito",
+  "undoTransition": "Deshacer traslado",
+  "unexpectedServerResponse": "Respuesta del servidor no esperada",
   "unknown": "Unknown",
   "updateEntry": "Update entry",
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
-  "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
+  "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid no configurado",
   "visitStartTime": "Visit Time",
-  "visitTabs": "Visit tabs",
+  "visitTabs": "Pestañas de visita",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
diff --git a/packages/esm-service-queues-app/translations/fr.json b/packages/esm-service-queues-app/translations/fr.json
index 071bd4c38..7996b92d0 100644
--- a/packages/esm-service-queues-app/translations/fr.json
+++ b/packages/esm-service-queues-app/translations/fr.json
@@ -2,7 +2,7 @@
   "actions": "Actions",
   "activeVisits": "Visites Actives",
   "activeVisitsNotInQueue": "Visites actives non dans la file d'attente",
-  "addAProviderQueueRoom": "Ajouter une salle d'attente pour les prestataires des service?",
+  "addAProviderQueueRoom": "Ajouter une salle d'attente pour les prestataires de service?",
   "addEntry": "Ajouter une entrée",
   "addisitToQueueTooltip": "Ajouter",
   "addNewQueueService": "Ajouter un nouveau service de file d'attente",
@@ -18,7 +18,7 @@
   "addQueueRoomService": "Veuillez ajouter un service de salle de file d'attente",
   "addRoom": "Ajouter une salle",
   "addToQueue": "Ajouter à la file d'attente",
-  "addVisitToQueue": "Add Visit To Queue?",
+  "addVisitToQueue": " Ajouter une visite à la file d’attente?",
   "advancedSearch": "Recherche avancée",
   "age": "Âge",
   "alistOfClients": "Liste de patients attendus",
@@ -44,13 +44,13 @@
   "clearAllQueueEntriesWarningMessage": "L'effacement de toutes les entrées de la file d'attente supprimera tous les patients de la file d'attente.",
   "clearQueue": "Effacer la file d'attente",
   "clinicMetrics": "Parametres de I'Etablissement de soins",
-  "configurePriorities": "Please configure priorities to continue.",
-  "configureServices": "Please configure services to continue.",
-  "configureStatus": "Please configure status to continue.",
-  "confirmDeleteQueueEntry": "Are you sure you want to delete this queue entry?",
-  "confirmMoveBackQueueAndStatus": "Are you sure you want to move patient back to queue \"{{queue}}\" with status \"{{status}}\"?",
-  "confirmMoveBackStatus": "Are you sure you want to move patient back to status \"{{status}}\"?",
-  "confirmRemovePatientFromQueue": "Are you sure you want to remove this patient from this queue?",
+  "configurePriorities": " Veuillez configurer les priorités pour pouvoir continuer.",
+  "configureServices": " Veuillez configurer les services pour pouvoir continuer.",
+  "configureStatus": " Veuillez configurer les statuts pour pouvoir continuer.",
+  "confirmDeleteQueueEntry": " Êtes-vous sûr de vouloir supprimer cette entrée de file d’attente ?",
+  "confirmMoveBackQueueAndStatus": " Êtes-vous sûr de vouloir déplacer le patient vers la file d'attente « {{queue}} » avec le statut « {{status}} » ?",
+  "confirmMoveBackStatus": " Êtes-vous sûr de vouloir ramener le patient au statut « {{status}} » ?",
+  "confirmRemovePatientFromQueue": " Êtes-vous sûr de vouloir supprimer ce patient de cette file d’attente ?",
   "currentValueFormatted": "{{value}} (Actuel)",
   "currentVisit": "Visite en cours",
   "date": "Date",
@@ -64,21 +64,21 @@
   "edit": "Modifier",
   "editPatientDetails": "Modifier les détails du patient",
   "editQueueEntry": "Modifier l'entrée dans la file d'attente.",
-  "editQueueEntryInstruction": "Edit fields of existing queue entry",
+  "editQueueEntryInstruction": " Modifier les champs d'une file d'attente existante",
   "encounterType": "Type de Rencontre",
   "endAgeRangeInvalid": "La fin de la tranche d'âge n'est pas valide",
   "endDate": "Date de fin",
   "endVisit": "Fin de la visite",
-  "endVisitWarningMessage": "Ending this visit will not allow you to fill another encounter form for this patient",
-  "enterCommentHere": "Enter Comment here",
+  "endVisitWarningMessage": "En terminant cette visite il ne vous sera pas permis de remplir un autre formulaire de rencontre pour ce patient",
+  "enterCommentHere": "Ecrire un commentaire ici",
   "errorAddingQueue": "Erreur lors de l'ajout de la file d'attente",
-  "errorAddingQueueRoom": "Error adding queue room",
-  "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
-  "errorLoadingQueueEntries": "Error loading queue entries",
-  "errorPostingToScreen": "Error posting to screen",
+  "errorAddingQueueRoom": "Erreur lors de l'ajout d'une salle d'attente",
+  "errorClearingQueues": "Erreur lors de la suppression des files d'attente",
+  "errorFetchingAppointments": " Erreur lors de la récupération des rendez-vous",
+  "errorLoadingQueueEntries": " Erreur lors du chargement des files d'attente",
+  "errorPostingToScreen": " Erreur lors de l'affichage sur l'écran",
   "facility": "Facilité",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
+  "failedToLoadRecommendedVisitTypes": " Échec du chargement des types de visites recommandées",
   "female": "Féminin",
   "femaleLabelText": "Féminin",
   "fields": "des champs suivants",
@@ -88,16 +88,16 @@
   "filterTable": "Filter table",
   "firstName": "Prénom",
   "firstNameSort": "Prénom (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
+  "futureScheduledVisits_one": "{{count}} visites prévues à des dates ultérieures",
+  "futureScheduledVisits_other": "{{count}} visites prévues à des dates ultérieures",
   "gender": "Genre",
   "heartRate": "Fréquence cardiaque",
   "height": "Hauteur",
-  "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
+  "hourAndMinuteFormatted": " {{hours}} heure(s) et {{minutes}} minute(s)",
   "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "File d'attente non valide",
-  "invalidtableConfig": "Invalid table configuration",
+  "invalidtableConfig": "Configuration de table non valide",
   "lastEncounter": "Dernière rencontre",
   "lastName": "Nom de famille",
   "lastNameSort": "Nom de famille (a-z)",
@@ -114,20 +114,20 @@
   "minutes": "Minutes",
   "missingLocation": "L'emplacement est manquant",
   "missingPriority": "Veuillez sélectionner une priorité",
-  "missingQueueName": "Missing queue name",
-  "missingQueueRoom": "Please select a queue room",
-  "missingQueueRoomName": "Missing queue room name",
-  "missingQueueRoomService": "Missing queue room service",
+  "missingQueueName": "Nom de file d'attente manquant",
+  "missingQueueRoom": "Veuillez sélectionner une salle de file d'attente",
+  "missingQueueRoomName": "Nom de salle de file d'attente manquant",
+  "missingQueueRoomService": "Service de salle de file d'attente manquant",
   "missingService": "Service manquant",
-  "missingVisitType": "Missing visit type",
-  "modifyDefaultValue": "Modify default value",
+  "missingVisitType": " Type de visite manquant",
+  "modifyDefaultValue": "Modifier la valeur par défaut",
   "movePatientToNextService": "Déplacer le patient vers le service suivant?",
   "moveToNextService": "Déplacer vers le service suivant",
   "name": "Nom",
   "nextPage": "Page suivante",
   "noActiveVisitsForLocation": "Il n'y a pas de visite en cours pour cet emplacement",
   "noAppointmentsFound": "Aucun rendez-vous trouvé",
-  "noColumnsDefined": "No table columns defined. Check Configuration",
+  "noColumnsDefined": "Aucune colonne de tableau définie. Vérifier la configuration",
   "noEncountersFound": "Aucune rencontre trouvée",
   "noLastEncounter": "Il n'y a pas de dernier rendez-vous à afficher pour ce patient",
   "noLocationsAvailable": "Aucun emplacement disponible",
@@ -137,15 +137,15 @@
   "noPatientsToDisplay": "Aucun patient affiché",
   "noPreviousVisitFound": "Aucune visite précédente trouvée",
   "noPrioritiesConfigured": "Aucune priorité n'est configurée",
-  "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
-  "noPrioritiesForServiceTitle": "No priorities available",
-  "noPriorityFound": "No priority found",
+  "noPrioritiesForService": "Le service sélectionné n'a aucune priorité autorisée. Il s'agit d'une erreur de configuration. Veuillez contacter votre administrateur système.",
+  "noPrioritiesForServiceTitle": "Aucunes priorités disponible",
+  "noPriorityFound": " Aucune priorité trouvée",
   "noResultsFound": "Aucun résultat trouvé",
   "noReturnDate": "There is no return date to display for this patient",
-  "noServicesAvailable": "No services available",
-  "noServicesConfigured": "No services configured",
+  "noServicesAvailable": "Aucun services disponibles",
+  "noServicesConfigured": "Aucun service configuré",
   "noStatusConfigured": "No status configured",
-  "notableConfig": "No table configuration",
+  "notableConfig": "Aucune configuration de table",
   "notes": "Notes",
   "noVisitsNotInQueueFound": "No visits currently not in queue found",
   "noVisitTypesMatchingSearch": "Il n'y a pas de visite correspondante à cette recherche",
@@ -159,16 +159,16 @@
   "orPatientName": "OU le nom(s) du patient",
   "patientAge": "Âge",
   "patientAlreadyInQueue": "Patient déjà dans la file d'attente",
-  "patientAttendingService": "Patient attending service",
+  "patientAttendingService": "Patient en attente de service",
   "patientHasActiveVisit": "Le patient a déjà une visite active",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Liste de patients",
   "patientName": "Nom du patient",
   "patientNotInQueue": "Le patient n'est pas dans la file d'attente",
   "patientRemoved": "Patient enlevé",
-  "patientRemovedFailed": "Error removing patient from queue",
-  "patientRemovedSuccessfully": "Paient removed from queue successfully",
-  "patientRequeued": "Patient has been requeued",
+  "patientRemovedFailed": " Erreur lors de la suppression du patient de la file d'attente",
+  "patientRemovedSuccessfully": "Le patient a été retiré de la file d'attente avec succès",
+  "patientRequeued": "Le patient a été remis dans la file d'attente",
   "patients": "Les patients",
   "patientsCurrentlyInQueue": "Patients actuellement en file d'attente",
   "personalDetails": "Détails personnels",
@@ -187,21 +187,21 @@
   "quantity": "Quantité",
   "queueAddedSuccessfully": "File d'attente ajoutée avec succès",
   "queueEntryAddedSuccessfully": "Entrée dans la file d'attente ajoutée avec succès",
-  "queueEntryAddFailed": "Error adding queue entry status",
-  "queueEntryDeleteFailed": "Error deleting queue entry",
-  "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
-  "queueEntryEdited": "Queue entry edited",
-  "queueEntryEditedSuccessfully": "Queue entry edited successfully",
-  "queueEntryEditingFailed": "Error editing queue entry",
-  "queueEntryError": "Error adding patient to the queue",
-  "queueEntryRemoved": "Queue entry removed",
+  "queueEntryAddFailed": " Erreur lors de l'ajout du statut de la file d'attente ",
+  "queueEntryDeleteFailed": "Erreur lors de la suppression de l'entrée de la file d'attente",
+  "queueEntryDeleteSuccessful": "Entrée de la file d'attente supprimée avec succès ",
+  "queueEntryEdited": "Entrée de la file d'attente affichée",
+  "queueEntryEditedSuccessfully": " Entrée de file d'attente affichée avec succès",
+  "queueEntryEditingFailed": " Erreur lors de l'affichage de l'entrée de la file d'attente",
+  "queueEntryError": " Erreur lors de l'ajout du patient à la file d'attente",
+  "queueEntryRemoved": " Entrée de file d'attente supprimée",
   "queueEntryRemovedSuccessfully": "",
-  "queueEntryStatusUpdateFailed": "Error updating queue entry status",
+  "queueEntryStatusUpdateFailed": " Erreur lors de la mise à jour du statut de l'entrée de la file d'attente",
   "queueEntryTransitioned": "Entrée dans la file d'attente transitionnée",
   "queueEntryTransitionedSuccessfully": "Entrée dans la file d'attente transitionnée avec succès",
   "queueEntryTransitionFailed": "Erreur lors de la transition de l'entrée dans la file d'attente",
   "queueEntryTransitionUndoFailed": "Erreur lors de l'annulation de la transition",
-  "queueEntryTransitionUndoSuccessful": "Annulation de la transition de l'entrée dans la file d'attente réussie",
+  "queueEntryTransitionUndoSuccessful": "Annulation de la transition de l'entrée de la file d'attente réussie",
   "queueEntryUpdateFailed": "Erreur lors de la mise à jour du statut de l'entrée dans la file d'attente",
   "queueEntryUpdateSuccessfully": "Entrée de la file d'attente mise à jour avec succès",
   "queueLocation": "Emplacement de la file d'attente",
@@ -274,14 +274,14 @@
   "temperature": "Température",
   "ticketNumber": "Numéro de Ticket",
   "time": "Temps",
-  "timeCannotBeInFuture": "Time cannot be in the future",
+  "timeCannotBeInFuture": " Le temps ne peut pas être dans le futur",
   "timeCannotBePriorToPreviousQueueEntry": "L’heure ne peut être antérieure au début de la file d’attente précédente: {{time}}",
   "timeOfTransition": "Heure de la transition",
   "tirageNotYetCompleted": "Le triage n'est pas encore terminé",
   "today": "Aujourd'hui",
   "totalPatients": "Nombre total de patients",
   "transition": "Transition",
-  "TransitionLatestQueueEntry": "Transitionner le patient vers la file d'attente la plus récente",
+  "TransitionLatestQueueEntry": "Transfert du patient vers la file d'attente la plus récente",
   "transitionPatient": "Transition du patient",
   "transitionPatientStatusOrQueue": "Sélectionnez un nouveau statut ou une file d'attente vers laquelle le patient doit être transféré.",
   "triageForm": "Formulaire de triage",

From be1f84c98e42c456df7937e9de681651a867617a Mon Sep 17 00:00:00 2001
From: chibongho <cbho@pih.org>
Date: Mon, 30 Sep 2024 12:58:16 -0400
Subject: [PATCH 12/12] (feat) - O3-4044 - Ward App - add support for vertical
 tiling of cards (#1331)

---
 packages/esm-ward-app/src/index.ts            |  8 ++++-
 .../src/ward-view/ward-view.component.tsx     | 29 ++++++++++---------
 .../esm-ward-app/src/ward-view/ward-view.scss | 16 ++++++++++
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/packages/esm-ward-app/src/index.ts b/packages/esm-ward-app/src/index.ts
index 7474a605e..2d6832298 100644
--- a/packages/esm-ward-app/src/index.ts
+++ b/packages/esm-ward-app/src/index.ts
@@ -117,7 +117,13 @@ export function startupApp() {
 
   registerFeatureFlag(
     'bedmanagement-module',
-    'Bed Management Module',
+    'Bed management module',
     'Enables features related to bed management / assignment. Requires the backend bed management module to be installed.',
   );
+
+  registerFeatureFlag(
+    'ward-view-vertical-tiling',
+    'Ward view vertical tiling',
+    'Enable tiling of bed cards vertically in the ward view.',
+  );
 }
diff --git a/packages/esm-ward-app/src/ward-view/ward-view.component.tsx b/packages/esm-ward-app/src/ward-view/ward-view.component.tsx
index 3bc67ced8..d3946363d 100644
--- a/packages/esm-ward-app/src/ward-view/ward-view.component.tsx
+++ b/packages/esm-ward-app/src/ward-view/ward-view.component.tsx
@@ -1,9 +1,5 @@
 import { InlineNotification } from '@carbon/react';
-import {
-  useAppContext,
-  useDefineAppContext,
-  WorkspaceContainer
-} from '@openmrs/esm-framework';
+import { useAppContext, useDefineAppContext, useFeatureFlag, WorkspaceContainer } from '@openmrs/esm-framework';
 import React, { useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import EmptyBedSkeleton from '../beds/empty-bed-skeleton';
@@ -15,6 +11,7 @@ import WardViewHeader from '../ward-view-header/ward-view-header.component';
 import WardBed from './ward-bed.component';
 import { bedLayoutToBed } from './ward-view.resource';
 import styles from './ward-view.scss';
+import classNames from 'classnames';
 
 const WardView = () => {
   const response = useWardLocation();
@@ -23,6 +20,7 @@ const WardView = () => {
 
   const wardPatientsGroupDetails = useWardPatientGrouping();
   useDefineAppContext<WardPatientGroupDetails>('ward-patients-group', wardPatientsGroupDetails);
+  const isVertical = useFeatureFlag('ward-view-vertical-tiling');
 
   if (isLoadingLocation) {
     return <></>;
@@ -33,27 +31,30 @@ const WardView = () => {
   }
 
   return (
-    <div className={styles.wardView}>
-      <WardViewHeader />
-      <WardViewMain />
+    <>
+      <div className={classNames(styles.wardView, { [styles.verticalTiling]: isVertical })}>
+        <WardViewHeader />
+        <WardViewMain />
+      </div>
       <WorkspaceContainer overlay contextKey="ward" />
-    </div>
+    </>
   );
 };
 
 const WardViewMain = () => {
   const { location } = useWardLocation();
   const { t } = useTranslation();
+  const isVertical = useFeatureFlag('ward-view-vertical-tiling');
 
   const wardPatientsGrouping = useAppContext<WardPatientGroupDetails>('ward-patients-group');
   const { bedLayouts, wardAdmittedPatientsWithBed, wardUnassignedPatientsList } = wardPatientsGrouping ?? {};
   const { isLoading: isLoadingAdmissionLocation, error: errorLoadingAdmissionLocation } =
     wardPatientsGrouping?.admissionLocationResponse ?? {};
   const {
-    isLoading: isLoadingInpatientAdmissions, 
-    error: errorLoadingInpatientAdmissions, 
-    hasMore: hasMoreInpatientAdmissions, 
-    loadMore: loadMoreInpatientAdmissions
+    isLoading: isLoadingInpatientAdmissions,
+    error: errorLoadingInpatientAdmissions,
+    hasMore: hasMoreInpatientAdmissions,
+    loadMore: loadMoreInpatientAdmissions,
   } = wardPatientsGrouping?.inpatientAdmissionResponse ?? {};
 
   const scrollToLoadMoreTrigger = useRef<HTMLDivElement>(null);
@@ -124,7 +125,7 @@ const WardViewMain = () => {
   });
 
   return (
-    <div className={styles.wardViewMain}>
+    <div className={classNames(styles.wardViewMain, { [styles.verticalTiling]: isVertical })}>
       {wardBeds}
       {bedLayouts?.length == 0 && (
         <InlineNotification
diff --git a/packages/esm-ward-app/src/ward-view/ward-view.scss b/packages/esm-ward-app/src/ward-view/ward-view.scss
index e9c945254..888c8236e 100644
--- a/packages/esm-ward-app/src/ward-view/ward-view.scss
+++ b/packages/esm-ward-app/src/ward-view/ward-view.scss
@@ -1,10 +1,15 @@
 @use '@carbon/layout';
+@import '~@openmrs/esm-styleguide/src/vars';
 
 .wardView {
   background-color: #e4e4e4;
   display: flex;
   flex-direction: column;
   padding: 0 layout.$spacing-05;
+
+  &.verticalTiling {
+    height: calc(100vh - var(--omrs-topnav-height));
+  }
 }
 
 .wardViewMain {
@@ -12,4 +17,15 @@
   grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
   display: grid;
   gap: layout.$spacing-05;
+
+  &.verticalTiling {
+    display: block;
+    column-width: 280px;
+    overflow-x: auto;
+
+    > div {
+      break-inside: avoid;
+      margin-bottom: 10px;
+    }
+  }
 }