From fd57ffc96a0c7744dc1727eed41fcf0016ae85af Mon Sep 17 00:00:00 2001 From: Dorch <14124454+DDorch@users.noreply.github.com> Date: Sun, 3 Dec 2023 18:04:44 +0000 Subject: [PATCH] fix: update ServiceWorker remove version in case of failed installation Refs #633 --- src/app/services/service-worker-update.service.ts | 5 ++--- src/locale/messages.en.json | 2 +- src/locale/messages.fr.json | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/services/service-worker-update.service.ts b/src/app/services/service-worker-update.service.ts index 3dc0cd48d..5869f53e5 100644 --- a/src/app/services/service-worker-update.service.ts +++ b/src/app/services/service-worker-update.service.ts @@ -61,9 +61,8 @@ export class ServiceWorkerUpdateService { break; case 'VERSION_INSTALLATION_FAILED': - ver = (evt as any).version?.appData?.version ?? "NA"; - console.log("ServiceWorkerUpdateService: VERSION_INSTALLATION_FAILED", ver); - this.notificationService.notify(this.i18nService.localizeText("ERROR_SERVICE_WORKER_INSTALL_FAILED", { "ver": ver }), 10000); + console.log("ServiceWorkerUpdateService: VERSION_INSTALLATION_FAILED"); + this.notificationService.notify(this.i18nService.localizeText("ERROR_SERVICE_WORKER_INSTALL_FAILED"), 10000); break; } }); diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index c8fd7869c..49d04bcaa 100755 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -678,7 +678,7 @@ "INFO_ESPECE_TITRE_COURT": "Species", "INFO_SERVICE_WORKER_VERSION_DETECTED": "Downloading Cassiopée version %ver%...", "INFO_SERVICE_WORKER_VERSION_READY": "Cassiopée version %ver% is ready to be used, please restart.", - "ERROR_SERVICE_WORKER_INSTALL_FAILED": "Cassiopée version %ver% installation failed.", + "ERROR_SERVICE_WORKER_INSTALL_FAILED": "Cassiopée new version installation failed.", "ERROR_JET_SUBMERGED_NO_SOLUTION": "There is no solution", "WARNING_DEVER_ZDV_INF_ZR": "Apron elevation of structure #%number% is below river bed elevation", "WARNING_JET_START_SUBMERGED": "Water elevation is greater than jet start elevation", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index 05ac13aef..764dfbbbf 100755 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -679,7 +679,7 @@ "INFO_ESPECE_TITRE_COURT": "Espèce", "INFO_SERVICE_WORKER_VERSION_DETECTED": "Téléchargement de la version %ver% de Cassiopée en cours...", "INFO_SERVICE_WORKER_VERSION_READY": "La version %ver% de Cassiopée est prête à être utilisée, veuillez redémarrer.", - "ERROR_SERVICE_WORKER_INSTALL_FAILED": "Erreur d'installation de Cassiopée version %ver%.", + "ERROR_SERVICE_WORKER_INSTALL_FAILED": "Erreur d'installation de la nouvelle version de Cassiopée.", "ERROR_JET_SUBMERGED_NO_SOLUTION": "Il n'y a pas de solution", "WARNING_DEVER_ZDV_INF_ZR": "La cote de radier de l'ouvrage n°%number% est sous la cote de fond du lit", "WARNING_JET_START_SUBMERGED": "La cote de l'eau est supérieure à la cote de départ du jet", -- GitLab