Fix prettier, add missing import and update locales from master

Scille · Dec 19, 2023 · d905a66 · d905a66
1 parent 44c65f6
commit d905a66
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/client/src/components/core/ms-modal/MsAlertModal.vue b/client/src/components/core/ms-modal/MsAlertModal.vue
@@ -25,9 +25,9 @@ export interface MsAlertModalConfig {
 
 <script setup lang="ts">
 import MsModal from '@/components/core/ms-modal/MsModal.vue';
-import { modalController } from '@ionic/vue';
-import { MsReportTheme } from '@/components/core/ms-types';
 import { MsModalResult } from '@/components/core/ms-modal/types';
+import { MsReportTheme } from '@/components/core/ms-types';
+import { modalController } from '@ionic/vue';
 
 defineProps<MsAlertModalConfig>();
 

diff --git a/client/src/locales/en-US.json b/client/src/locales/en-US.json
@@ -874,8 +874,10 @@
                 "title": "{user} added",
                 "message": "{user} can now access to the organization."
             },
-            "cancelConfirm": "Are you sure you want to cancel the process?",
-            "cancelConfirmSubtitle": "Information will not be saved, you will have to restart."
+            "cancelConfirm": "Cancel the onboarding",
+            "cancelConfirmSubtitle": "Are you sure you want to cancel the process? Information will not be saved, you will have to restart.",
+            "cancelYes": "Cancel the process",
+            "cancelNo": "Resume"
         },
         "invitation": {
             "title": "An error occured",
@@ -1011,6 +1013,8 @@
         "deviceName": "Device name",
         "cancelConfirm": "Are you sure you want to cancel the process?",
         "cancelConfirmSubtitle": "Information will not be saved, you will have to restart.",
+        "cancelYes": "Cancel the process",
+        "cancelNo": "Resume",
         "successMessage": {
             "title": "Device successfully created",
             "message": "You can now access your organization from your new device."

diff --git a/client/src/locales/fr-FR.json b/client/src/locales/fr-FR.json
@@ -778,7 +778,7 @@
         },
         "cancelConfirm": "Annulation",
         "cancelConfirmSubtitle": "Êtes-vous sûr(e) de vouloir annuler le processus ? Les informations ne seront pas sauvegardées, vous devrez reprendre depuis le debut.",
-        "cancelYes": "Annuler le process",
+        "cancelYes": "Annuler le processus",
         "cancelNo": "Continuer"
     },
     "UsersPage": {
@@ -874,8 +874,10 @@
                 "title": "L'utilisateur {user} a été ajouté(e) !",
                 "message": "{user} peut maintenant se connecter à l'organisation."
             },
-            "cancelConfirm": "Êtes-vous sûr(e) de vouloir annuler le processus ?",
-            "cancelConfirmSubtitle": "Les informations ne seront pas sauvegardées, vous devrez reprendre depuis le debut."
+            "cancelConfirm": "Annulation",
+            "cancelConfirmSubtitle": "Êtes-vous sûr(e) de vouloir annuler le processus de création ? Les informations ne seront pas sauvegardées, vous devrez reprendre depuis le debut.",
+            "cancelYes": "Annuler le processus",
+            "cancelNo": "Continuer"
         },
         "invitation": {
             "title": "Une erreur est survenue",
@@ -1011,6 +1013,8 @@
         "deviceName": "Nom de l'appareil",
         "cancelConfirm": "Êtes-vous sûr(e) de vouloir annuler le processus ?",
         "cancelConfirmSubtitle": "Les informations ne seront pas sauvegardées, vous devrez reprendre depuis le debut.",
+        "cancelYes": "Annuler le processus",
+        "cancelNo": "Continuer",
         "successMessage": {
             "title": "L'appareil a bien été créé !",
             "message": "Vous pouvez maintenant vous connecter à cette organisation depuis votre nouvel appareil."

diff --git a/client/src/services/toastManager.ts b/client/src/services/toastManager.ts
@@ -1,7 +1,8 @@
 // Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
 
 import { MsReportTheme } from '@/components/core';
-import { information, checkmark, warning, closeCircle } from 'ionicons/icons';
+import { toastController } from '@ionic/vue';
+import { checkmark, closeCircle, information, warning } from 'ionicons/icons';
 import { ComposerTranslation } from 'vue-i18n';
 
 const DEFAULT_TOAST_DURATION = 3000;

diff --git a/client/tests/e2e/support/index.ts b/client/tests/e2e/support/index.ts
@@ -38,7 +38,7 @@ declare global {
       visitApp(template?: 'coolorg' | 'empty'): Chainable<string>;
       dropTestbed(): Chainable<null>;
       login(userName: string, password: string): Chainable<null>;
-      checkToastMessage(title: string, message:string): Chainable<null>;
+      checkToastMessage(title: string, message: string): Chainable<null>;
     }
   }
 }