Skip to content
Snippets Groups Projects
Commit 9d68f8c4 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Missing i18n 

[fix] Secondary wallet: to not execute api login on children wallet
parent ea03f89d
No related branches found
No related tags found
No related merge requests found
Pipeline #2815 passed
Stage: github-sync
Stage: build
Stage: publish
Stage: deploy
Show whitespace changes
Inline Side-by-side
www/i18n/locale-en-GB.json
+ 18
− 1
View file @ 9d68f8c4
......@@ -129,6 +129,8 @@
"ENABLE_UI_EFFECTS": "Enable visual effects",
"HISTORY_SETTINGS": "Account operations",
"DISPLAY_UD_HISTORY": "Display produced dividends?",
"TX_HISTORY_AUTO_REFRESH": "Enable automatic refresh?",
"TX_HISTORY_AUTO_REFRESH_HELP": "Updates the list of operations to each new block.",
"AUTHENTICATION_SETTINGS": "Authentication",
"KEEP_AUTH": "Expiration of authentication",
"KEEP_AUTH_HELP": "Define when authentication is cleared from memory",
......@@ -520,6 +522,15 @@
"TITLE": "Identity selection",
"HELP": "Several <b>different identities</b> have been sent, for the public key <span class=\"gray\"> <i class=\"ion-key\"></i> {{pubkey | formatPubkey}}</span>.<br/>Please select the identity to use:"
},
"SELECT_WALLET_MODAL": {
"TITLE": "Wallet selection"
},
"WALLET_LIST": {
"TITLE": "secondary wallets",
"BTN_NEW": "Add a wallet",
"NO_WALLET": "No secondary wallet",
"BTN_DELETE": "Remove a secondary wallet..."
},
"SECURITY":{
"ADD_QUESTION" : "Add custom question",
"BTN_CLEAN" : "Clean",
......@@ -595,6 +606,7 @@
"TRANSFER": {
"TITLE": "Transfer",
"SUB_TITLE": "Transfer money",
"SUB_TITLE_ALL": "Empty the account",
"FROM": "From",
"TO": "To",
"AMOUNT": "Amount",
......@@ -705,7 +717,12 @@
"EXISTING_ACCOUNT_REQUEST": "Please modify your credentials so that they correspond to an unused account.",
"GET_LICENSE_FILE_FAILED": "Unable to get license file",
"CHECK_NETWORK_CONNECTION": "No peer appears to be accessible.<br/><br/>Please <b>check your Internet connection</b>.",
"ISSUE_524_TX_FAILED": "Failed to transfer.<br/><br/>A message has been sent to developers to help solve the problem.<b>Thank you for your help</b>."
"ISSUE_524_TX_FAILED": "Failed to transfer.<br/><br/>A message has been sent to developers to help solve the problem.<b>Thank you for your help</b>.",
"ADD_SECONDARY_WALLET_FAILED": "Unable to add secondary wallet.",
"UPDATE_WALLET_LIST_FAILED": "Unable to refresh the list of wallets.",
"LOAD_WALLET_LIST_FAILED": "Unable to load the list of wallets.",
"COULD_NOT_ADD_MAIN_WALLET": "The wallet to add <b>must be different from the main account</b> with which you are connected.",
"UNKNOWN_WALLET_ID": "Unknown secondary wallet."
},
"INFO": {
"POPUP_TITLE": "Information",
......
www/i18n/locale-en.json
+ 18
− 1
View file @ 9d68f8c4
......@@ -129,6 +129,8 @@
"ENABLE_UI_EFFECTS": "Enable visual effects",
"HISTORY_SETTINGS": "Account operations",
"DISPLAY_UD_HISTORY": "Display produced dividends?",
"TX_HISTORY_AUTO_REFRESH": "Enable automatic refresh?",
"TX_HISTORY_AUTO_REFRESH_HELP": "Updates the list of operations to each new block.",
"AUTHENTICATION_SETTINGS": "Authentication",
"KEEP_AUTH": "Expiration of authentication",
"KEEP_AUTH_HELP": "Define when authentication is cleared from memory",
......@@ -520,6 +522,15 @@
"TITLE": "Identity selection",
"HELP": "Several <b>different identities</b> have been sent, for the public key <span class=\"gray\"> <i class=\"ion-key\"></i> {{pubkey | formatPubkey}}</span>.<br/>Please select the identity to use:"
},
"SELECT_WALLET_MODAL": {
"TITLE": "Wallet selection"
},
"WALLET_LIST": {
"TITLE": "secondary wallets",
"BTN_NEW": "Add a wallet",
"NO_WALLET": "No secondary wallet",
"BTN_DELETE": "Remove a secondary wallet..."
},
"SECURITY":{
"ADD_QUESTION" : "Add custom question",
"BTN_CLEAN" : "Clean",
......@@ -595,6 +606,7 @@
"TRANSFER": {
"TITLE": "Transfer",
"SUB_TITLE": "Transfer money",
"SUB_TITLE_ALL": "Empty the account",
"FROM": "From",
"TO": "To",
"AMOUNT": "Amount",
......@@ -705,7 +717,12 @@
"EXISTING_ACCOUNT_REQUEST": "Please modify your credentials so that they correspond to an unused account.",
"GET_LICENSE_FILE_FAILED": "Unable to get license file",
"CHECK_NETWORK_CONNECTION": "No peer appears to be accessible.<br/><br/>Please <b>check your Internet connection</b>.",
"ISSUE_524_TX_FAILED": "Failed to transfer.<br/><br/>A message has been sent to developers to help solve the problem.<b>Thank you for your help</b>."
"ISSUE_524_TX_FAILED": "Failed to transfer.<br/><br/>A message has been sent to developers to help solve the problem.<b>Thank you for your help</b>.",
"ADD_SECONDARY_WALLET_FAILED": "Unable to add secondary wallet.",
"UPDATE_WALLET_LIST_FAILED": "Unable to refresh the list of wallets.",
"LOAD_WALLET_LIST_FAILED": "Unable to load the list of wallets.",
"COULD_NOT_ADD_MAIN_WALLET": "The wallet to add <b>must be different from the main account</b> with which you are connected.",
"UNKNOWN_WALLET_ID": "Unknown secondary wallet."
},
"INFO": {
"POPUP_TITLE": "Information",
......
www/i18n/locale-fr-FR.json
+ 8
− 8
View file @ 9d68f8c4
......@@ -523,13 +523,13 @@
"HELP": "Plusieurs <b>identités différentes</b> ont été envoyées, pour la clé publique <span class=\"gray\"><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}</span>.<br/>Veuillez sélectionner le dossier à utiliser :"
},
"SELECT_WALLET_MODAL": {
"TITLE": "Sélection du compte"
"TITLE": "Sélection du portefeuille"
},
"WALLET_LIST": {
"TITLE": "Comptes secondaires",
"BTN_NEW": "Ajouter un compte",
"NO_WALLET": "Aucun compte secondaire",
"BTN_DELETE": "Retirer un compte secondaire..."
"TITLE": "Portefeuille secondaires",
"BTN_NEW": "Ajouter un portefeuille",
"NO_WALLET": "Aucun portefeuille secondaire",
"BTN_DELETE": "Retirer un portefeuille secondaire..."
},
"SECURITY": {
"ADD_QUESTION": "Ajouter une question personnalisée ",
......@@ -718,9 +718,9 @@
"GET_LICENSE_FILE_FAILED": "Récupérer du fichier de licence impossible",
"CHECK_NETWORK_CONNECTION": "Aucun nœud ne semble accessible.<br/><br/>Veuillez <b>vérifier votre connection Internet</b>.",
"ISSUE_524_TX_FAILED": "Echec du virement.<br/><br/>Un message a été envoyé aux développeurs pour faciliter la résolution du problème. <b>Merci de votre aide</b>.",
"ADD_SECONDARY_WALLET_FAILED": "Echec de l'ajout du portefeuille seconcdaire",
"UPDATE_WALLET_LIST_FAILED": "Echec du rafraichissement des portefeuilles secondaires",
"LOAD_WALLET_LIST_FAILED": "Echec du chargement des portefeuilles secondaires",
"ADD_SECONDARY_WALLET_FAILED": "Echec de l'ajout du portefeuille secondaire.",
"UPDATE_WALLET_LIST_FAILED": "Echec du rafraichissement des portefeuilles secondaires.",
"LOAD_WALLET_LIST_FAILED": "Echec du chargement des portefeuilles secondaires.",
"COULD_NOT_ADD_MAIN_WALLET": "Le portefeuille à ajouter <b>doit être différent du compte principal</b> avec lequel vous êtes connecté.",
"UNKNOWN_WALLET_ID": "Portefeuille secondaire inconnu."
},
......
www/js/services/wallet-services.js
+ 1
− 10
View file @ 9d68f8c4
......@@ -1667,16 +1667,7 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
// Store (store children locally)
var finishFn = (!options || angular.isUndefined(options.store) || options.store) ? store : $q.when;
// if already login
if (wallet.isLogin()) {
// Raise login event
return api.data.raisePromise.login(wallet.data)
.then(finishFn);
}
else {
return finishFn();
}
},
removeChildWalletById = function(id) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment