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

- Fix i18n FR

- Fix membership in new account wizard
parent 25aa7b82
No related branches found
No related tags found
No related merge requests found
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
"RESULTS": "Results:" "RESULTS": "Results:"
}, },
"VIEW": { "VIEW": {
"TITLE": "" "TITLE": "Ad"
}, },
"EDIT": { "EDIT": {
"TITLE": "Edit", "TITLE": "Edit",
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
"RESULTS": "Results:" "RESULTS": "Results:"
}, },
"VIEW": { "VIEW": {
"TITLE": "Annonce" "TITLE": "Registry"
}, },
"NEW": { "NEW": {
"TITLE": "New", "TITLE": "New",
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
"RESULTS": "Résultats :" "RESULTS": "Résultats :"
}, },
"VIEW": { "VIEW": {
"TITLE": "" "TITLE": "Annuaire"
}, },
"NEW": { "NEW": {
"TITLE": "Nouveau", "TITLE": "Nouveau",
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
"COPY_CLIPBOARD_FAILED": "Copie de la valeur impossible", "COPY_CLIPBOARD_FAILED": "Copie de la valeur impossible",
"TAKE_PICTURE_FAILED": "Echec de la récupération de la photo", "TAKE_PICTURE_FAILED": "Echec de la récupération de la photo",
"SCAN_FAILED": "Echec du scan de QR Code", "SCAN_FAILED": "Echec du scan de QR Code",
"WOT_LOOKUP_FAILED": "Echec de la recherche", "WOT_LOOKUP_FAILED": "Echec de la recherche"
}, },
"INFO": { "INFO": {
"POPUP_TITLE": "Information", "POPUP_TITLE": "Information",
......
...@@ -10,8 +10,9 @@ angular.module("cesium.config", []) ...@@ -10,8 +10,9 @@ angular.module("cesium.config", [])
.constant("APP_CONFIG", { .constant("APP_CONFIG", {
"UCOIN_NODE": "cgeek.fr:9330", "UCOIN_NODE": "cgeek.fr:9330",
"UCOIN_NODE_ES": "data.duniter.fr",
"VERSION": "0.0.1", "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
...@@ -162,7 +162,7 @@ function NewAccountWizardController($scope, $ionicModal, $state, $ionicSideMenuD ...@@ -162,7 +162,7 @@ function NewAccountWizardController($scope, $ionicModal, $state, $ionicSideMenuD
Wallet.self($scope.accountData.pseudo, false/*do NOT load membership here*/) Wallet.self($scope.accountData.pseudo, false/*do NOT load membership here*/)
.then(function() { .then(function() {
// Send membership IN // Send membership IN
Wallet.membership(true) Wallet.membership.inside()
.then(function() { .then(function() {
// Reset account data, and open wallet view // Reset account data, and open wallet view
$scope.cancel(); $scope.cancel();
......
...@@ -152,6 +152,8 @@ function IdentityController($scope, $state, BMA, Wallet, UIUtils, $q, $timeout, ...@@ -152,6 +152,8 @@ function IdentityController($scope, $state, BMA, Wallet, UIUtils, $q, $timeout,
$scope.loadWallet() $scope.loadWallet()
.then(function(walletData) { .then(function(walletData) {
UIUtils.loading.show(); UIUtils.loading.show();
// TODO: ask user confirm - see issue https://github.com/duniter/cesium/issues/12
Wallet.certify($scope.identity.uid, Wallet.certify($scope.identity.uid,
$scope.identity.pub, $scope.identity.pub,
$scope.identity.timestamp, $scope.identity.timestamp,
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
{{'ACCOUNT.BTN_SEND_MONEY' | translate}} {{'ACCOUNT.BTN_SEND_MONEY' | translate}}
</button> </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}} {{'WOT.BTN_CERTIFY' | translate}}
</button> </button>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment