From 4eb550a1aa6198cdd8e208956b2a2ad760296f42 Mon Sep 17 00:00:00 2001
From: Fred Deniger <fdeniger@icrc.org>
Date: Tue, 19 Nov 2024 17:22:40 +0100
Subject: [PATCH] change translation about valid phone numbers

---
 .gitignore                              |  1 +
 admin/Dockerfile                        |  8 ++++----
 admin/assets/i18n-override/en.json.orig |  9 +++++++++
 docker-compose.yml                      |  2 +-
 doctor/assets/i18n-override/fr.json     | 17 ++++-------------
 update-i18n-resources.sh                |  2 +-
 6 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 admin/assets/i18n-override/en.json.orig

diff --git a/.gitignore b/.gitignore
index 9b0f866..5d5af11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /.idea/
 /secrets.env
+/admin/assets/i18n-override/en.json
diff --git a/admin/Dockerfile b/admin/Dockerfile
index 134ce1a..428df11 100644
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@@ -7,11 +7,11 @@ ENV HCW_ADMIN_VERSION=${HCW_ADMIN_VERSION}
 FROM init-layer AS i18n-layer
 USER root
 RUN apt update && apt install -y jq && rm -rf /var/lib/apt/lists/*
-COPY assets /usr/share/nginx/html/assets/i18n
-RUN /usr/share/nginx/html/assets/i18n/combine.sh
+COPY assets /usr/share/nginx/html/assets/translate
+RUN /usr/share/nginx/html/assets/translate/combine.sh
 
 
 FROM init-layer
 
-COPY --from=i18n-layer /usr/share/nginx/html/assets/i18n/*.json /usr/share/nginx/html/assets/i18n/
-COPY --from=i18n-layer /usr/share/nginx/html/assets/i18n/*.orig /tmp/orig/
+COPY --from=i18n-layer /usr/share/nginx/html/assets/translate/*.json /usr/share/nginx/html/assets/translate/
+COPY --from=i18n-layer /usr/share/nginx/html/assets/translate/*.orig /tmp/orig/
diff --git a/admin/assets/i18n-override/en.json.orig b/admin/assets/i18n-override/en.json.orig
new file mode 100644
index 0000000..ae0ecdc
--- /dev/null
+++ b/admin/assets/i18n-override/en.json.orig
@@ -0,0 +1,9 @@
+{
+  "roles": {
+    "doctor": "Doctor",
+    "requester": "Requester",
+    "nurse": "Requester",
+    "admin": "Admin",
+    "scheduler": "Scheduler"
+  }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index fc85971..4ea969c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
         - HCW_ADMIN_VERSION=$HCW_ADMIN_VERSION
     user: nginx
     ports:
-      - "8082:8082"
+      - "8089:8082"
     environment:
       - BACKEND_URL=http://backend:1337
     depends_on:
diff --git a/doctor/assets/i18n-override/fr.json b/doctor/assets/i18n-override/fr.json
index 16ed429..307d04d 100644
--- a/doctor/assets/i18n-override/fr.json
+++ b/doctor/assets/i18n-override/fr.json
@@ -224,11 +224,7 @@
     "et": "Tigrigna",
     "sg": "Tamoul",
     "ta": "Tamoul",
-    "ti": "Tigrigna",
-    "chooseTime": "Choisissez une heure",
-    "selectTimezone": "Sélectionner le fuseau horaire",
-    "chooseDate": "Choisissez une date",
-    "sendLinkManually": "Je veux envoyer le lien manuellement"
+    "ti": "Tigrigna"
   },
   "overlay": {
     "close": "Clôturer",
@@ -288,8 +284,7 @@
     "revoke": "Supprimer",
     "cancelRevoke": "Ne pas supprimer",
     "revokeConfirmTitle": "Supprimer une invitation",
-    "status": "Etat",
-    "immediately": "Immédiatement"
+    "status": "Etat"
   },
   "sideChat": {
     "startTheConsultation": "Démarrer la consultation"
@@ -346,10 +341,7 @@
     "updateTheProfile": "mettre à jour le profil",
     "enablesNotification": "Cette option active l'envoi de notification SMS quand une consultation est demandée.",
     "notification": "Notification",
-    "name": "Nom",
-    "whatsapp": "WhatsApp",
-    "sms": "SMS",
-    "selectLanguage": "Langue"
+    "name": "Nom"
   },
   "resetPassword": {
     "changePassword": "Changement du mot de passe",
@@ -434,8 +426,7 @@
     "terms": "les conditions d'utilisation",
     "youHaveTo": "Vous devez accepter",
     "description": "Conditions d'accès",
-    "pleaseAccept": "Vous devez accepter {{terms}} avant de pouvoir utiliser l'application",
-    "country": "Pays"
+    "pleaseAccept": "Vous devez accepter {{terms}} avant de pouvoir utiliser l'application"
   },
   "support": {
     "thisFormAllowsYouToReportAProblem": "Ce formulaire vous permet de remonter un problème rencontré pendant l'utilisation de {{branding}}. Avant de rapporter un incident, merci de vérifier que vous utilisez bien {{branding}} dans les conditions optimales :",
diff --git a/update-i18n-resources.sh b/update-i18n-resources.sh
index a45e128..ae6daca 100644
--- a/update-i18n-resources.sh
+++ b/update-i18n-resources.sh
@@ -21,4 +21,4 @@ move_files "doctor" "/usr/share/nginx/html/assets/i18n/"
 move_files "patient" "/usr/share/nginx/html/assets/i18n/"
 move_files "backend" "/usr/src/app/config/locales/"
 # not done as admin is not yet translated.
-#move_files "admin" "/usr/share/nginx/html/assets/i18n/"
+move_files "admin" "/usr/share/nginx/html/assets/translate/"