From 0660404d67945833a7d0dcc848f3cb496707c785 Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Mon, 22 Mar 2021 11:42:06 +0100
Subject: [PATCH] [fix] Fix error "translationId must be a not empty string" -
fix #935
---
www/i18n/locale-en-GB.json | 1 +
www/i18n/locale-en.json | 1 +
www/i18n/locale-eo-EO.json | 1 +
www/i18n/locale-es-ES.json | 1 +
www/i18n/locale-fr-FR.json | 1 +
www/i18n/locale-it-IT.json | 1 +
www/i18n/locale-nl-NL.json | 3 ++-
www/js/services/utils-services.js | 7 ++++++-
8 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index f156db794..11fe846af 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -805,6 +805,7 @@
"EMPTY_TX_HISTORY": "No operations to export"
},
"CONFIRM": {
+ "CAN_CONTINUE": "<b>Are you sure</b> you want to continue?",
"POPUP_TITLE": "<b>Confirmation</b>",
"POPUP_WARNING_TITLE": "<b>Warning</b>",
"POPUP_SECURITY_WARNING_TITLE": "<i class=\"icon ion-alert-circled\"></i> <b>Security warning</b>",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 2b8e0e778..3e5f959f2 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -805,6 +805,7 @@
"EMPTY_TX_HISTORY": "No operations to export"
},
"CONFIRM": {
+ "CAN_CONTINUE": "<b>Are you sure</b> you want to continue?",
"POPUP_TITLE": "<b>Confirmation</b>",
"POPUP_WARNING_TITLE": "<b>Warning</b>",
"POPUP_SECURITY_WARNING_TITLE": "<i class=\"icon ion-alert-circled\"></i> <b>Security warning</b>",
diff --git a/www/i18n/locale-eo-EO.json b/www/i18n/locale-eo-EO.json
index bf0b2cd25..f819ccd63 100644
--- a/www/i18n/locale-eo-EO.json
+++ b/www/i18n/locale-eo-EO.json
@@ -805,6 +805,7 @@
"EMPTY_TX_HISTORY": "Neniu spezo elportota"
},
"CONFIRM": {
+ "CAN_CONTINUE": "<b>Ĉu vi certas</b>, ke vi volas daÅrigi?",
"POPUP_TITLE": "<b>Konfirmo</b>",
"POPUP_WARNING_TITLE": "<b>Averto</b>",
"POPUP_SECURITY_WARNING_TITLE": "<i class=\"icon ion-alert-circled\"></i> <b>Averto pri sekureco</b>",
diff --git a/www/i18n/locale-es-ES.json b/www/i18n/locale-es-ES.json
index 4f692577b..3fbcf2e13 100644
--- a/www/i18n/locale-es-ES.json
+++ b/www/i18n/locale-es-ES.json
@@ -890,6 +890,7 @@
"EMPTY_TX_HISTORY": "Ninguna operación a exportar"
},
"CONFIRM": {
+ "CAN_CONTINUE": "<b>¿Desea</b> continuar?",
"EXIT_APP": "¿ Cerrar la aplicación ?",
"FULLSCREEN": "¿ Mostrar la aplicación en pantalla completa ?",
"ISSUE_524_SEND_LOG": "La transacción ha sido rechazada a causa de una anomalÃa conocida (ticket #524) pero todavÃa <b>no replicable</b>.<br/><br/>Para ayudar a los/as desarrolladores/as a corregir este error, ¿ <b>acepta el envÃo de los logs(trazas del programa)</b> ?<br/><small>(ningún dato confidencia será enviado)</small>.",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 6e4086281..51421335c 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -805,6 +805,7 @@
"EMPTY_TX_HISTORY": "Aucune opération à exporter"
},
"CONFIRM": {
+ "CAN_CONTINUE": "<b>Êtes-vous sûr</b> de vouloir continuer ?",
"POPUP_TITLE": "<b>Confirmation</b>",
"POPUP_WARNING_TITLE": "<b>Avertissement</b>",
"POPUP_SECURITY_WARNING_TITLE": "<i class=\"icon ion-alert-circled\"></i> <b>Avertissement de sécurité</b>",
diff --git a/www/i18n/locale-it-IT.json b/www/i18n/locale-it-IT.json
index 13ab1f37c..42495c7aa 100644
--- a/www/i18n/locale-it-IT.json
+++ b/www/i18n/locale-it-IT.json
@@ -730,6 +730,7 @@
"EMPTY_TX_HISTORY": "Nessuna operazione da esportare"
},
"CONFIRM": {
+ "CAN_CONTINUE": "<b>Sei sicuro/a</b> di voler procedere?",
"POPUP_TITLE": "<b>Conferma</b>",
"POPUP_WARNING_TITLE": "<b>Avviso</b>",
"POPUP_SECURITY_WARNING_TITLE": "<i class=\"icon ion-alert-circled\"></i> <b>Avvertimento di sicurezza</b>",
diff --git a/www/i18n/locale-nl-NL.json b/www/i18n/locale-nl-NL.json
index bc5a3a713..977828b10 100644
--- a/www/i18n/locale-nl-NL.json
+++ b/www/i18n/locale-nl-NL.json
@@ -493,6 +493,7 @@
"EMPTY_TX_HISTORY": "Aucune operatie à exporteur"
},
"CONFIRM": {
+ "CAN_CONTINUE": "<b>Weet je zeker</b> dat je door wil gaan?",
"POPUP_TITLE": "<b>Bevestiging</b>",
"POPUP_WARNING_TITLE": "<b>Waarschuwing</b>",
"CERTIFY_RULES_TITLE_UID": "Certificeer {{uid}}",
@@ -501,7 +502,7 @@
"MEMBERSHIP_OUT": "<b>Waarschuwing</b>:<br/>Je staat op het punt je lidmaatschap te beëindigen. Dit kan <b>niet ongedaan</b> worden gemaakt.<br/></br/><b>Weet je zeker dat je door wil gaan?</b>",
"LOGIN_UNUSED_WALLET_TITLE": "Typefout?",
"LOGIN_UNUSED_WALLET": "Je bent ingelogged op een rekening die <b>inactief</b> lijkt te zijn.<br/><br/>Als deze rekening niet met de jouwe overeenkomt, komt dat waarschijnlijk door een <b>typefout</b> bij het inloggen.<br/><br/><b>Wilt u toch doorgaan met deze rekening?</b>",
- "FIX_IDENTITY": "De pseudoniem <b>{{uid}}</b> zal opnieuw gepubliceerd worden, waarmee de oude verlopen publicatie wordt vervangen.<br/></br/><bWeet je zeker</b> dat je door wil gaan?",
+ "FIX_IDENTITY": "De pseudoniem <b>{{uid}}</b> zal opnieuw gepubliceerd worden, waarmee de oude verlopen publicatie wordt vervangen.<br/></br/><b>Weet je zeker</b> dat je door wil gaan?",
"FIX_MEMBERSHIP": "Je verzoek to lidmaatschap zal verstuurd worden.<br/></br/><b>Weet je het zeker?</b>",
"RENEW_MEMBERSHIP": "Je lidmaatschap zal verlengd worden.<br/></br/><b>Weet je het zeker?</b>",
"REVOKE_IDENTITY": "<b>Beveiligingswaarschuwing:</b><br/>You will <b>definitely revoke this identity</b>.<br/><br/>The public key and the associated nickname <b>will never be used again</b> (for a member account).<br/></br/><b>Are you sure</b> you want to continue?",
diff --git a/www/js/services/utils-services.js b/www/js/services/utils-services.js
index 8bad65342..97cab1a21 100644
--- a/www/js/services/utils-services.js
+++ b/www/js/services/utils-services.js
@@ -47,7 +47,11 @@ angular.module('cesium.utils.services', ['angular-fullscreen-toggle'])
}
return $q(function(resolve) {
- $translate([err, 'ERROR.POPUP_TITLE', 'ERROR.UNKNOWN_ERROR', 'COMMON.BTN_OK'].concat(subtitle ? [subtitle] : []))
+ $translate(['ERROR.POPUP_TITLE', 'ERROR.UNKNOWN_ERROR', 'COMMON.BTN_OK']
+ // avoid error "translationId must be a not empty string"
+ .concat(typeof err === 'string' ? [err] : [])
+ .concat(subtitle ? [subtitle] : [])
+ )
.then(function (translations) {
var message = err.message || translations[err];
return $ionicPopup.show({
@@ -109,6 +113,7 @@ angular.module('cesium.utils.services', ['angular-fullscreen-toggle'])
}
function askConfirm(message, title, options) {
+ message = message || 'CONFIRM.CAN_CONTINUE';
title = title || 'CONFIRM.POPUP_TITLE';
options = options || {};
--
GitLab