I-TECH-UW · mozzy11 · Dec 5, 2023 · Dec 5, 2023
diff --git a/frontend/src/components/addOrder/PatientInfo.js b/frontend/src/components/addOrder/PatientInfo.js
@@ -55,7 +55,7 @@ const PatientInfo = (props) => {
       <Stack gap={10}>
         <div className="orderLegendBody">
           <h3>
-            <FormattedMessage id="sidenav.label.patient" />
+            <FormattedMessage id="banner.menu.patient" />
           </h3>
           <div className="tabsLayout">
             <Button

diff --git a/frontend/src/components/cytology/CytologyDashBoard.js b/frontend/src/components/cytology/CytologyDashBoard.js
@@ -29,7 +29,7 @@ import {
 } from "../utils/Utils";
 import { NotificationContext } from "../layout/Layout";
 import { AlertDialog } from "../common/CustomNotification";
-import { FormattedMessage } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import "../pathology/PathologyDashboard.css";
 
 function CytologyDashboard() {
@@ -52,6 +52,7 @@ function CytologyDashboard() {
   const [loading, setLoading] = useState(true);
   const [page, setPage] = useState(1);
   const [pageSize, setPageSize] = useState(10);
+  const intl = useIntl();
 
   const setStatusList = (statusList) => {
     if (componentMounted.current) {
@@ -215,9 +216,22 @@ function CytologyDashboard() {
   };
 
   const tileList = [
-    { title: "Cases in Progress", count: counts.inProgress },
-    { title: "Awaiting Cytopathologist Review", count: counts.awaitingReview },
-    { title: "Complete (Week " + getPastWeek() + " )", count: counts.complete },
+    {
+      title: intl.formatMessage({ id: "pathology.label.casesInProgress" }),
+      count: counts.inProgress,
+    },
+    {
+      title: intl.formatMessage({ id: "cytology.label.review" }),
+      count: counts.awaitingReview,
+    },
+    {
+      title:
+        intl.formatMessage({ id: "pathology.label.complete" }) +
+        "(Week " +
+        getPastWeek() +
+        " )",
+      count: counts.complete,
+    },
   ];
 
   useEffect(() => {

diff --git a/frontend/src/components/immunohistochemistry/ImmunohistochemistryDashboard.js b/frontend/src/components/immunohistochemistry/ImmunohistochemistryDashboard.js
@@ -28,7 +28,7 @@ import {
 } from "../utils/Utils";
 import { NotificationContext } from "../layout/Layout";
 import { AlertDialog } from "../common/CustomNotification";
-import { FormattedMessage } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import "./../pathology/PathologyDashboard.css";
 import UserSessionDetailsContext from "../../UserSessionDetailsContext";
 
@@ -53,6 +53,7 @@ function ImmunohistochemistryDashboard() {
   const [loading, setLoading] = useState(true);
   const [page, setPage] = useState(1);
   const [pageSize, setPageSize] = useState(10);
+  const intl = useIntl();
 
   function formatDateToDDMMYYYY(date) {
     var day = date.getDate();
@@ -92,12 +93,22 @@ function ImmunohistochemistryDashboard() {
     }
   };
   const tileList = [
-    { title: "Cases in Progress", count: counts.inProgress },
     {
-      title: "Awaiting Immunohistochemistry Review",
+      title: intl.formatMessage({ id: "pathology.label.casesInProgress" }),
+      count: counts.inProgress,
+    },
+    {
+      title: intl.formatMessage({ id: "immunohistochemistry.label.review" }),
       count: counts.awaitingReview,
     },
-    { title: "Complete (Week " + getPastWeek() + " )", count: counts.complete },
+    {
+      title:
+        intl.formatMessage({ id: "pathology.label.complete" }) +
+        "(Week " +
+        getPastWeek() +
+        " )",
+      count: counts.complete,
+    },
   ];
 
   const setStatusList = (statusList) => {

diff --git a/frontend/src/components/pathology/PathologyDashboard.js b/frontend/src/components/pathology/PathologyDashboard.js
@@ -29,7 +29,7 @@ import {
 } from "../utils/Utils";
 import { NotificationContext } from "../layout/Layout";
 import { AlertDialog } from "../common/CustomNotification";
-import { FormattedMessage } from "react-intl";
+import { FormattedMessage ,useIntl } from "react-intl";
 import "./PathologyDashboard.css";
 
 function PathologyDashboard() {
@@ -53,6 +53,7 @@ function PathologyDashboard() {
     complete: 0,
   });
   const [loading, setLoading] = useState(true);
+  const intl = useIntl();
 
   const setStatusList = (statusList) => {
     if (componentMounted.current) {
@@ -217,13 +218,26 @@ function PathologyDashboard() {
   };
 
   const tileList = [
-    { title: "Cases in Progress", count: counts.inProgress },
-    { title: "Awaiting Pathology Review", count: counts.awaitingReview },
     {
-      title: "Additional Pathology Requests",
+      title: <FormattedMessage id="pathology.label.casesInProgress" />,
+      count: counts.inProgress,
+    },
+    {
+      title: <FormattedMessage id="pathology.label.review" />,
+      count: counts.awaitingReview,
+    },
+    {
+      title: <FormattedMessage id="pathology.label.requests" />,
       count: counts.additionalRequests,
     },
-    { title: "Complete (Week " + getPastWeek() + " )", count: counts.complete },
+    {
+      title:
+        intl.formatMessage({ id: "pathology.label.complete" }) +
+        "(Week " +
+        getPastWeek() +
+        " )",
+      count: counts.complete,
+    },
   ];
 
   useEffect(() => {

diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
@@ -110,10 +110,15 @@
     "pathology.label.textconclusion" : "Text Conclusion",
     "pathology.label.release" : "Ready For release", 
     "pathology.label.refer" : "Refer to ImmunoHistoChemistry",
+    "pathology.label.casesInProgress" : "Cases in Progress",
+    "pathology.label.review" : "Awaiting Pathology Review",
+    "pathology.label.requests" : "Additional Pathology Requests",
+    "pathology.label.complete" : "Complete",
     "immunohistochemistry.label.title" : "Immunohistochemistry" ,
     "immunohistochemistry.label.report" : "Report" ,
     "immunohistochemistry.label.reports" : "Reports" ,
     "immunohistochemistry.label.addreport" : "Add Report" ,
+    "immunohistochemistry.label.review" : "Awaiting Immunohistochemistry Review" ,
     "cytology.label.title" : "Cytology" ,
     "cytology.label.specimen" : "Specimen Adequacy" ,
     "cytology.label.negative" : "Negative For Intraepithelial Lesion or Malignancy" ,
@@ -125,6 +130,7 @@
     "cytology.label.reactive" : "Reactive cellular changes" ,
     "cytology.label.organisms" : "Organisms" ,
     "cytology.label.otherResult" : " Other Diagnosis Result" ,
+    "cytology.label.review" : "Awaiting Cytopathologist Review" ,
     "header.label.version" :"Version:",
     "header.label.logout" :"Logout" ,
     "header.label.selectlocale" : "Select Locale" ,

diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
@@ -21,7 +21,7 @@
     "patient.label.info" : "Informations sur les patients",
     "breadcrumb.home" : "Domicile",
     "admin.legacy" :"Précédent Admin",
-    "banner.menu.billing" :"Billing",
+    "banner.menu.billing" :"Facturation",
     "label.page.patientHistory": "Antécédents du patient",
     "workplan.page.title"                :"Plan de Travail {0}",
     "workplan.panel.title"               :"Plan de Travail par Panel",
@@ -115,10 +115,15 @@
     "pathology.label.textconclusion" : "Conclusion Textuelle",
     "pathology.label.release" : "Prêt pour la Publication",
     "pathology.label.refer" : "Référer à l'Immuno-Histochimie",
+    "pathology.label.casesInProgress": "Cas en cours",
+    "pathology.label.review": "En attente de révision pathologique",
+    "pathology.label.requests": "Demandes pathologiques supplémentaires",
+    "pathology.label.complete": "Terminé",
     "immunohistochemistry.label.title" : "Immuno-Histochimie",
     "immunohistochemistry.label.report" : "Rapport",
     "immunohistochemistry.label.reports" : "Rapports",
     "immunohistochemistry.label.addreport" : "Ajouter un Rapport",
+    "immunohistochemistry.label.review": "En attente de révision en immunohistochimie",
     "cytology.label.title" : "Cytologie",
     "cytology.label.specimen" : "Aptitude de l'Échantillon",
     "cytology.label.negative" : "Négatif Pour Lésion ou Malignité Intraépithéliale",
@@ -130,6 +135,7 @@
     "cytology.label.reactive" : "Modifications Cellulaires Réactives",
     "cytology.label.organisms" : "Organismes",
     "cytology.label.otherResult" : "Autre Résultat de Diagnostic",
+    "cytology.label.review": "En attente de révision cytopathologique",
     "header.label.version" :"Version:",
     "header.label.logout" :"Déconnexion",
     "header.label.selectlocale" : "Sélectionner la Langue",

diff --git a/src/main/resources/languages/message_en.properties b/src/main/resources/languages/message_en.properties
@@ -322,6 +322,7 @@ banner.menu.workplan.serology                     = Serology
 banner.menu.workplan.serology-immunology          = Serology-Immunology
 banner.menu.workplan.test                         = By Test Type
 banner.menu.workplan.virology                     = Virology
+banner.menu.billing                               = Billing
 
 barcode.common.button.print            = Print labels
 barcode.common.section.barcode.header  = Barcode(s)

diff --git a/src/main/resources/languages/message_fr.properties b/src/main/resources/languages/message_fr.properties
@@ -353,6 +353,7 @@ banner.menu.workplan.parasitology                 = Parasitologie
 banner.menu.workplan.priority                     = Par priorit\u00C3\u00A9
 banner.menu.workplan.serology-immunology          = S\u00E9rologie-Immunologie
 banner.menu.workplan.test                         = Par test
+banner.menu.billing                               = Facturation
 
 barcode.button.print                   = Imprimer Etiquettes
 barcode.common.button.print            = Imprimer Etiquettes