anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3046 from dabura667/deletewallet

Browse source 
Fixed angular translations
This commit is contained in:
Gustavo Maximiliano Cortez 2015-07-29 10:50:41 -03:00
commit ce2f0a08db
3 changed files with 70 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

65
i18n/po/template.pot
View file

@ -46,6 +46,10 @@ msgstr ""
msgid "Advanced"
msgstr ""
#: public/views/modals/advancedSend.html
msgid "Advanced Send"
msgstr ""
#: public/views/disclaimer.html
msgid "Agree"
msgstr ""
@ -87,6 +91,11 @@ msgstr ""
msgid "Available Balance"
msgstr ""
#: public/views/preferencesFee.html
#: public/views/modals/advancedSend.html
msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes"
msgstr ""
#: public/views/create.html
#: public/views/join.html
msgid "BIP32 master extended private key"
@ -131,7 +140,7 @@ msgid "Bitcoin address"
msgstr ""
#: public/views/preferencesFee.html
msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion."
msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy."
msgstr ""
#: public/views/modals/txp-details.html
@ -160,6 +169,8 @@ msgstr ""
#: public/views/copayers.html
#: public/views/walletHome.html
#: src/js/controllers/copayers.js
#: src/js/controllers/preferencesDelete.js
msgid "Cancel"
msgstr ""
@ -184,6 +195,7 @@ msgid "Choose a wallet to send funds"
msgstr ""
#: public/views/includes/topbar.html
#: public/views/modals/advancedSend.html
#: public/views/modals/copayers.html
#: public/views/modals/customized-amount.html
#: public/views/modals/paypro.html
@ -200,6 +212,11 @@ msgstr ""
msgid "Commit hash"
msgstr ""
#: src/js/controllers/copayers.js
#: src/js/controllers/preferencesDelete.js
msgid "Confirm"
msgstr ""
#: public/views/modals/tx-details.html
msgid "Confirmations"
msgstr ""
@ -208,6 +225,10 @@ msgstr ""
msgid "Copayers"
msgstr ""
#: src/js/controllers/copayers.js
msgid "Copied to clipboard"
msgstr ""
#: public/views/backup.html
msgid "Copy backup to a safe place"
msgstr ""
@ -321,6 +342,11 @@ msgstr ""
msgid "Creating transaction"
msgstr ""
#: public/views/preferencesFee.html
#: public/views/modals/advancedSend.html
msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB"
msgstr ""
#: public/views/modals/tx-details.html
msgid "Date"
msgstr ""
@ -372,18 +398,10 @@ msgstr ""
msgid "ENTER"
msgstr ""
#: src/js/controllers/preferencesFee.js
msgid "Economy"
msgstr ""
#: public/views/preferences.html
msgid "Email Notifications"
msgstr ""
#: src/js/controllers/preferencesFee.js
msgid "Emergency"
msgstr ""
#: public/views/preferences.html
msgid "Encrypt Private Key"
msgstr ""
@ -434,6 +452,10 @@ msgstr ""
msgid "Fee"
msgstr ""
#: public/views/modals/advancedSend.html
msgid "Fee Policy"
msgstr ""
#. Get information of payment if using Payment Protocol
#: src/js/controllers/walletHome.js
msgid "Fetching Payment Information"
@ -543,6 +565,10 @@ msgstr ""
msgid "Invalid"
msgstr ""
#: src/js/controllers/copayers.js
msgid "Invitation to share a Copay Wallet"
msgstr ""
#: src/js/controllers/index.js
msgid "Italian"
msgstr ""
@ -560,6 +586,10 @@ msgstr ""
msgid "Join"
msgstr ""
#: src/js/controllers/copayers.js
msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io"
msgstr ""
#: public/views/add.html
msgid "Join shared wallet"
msgstr ""
@ -640,10 +670,6 @@ msgstr ""
msgid "No transactions yet"
msgstr ""
#: src/js/controllers/preferencesFee.js
msgid "Normal"
msgstr ""
#: public/views/walletHome.html
#: public/views/modals/customized-amount.html
msgid "Not valid"
@ -655,6 +681,11 @@ msgstr ""
msgid "Note"
msgstr ""
#: src/js/controllers/copayers.js
#: src/js/controllers/preferencesDelete.js
msgid "OK"
msgstr ""
#: public/views/modals/tx-status.html
msgid "OKAY"
msgstr ""
@ -783,10 +814,6 @@ msgstr ""
msgid "Preferences"
msgstr ""
#: src/js/controllers/preferencesFee.js
msgid "Priority"
msgstr ""
#: public/views/modals/customized-amount.html
msgid "QR Code"
msgstr ""
@ -1209,10 +1236,6 @@ msgstr ""
msgid "too long!"
msgstr ""
#: public/views/preferencesFee.html
msgid "{{fee.value}} bits per kB"
msgstr ""
#: src/js/controllers/walletHome.js
msgid "{{fee}} will be discounted for bitcoin networking fees"
msgstr ""

24
src/js/controllers/copayers.js
View file

@ -4,6 +4,10 @@ angular.module('copayApp.controllers').controller('copayersController',
function($scope, $rootScope, $timeout, $log, $modal, profileService, go, notification, isCordova, gettext, gettextCatalog) {
var self = this;
var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?');
var ok_msg = gettextCatalog.getString('OK');
var cancel_msg = gettextCatalog.getString('Cancel');
var confirm_msg = gettextCatalog.getString('Confirm');
self.init = function() {
var fc = profileService.focusedClient;
@ -18,16 +22,16 @@ angular.module('copayApp.controllers').controller('copayersController',
var _modalDeleteWallet = function() {
var ModalInstanceCtrl = function($scope, $modalInstance, gettext) {
$scope.title = gettext('Are you sure you want to delete this wallet?');
$scope.title = delete_msg;
$scope.loading = false;
$scope.ok = function() {
$scope.loading = true;
$modalInstance.close('ok');
$modalInstance.close(ok_msg);
};
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
$modalInstance.dismiss(cancel_msg);
};
};
@ -59,7 +63,7 @@ angular.module('copayApp.controllers').controller('copayersController',
} else {
go.walletHome();
$timeout(function() {
notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName}));
notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName}));
});
}
});
@ -70,13 +74,13 @@ angular.module('copayApp.controllers').controller('copayersController',
var fc = profileService.focusedClient;
if (isCordova) {
navigator.notification.confirm(
'Are you sure you want to delete this wallet?',
delete_msg,
function(buttonIndex) {
if (buttonIndex == 2) {
_deleteWallet();
}
},
'Confirm', ['Cancel', 'OK']
confirm_msg, [cancel_msg, ok_msg]
);
} else {
_modalDeleteWallet();
@ -86,7 +90,7 @@ angular.module('copayApp.controllers').controller('copayersController',
self.copySecret = function(secret) {
if (isCordova) {
window.cordova.plugins.clipboard.copy(secret);
window.plugins.toast.showShortCenter('Copied to clipboard');
window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard'));
}
};
@ -95,9 +99,9 @@ angular.module('copayApp.controllers').controller('copayersController',
if (isMobile.Android() || isMobile.Windows()) {
window.ignoreMobilePause = true;
}
var message = 'Join my Copay wallet. Here is the invitation code: ' + secret + ' You can download Copay for your phone or desktop at https://copay.io';
window.plugins.socialsharing.share(message, 'Invitation to share a Copay Wallet', null, null);
var message = gettextCatalog.getString('Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io', {secret: secret});
window.plugins.socialsharing.share(message, gettextCatalog.getString('Invitation to share a Copay Wallet'), null, null);
}
};
});
});

19
src/js/controllers/preferencesDelete.js
View file

@ -5,18 +5,23 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
this.isCordova = isCordova;
this.error = null;
var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?');
var ok_msg = gettextCatalog.getString('OK');
var cancel_msg = gettextCatalog.getString('Cancel');
var confirm_msg = gettextCatalog.getString('Confirm');
var _modalDeleteWallet = function() {
var ModalInstanceCtrl = function($scope, $modalInstance, gettext) {
$scope.title = gettext('Are you sure you want to delete this wallet?');
$scope.title = delete_msg;
$scope.loading = false;
$scope.ok = function() {
$scope.loading = true;
$modalInstance.close('ok');
$modalInstance.close(ok_msg);
};
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
$modalInstance.dismiss(cancel_msg);
};
};
@ -42,7 +47,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
if (err) {
self.error = err.message || err;
} else {
notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName}));
notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName}));
}
});
};
@ -50,16 +55,16 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
this.deleteWallet = function() {
if (isCordova) {
navigator.notification.confirm(
'Are you sure you want to delete this wallet?',
delete_msg,
function(buttonIndex) {
if (buttonIndex == 2) {
_deleteWallet();
}
},
'Confirm', ['Cancel', 'OK']
confirm_msg, [cancel_msg, ok_msg]
);
} else {
_modalDeleteWallet();
}
};
});
});