From 32889a90db093428d98b48c2e783b500f04ec913 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Thu, 19 Jan 2017 21:59:38 +0100
Subject: [PATCH] - Wallet: fix options menu style. - Wallet: add dots to
popover menu action's label - i18n: replace NODE with PEER
---
www/i18n/locale-en-GB.json | 9 +++++----
www/i18n/locale-en.json | 9 +++++----
www/i18n/locale-fr-FR.json | 7 ++++---
www/i18n/locale-nl-NL.json | 6 +++---
www/js/controllers/currency-controllers.js | 2 +-
www/js/controllers/settings-controllers.js | 6 ++----
www/plugins/es/i18n/locale-en-GB.json | 10 +++++-----
www/plugins/es/i18n/locale-en.json | 10 +++++-----
www/plugins/es/i18n/locale-fr-FR.json | 10 +++++-----
www/plugins/es/i18n/locale-nl-NL.json | 8 ++++----
.../es/js/controllers/settings-controllers.js | 6 +++---
.../es/templates/settings/plugin_settings.html | 2 +-
www/templates/network/modal_network.html | 4 ++--
www/templates/settings/popup_node.html | 17 +++++++++++------
www/templates/settings/settings.html | 2 +-
15 files changed, 57 insertions(+), 51 deletions(-)
diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 186ee4089..6edb5472a 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -109,7 +109,6 @@
"TITLE": "Settings",
"NETWORK_SETTINGS": "Network",
"PEER": "Duniter peer address",
- "PEER_HELP": "server.domain.com:port",
"USE_LOCAL_STORAGE": "Enable local storage",
"ENABLE_HELPTIP": "Enable contextual help tips",
"HISTORY_SETTINGS": "My Account",
@@ -120,9 +119,11 @@
"BTN_RESET": "Restore default values",
"EXPERT_MODE": "Enable expert mode<span class=\"hidden-xs\">(display more details)</span>",
"POPUP_PEER": {
- "TITLE" : "Duniter Node",
- "HELP" : "Set the address of the peer to use:",
- "BTN_SHOW_LIST" : "Show peer's list"
+ "TITLE" : "Duniter peer",
+ "HELP" : "Peer address:",
+ "PEER_HELP": "server.domain.com:port",
+ "BTN_SHOW_LIST_HELP" : "Enter above in the format <b>{{'SETTINGS.POPUP_PEER.PEER_HELP'|translate}}</b> or click on the button below:",
+ "BTN_SHOW_LIST" : "Peer's list"
},
},
"CURRENCY": {
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index c49c5e03a..aa8639983 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -109,7 +109,6 @@
"TITLE": "Settings",
"NETWORK_SETTINGS": "Network",
"PEER": "Duniter peer address",
- "PEER_HELP": "server.domain.com:port",
"USE_LOCAL_STORAGE": "Enable local storage",
"ENABLE_HELPTIP": "Enable contextual help tips",
"HISTORY_SETTINGS": "My Account",
@@ -120,9 +119,11 @@
"BTN_RESET": "Restore default values",
"EXPERT_MODE": "Enable expert mode<span class=\"hidden-xs\">(display more details)</span>",
"POPUP_PEER": {
- "TITLE" : "Duniter Node",
- "HELP" : "Set the address of the peer to use:",
- "BTN_SHOW_LIST" : "Show peer's list"
+ "TITLE" : "Duniter peer",
+ "HELP" : "Peer address:",
+ "PEER_HELP": "server.domain.com:port",
+ "BTN_SHOW_LIST_HELP" : "Enter above in the format <b>{{'SETTINGS.POPUP_PEER.PEER_HELP'|translate}}</b> or click on the button below:",
+ "BTN_SHOW_LIST" : "Peer's list"
},
},
"CURRENCY": {
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index c8b518e48..4fbf294b1 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -109,7 +109,6 @@
"TITLE": "Paramètres",
"NETWORK_SETTINGS": "Réseau",
"PEER": "Adresse du nœud Duniter",
- "PEER_HELP": "server.domain.com:port",
"USE_LOCAL_STORAGE": "Activer le stockage local",
"ENABLE_HELPTIP": "Activer les bulles d'aide<span class=\"hidden-xs\"> contextuelles</span>",
"HISTORY_SETTINGS": "Mon compte",
@@ -121,8 +120,10 @@
"EXPERT_MODE": "Activer le mode expert<span class=\"hidden-xs\">(affichage plus détaillé)</span>",
"POPUP_PEER": {
"TITLE" : "Nœud Duniter",
- "HELP" : "Saisissez l'adresse du nœud que vous voulez utiliser :",
- "BTN_SHOW_LIST" : "Voir la liste des nœuds"
+ "HELP" : "Adresse du nœud :",
+ "PEER_HELP": "serveur.domaine.com:port",
+ "BTN_SHOW_LIST_HELP" : "Saisissez ci-dessus au format <b>{{'SETTINGS.POPUP_PEER.PEER_HELP'|translate}}</b> ou bien cliquez sur le bouton ci-dessous :",
+ "BTN_SHOW_LIST" : "Liste des noeuds"
},
},
"CURRENCY": {
diff --git a/www/i18n/locale-nl-NL.json b/www/i18n/locale-nl-NL.json
index 66ba72a3e..6554a11f5 100644
--- a/www/i18n/locale-nl-NL.json
+++ b/www/i18n/locale-nl-NL.json
@@ -109,7 +109,6 @@
"TITLE": "Instellingen",
"NETWORK_SETTINGS": "Netwerk",
"PEER": "Duniter knooppunt adres",
- "PEER_HELP": "server.domein.com:poort",
"USE_LOCAL_STORAGE": "Lokale opslag inschakelen",
"ENABLE_HELPTIP": "Contextgebonden hulp inschakelen",
"HISTORY_SETTINGS": "Mijn rekening",
@@ -121,7 +120,8 @@
"EXPERT_MODE": "Geavanceerde modus inschakelen <span class=\"hidden-xs\">(toon meer details)</span>",
"POPUP_PEER": {
"TITLE" : "Duniter Knooppunt",
- "HELP" : "Stel het adres van het knooppunt in:"
+ "HELP" : "Stel het adres van het knooppunt in:",
+ "PEER_HELP": "server.domein.com:poort"
}
},
"CURRENCY": {
@@ -339,7 +339,7 @@
"SCAN_FAILED": "Could not scan QR code.",
"SCAN_UNKNOWN_FORMAT": "Code not recognized.",
"WOT_LOOKUP_FAILED": "Search failed.",
- "LOAD_PEER_DATA_FAILED": "Duniter Node not accessible. Please retry later.",
+ "LOAD_PEER_DATA_FAILED": "Duniter peer not accessible. Please retry later.",
"NEED_LOGIN_FIRST": "Please sign in first.",
"AMOUNT_REQUIRED": "Amount is required.",
"AMOUNT_NEGATIVE": "Negative amount not allowed.",
diff --git a/www/js/controllers/currency-controllers.js b/www/js/controllers/currency-controllers.js
index 0bbb2dc1c..4c0ac42ff 100644
--- a/www/js/controllers/currency-controllers.js
+++ b/www/js/controllers/currency-controllers.js
@@ -237,7 +237,7 @@ function CurrencyViewController($scope, $q, $translate, $timeout, $filter,
})
.catch(function(err) {
$scope.loading = false;
- UIUtils.onError('ERROR.LOAD_NODE_DATA_FAILED')(err);
+ UIUtils.onError('ERROR.LOAD_PEER_DATA_FAILED')(err);
});
};
diff --git a/www/js/controllers/settings-controllers.js b/www/js/controllers/settings-controllers.js
index 46f012773..56c9a1bdb 100644
--- a/www/js/controllers/settings-controllers.js
+++ b/www/js/controllers/settings-controllers.js
@@ -128,14 +128,12 @@ function SettingsController($scope, $q, $ionicPopup, $timeout, $translate, csHtt
if (!!$scope.popupForm) {
$scope.popupForm.$setPristine();
}
- $translate(['SETTINGS.POPUP_NODE.TITLE', 'SETTINGS.POPUP_NODE.HELP',
- 'COMMON.BTN_OK', 'COMMON.BTN_CANCEL'])
+ $translate(['SETTINGS.POPUP_PEER.TITLE', 'COMMON.BTN_OK', 'COMMON.BTN_CANCEL'])
.then(function (translations) {
// Choose UID popup
$ionicPopup.show({
templateUrl: 'templates/settings/popup_node.html',
- title: translations['SETTINGS.POPUP_NODE.TITLE'],
- subTitle: translations['SETTINGS.POPUP_NODE.HELP'],
+ title: translations['SETTINGS.POPUP_PEER.TITLE'],
scope: $scope,
buttons: [
{ text: translations['COMMON.BTN_CANCEL'] },
diff --git a/www/plugins/es/i18n/locale-en-GB.json b/www/plugins/es/i18n/locale-en-GB.json
index 5febcaaef..1b68c41a0 100644
--- a/www/plugins/es/i18n/locale-en-GB.json
+++ b/www/plugins/es/i18n/locale-en-GB.json
@@ -274,11 +274,11 @@
"ENABLE_REGISTRY_TOGGLE": "Enable companies registry?",
"ENABLE_MESSAGE_TOGGLE": "Enable messages?",
"ENABLE_SETTINGS_TOGGLE": "Enable remote storage for settings?",
- "NODE": "Data node address",
- "NODE_HELP": "server.domain.com:port",
- "POPUP_NODE": {
- "TITLE" : "Data Node",
- "HELP" : "Set the address of the node to use:"
+ "PEER": "Data peer address",
+ "POPUP_PEER": {
+ "TITLE" : "Data peer",
+ "HELP" : "Set the address of the peer to use:",
+ "PEER_HELP": "server.domain.com:port"
},
"NOTIFICATIONS": {
"DIVIDER": "Notifications",
diff --git a/www/plugins/es/i18n/locale-en.json b/www/plugins/es/i18n/locale-en.json
index 5febcaaef..1b68c41a0 100644
--- a/www/plugins/es/i18n/locale-en.json
+++ b/www/plugins/es/i18n/locale-en.json
@@ -274,11 +274,11 @@
"ENABLE_REGISTRY_TOGGLE": "Enable companies registry?",
"ENABLE_MESSAGE_TOGGLE": "Enable messages?",
"ENABLE_SETTINGS_TOGGLE": "Enable remote storage for settings?",
- "NODE": "Data node address",
- "NODE_HELP": "server.domain.com:port",
- "POPUP_NODE": {
- "TITLE" : "Data Node",
- "HELP" : "Set the address of the node to use:"
+ "PEER": "Data peer address",
+ "POPUP_PEER": {
+ "TITLE" : "Data peer",
+ "HELP" : "Set the address of the peer to use:",
+ "PEER_HELP": "server.domain.com:port"
},
"NOTIFICATIONS": {
"DIVIDER": "Notifications",
diff --git a/www/plugins/es/i18n/locale-fr-FR.json b/www/plugins/es/i18n/locale-fr-FR.json
index f6b86a7f9..23b72e00f 100644
--- a/www/plugins/es/i18n/locale-fr-FR.json
+++ b/www/plugins/es/i18n/locale-fr-FR.json
@@ -274,11 +274,11 @@
"ENABLE_REGISTRY_TOGGLE": "Activer l'annuaire des pro ?",
"ENABLE_MESSAGE_TOGGLE": "Activer les messages privés ?",
"ENABLE_SETTINGS_TOGGLE": "Activer le stockage distant des paramètres ?",
- "NODE": "Addresse du noeud de données",
- "NODE_HELP": "server.domain.com:port",
- "POPUP_NODE": {
- "TITLE" : "Noeud de données",
- "HELP" : "Saisissez l'adresse du noeud que vous voulez utiliser :"
+ "PEER": "Addresse du nœud de données",
+ "POPUP_PEER": {
+ "TITLE" : "Nœud de données",
+ "HELP" : "Saisissez l'adresse du nœud que vous voulez utiliser :",
+ "PEER_HELP": "serveur.domaine.com:port"
},
"NOTIFICATIONS": {
"DIVIDER": "Notifications",
diff --git a/www/plugins/es/i18n/locale-nl-NL.json b/www/plugins/es/i18n/locale-nl-NL.json
index 3f8899900..f8b7f6c8b 100644
--- a/www/plugins/es/i18n/locale-nl-NL.json
+++ b/www/plugins/es/i18n/locale-nl-NL.json
@@ -274,11 +274,11 @@
"ENABLE_REGISTRY_TOGGLE": "Bedrijfsregister inschakelen?",
"ENABLE_MESSAGE_TOGGLE": "Berichten inschakelen?",
"ENABLE_SETTINGS_TOGGLE": "Globale opslag voor instellingen inschakelen?",
- "NODE": "Adres dataknooppunt",
- "NODE_HELP": "server.domein.com:poort",
- "POPUP_NODE": {
+ "PEER": "Adres dataknooppunt",
+ "POPUP_PEER": {
"TITLE" : "Dataknoop",
- "HELP" : "Stel het te gebruiken adres in:"
+ "HELP" : "Stel het te gebruiken adres in:",
+ "PEER_HELP": "server.domein.com:poort"
},
"NOTIFICATIONS": {
"DIVIDER": "Notificaties",
diff --git a/www/plugins/es/js/controllers/settings-controllers.js b/www/plugins/es/js/controllers/settings-controllers.js
index 0599b59b4..28ac79e73 100644
--- a/www/plugins/es/js/controllers/settings-controllers.js
+++ b/www/plugins/es/js/controllers/settings-controllers.js
@@ -104,13 +104,13 @@ function ESPluginSettingsController ($scope, $q, $translate, $ionicPopup, UIUti
if (!!$scope.popupForm) {
$scope.popupForm.$setPristine();
}
- $translate(['ES_SETTINGS.POPUP_NODE.TITLE', 'ES_SETTINGS.POPUP_NODE.HELP', 'COMMON.BTN_OK', 'COMMON.BTN_CANCEL'])
+ $translate(['ES_SETTINGS.POPUP_PEER.TITLE', 'ES_SETTINGS.POPUP_PEER.HELP', 'COMMON.BTN_OK', 'COMMON.BTN_CANCEL'])
.then(function (translations) {
// Choose UID popup
$ionicPopup.show({
templateUrl: 'templates/settings/popup_node.html',
- title: translations['ES_SETTINGS.POPUP_NODE.TITLE'],
- subTitle: translations['ES_SETTINGS.POPUP_NODE.HELP'],
+ title: translations['ES_SETTINGS.POPUP_PEER.TITLE'],
+ subTitle: translations['ES_SETTINGS.POPUP_PEER.HELP'],
scope: $scope,
buttons: [
{ text: translations['COMMON.BTN_CANCEL'] },
diff --git a/www/plugins/es/templates/settings/plugin_settings.html b/www/plugins/es/templates/settings/plugin_settings.html
index 1c920fcf9..4a0bb300d 100644
--- a/www/plugins/es/templates/settings/plugin_settings.html
+++ b/www/plugins/es/templates/settings/plugin_settings.html
@@ -58,7 +58,7 @@
<div class="item ink" ng-click="formData.enable && changeEsNode()" ng-disabled="!formData.enable">
<div class="input-label" ng-class="{'gray': !formData.enable}">
- {{'ES_SETTINGS.NODE' | translate}}
+ {{'ES_SETTINGS.PEER' | translate}}
</div>
<span class="item-note" ng-class="{'dark': formData.enable}">{{getServer()}}</span>
</div>
diff --git a/www/templates/network/modal_network.html b/www/templates/network/modal_network.html
index 84efef0a3..72b288e77 100644
--- a/www/templates/network/modal_network.html
+++ b/www/templates/network/modal_network.html
@@ -1,7 +1,7 @@
<ion-modal-view id="nodes" class="modal-full-height" cache-view="false">
<ion-header-bar class="bar-positive">
<button class="button button-clear" ng-click="closeModal()" translate>COMMON.BTN_CANCEL</button>
- <h1 class="title" translate>PEER.NODE_LIST</h1>
+ <h1 class="title" translate>PEER.PEER_LIST</h1>
<div class="buttons buttons-right header-item">
<span class="secondary">
<button class="button button-clear icon ion-loop button-clear" ng-click="refresh()">
@@ -26,7 +26,7 @@
{{'PEER.MIRRORS' | translate}} <span ng-if="!search.loading">({{search.results.length}})</span>
</h4>
<h4 ng-if="!enableFilter || !search.type">
- {{'PEER.ALL_NODES' | translate}} <span ng-if="!search.loading">({{search.results.length}})</span>
+ {{'PEER.ALL_PEERS' | translate}} <span ng-if="!search.loading">({{search.results.length}})</span>
</h4>
</div>
diff --git a/www/templates/settings/popup_node.html b/www/templates/settings/popup_node.html
index 2c66c52d6..33e23fdf1 100644
--- a/www/templates/settings/popup_node.html
+++ b/www/templates/settings/popup_node.html
@@ -1,17 +1,15 @@
<form name="popupForm" ng-submit="">
+
+ <span ng-bind-html="'SETTINGS.POPUP_PEER.HELP'|translate"></span>
+
<div class="list" ng-init="setPopupForm(popupForm)">
<label class="item item-input"
ng-class="{'item-input-error': popupForm.$submitted && popupForm.newNode.$invalid}">
- <input name="newNode" type="text" placeholder="{{'SETTINGS.NODE_HELP' | translate}}"
+ <input name="newNode" type="text" placeholder="{{'SETTINGS.POPUP_PEER.PEER_HELP' | translate}}"
ng-model="popupData.newNode"
ng-minlength="3"
required>
</label>
- <ion-item class="item item-icon-right item-text-wrap ink in in done done" ng-click="showNodeList()">
- <h5 class="popup-sub-title">{{'SETTINGS.SHOW_NODE_LIST' | translate}}</h5>
- <i class="icon ion-ios-arrow-right"></i>
- </ion-item>
- </div>
<div class="form-errors"
ng-if="popupForm.$submitted && popupForm.newNode.$error"
ng-messages="popupForm.newNode.$error">
@@ -23,6 +21,13 @@
</div>
</div>
</div>
+
+ <small ng-bind-html="'SETTINGS.POPUP_PEER.BTN_SHOW_LIST_HELP' | translate"></small>
+
+ <button class="button button-positive button-clear positive button-outline button-full button-small-padding icon-left ink" ng-click="showNodeList()">
+ <i class="icon ion-wifi "></i>
+ {{'SETTINGS.POPUP_PEER.BTN_SHOW_LIST' | translate}}
+ </button>
</form>
diff --git a/www/templates/settings/settings.html b/www/templates/settings/settings.html
index 18273401f..45dd6e00b 100644
--- a/www/templates/settings/settings.html
+++ b/www/templates/settings/settings.html
@@ -111,7 +111,7 @@
<div class="item ink" ng-click="changeNode()">
<div class="input-label">
- {{'SETTINGS.NODE' | translate}}
+ {{'SETTINGS.PEER' | translate}}
</div>
<span class="item-note dark">{{getServer()}}</ng-if></span>
</div>
--
GitLab