From 4f8afdfb215a80de7064a7a9889ef677ef5bc00c Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Wed, 4 May 2016 10:20:44 +0200
Subject: [PATCH] - Fix i18n FR - Fix membership in new account wizard
---
www/i18n/locale-en.json | 4 ++--
www/i18n/locale-fr-FR.json | 4 ++--
www/js/config.js | 5 +++--
www/js/controllers/home-controllers.js | 2 +-
www/js/controllers/wot-controllers.js | 2 ++
www/templates/wot/view_identity.html | 2 +-
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 97cb8a5a8..2a82c3234 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -155,7 +155,7 @@
"RESULTS": "Results:"
},
"VIEW": {
- "TITLE": ""
+ "TITLE": "Ad"
},
"EDIT": {
"TITLE": "Edit",
@@ -194,7 +194,7 @@
"RESULTS": "Results:"
},
"VIEW": {
- "TITLE": "Annonce"
+ "TITLE": "Registry"
},
"NEW": {
"TITLE": "New",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 3f2789c01..a6f7d3b38 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -194,7 +194,7 @@
"RESULTS": "Résultats :"
},
"VIEW": {
- "TITLE": ""
+ "TITLE": "Annuaire"
},
"NEW": {
"TITLE": "Nouveau",
@@ -246,7 +246,7 @@
"COPY_CLIPBOARD_FAILED": "Copie de la valeur impossible",
"TAKE_PICTURE_FAILED": "Echec de la récupération de la photo",
"SCAN_FAILED": "Echec du scan de QR Code",
- "WOT_LOOKUP_FAILED": "Echec de la recherche",
+ "WOT_LOOKUP_FAILED": "Echec de la recherche"
},
"INFO": {
"POPUP_TITLE": "Information",
diff --git a/www/js/config.js b/www/js/config.js
index c2dcc35fb..d48cfa2a4 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -10,8 +10,9 @@ angular.module("cesium.config", [])
.constant("APP_CONFIG", {
"UCOIN_NODE": "cgeek.fr:9330",
+ "UCOIN_NODE_ES": "data.duniter.fr",
"VERSION": "0.0.1",
- "BUILD_DATE": "2016-05-02T20:37:30.089Z"
+ "BUILD_DATE": "2016-05-04T08:08:51.555Z"
})
-;
\ No newline at end of file
+;
diff --git a/www/js/controllers/home-controllers.js b/www/js/controllers/home-controllers.js
index 55f2790b2..6b0666edd 100644
--- a/www/js/controllers/home-controllers.js
+++ b/www/js/controllers/home-controllers.js
@@ -162,7 +162,7 @@ function NewAccountWizardController($scope, $ionicModal, $state, $ionicSideMenuD
Wallet.self($scope.accountData.pseudo, false/*do NOT load membership here*/)
.then(function() {
// Send membership IN
- Wallet.membership(true)
+ Wallet.membership.inside()
.then(function() {
// Reset account data, and open wallet view
$scope.cancel();
diff --git a/www/js/controllers/wot-controllers.js b/www/js/controllers/wot-controllers.js
index d4eb1af24..582551418 100644
--- a/www/js/controllers/wot-controllers.js
+++ b/www/js/controllers/wot-controllers.js
@@ -152,6 +152,8 @@ function IdentityController($scope, $state, BMA, Wallet, UIUtils, $q, $timeout,
$scope.loadWallet()
.then(function(walletData) {
UIUtils.loading.show();
+
+ // TODO: ask user confirm - see issue https://github.com/duniter/cesium/issues/12
Wallet.certify($scope.identity.uid,
$scope.identity.pub,
$scope.identity.timestamp,
diff --git a/www/templates/wot/view_identity.html b/www/templates/wot/view_identity.html
index 8b17994cc..cd4d2743e 100644
--- a/www/templates/wot/view_identity.html
+++ b/www/templates/wot/view_identity.html
@@ -24,7 +24,7 @@
{{'ACCOUNT.BTN_SEND_MONEY' | translate}}
</button>
- <button class="button button-raised icon-left ion-person" ng-click="certifyIdentity()" ng-if="hasSelf">
+ <button class="button button-raised icon-left ion-ribbon-b" ng-click="certifyIdentity()" ng-if="hasSelf">
{{'WOT.BTN_CERTIFY' | translate}}
</button>
</div>
--
GitLab