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

Merge pull request #3749 from cmgustavo/bug/translate-messages-mobile

Browse source 
Bug/translate messages mobile
This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-06 17:47:20 -03:00
commit 45da8a9c86
3 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

21
i18n/po/template.pot
View file

@ -250,6 +250,10 @@ msgstr ""
msgid "Buy & Sell Bitcoin" msgid "Buy & Sell Bitcoin"
msgstr "" msgstr ""
#: src/js/controllers/walletHome.js
msgid "Calculating fee"
msgstr ""
#: public/views/copayers.html #: public/views/copayers.html
#: public/views/walletHome.html #: public/views/walletHome.html
#: public/views/modals/confirmation.html #: public/views/modals/confirmation.html
@ -378,6 +382,10 @@ msgstr ""
msgid "Could not broadcast payment" msgid "Could not broadcast payment"
msgstr "" msgstr ""
#: src/js/controllers/walletHome.js
msgid "Could not calculate fee"
msgstr ""
#: src/js/services/addressService.js #: src/js/services/addressService.js
msgid "Could not create address" msgid "Could not create address"
msgstr "" msgstr ""
@ -414,10 +422,6 @@ msgstr ""
msgid "Could not fetch payment information" msgid "Could not fetch payment information"
msgstr "" msgstr ""
#: public/views/walletHome.html
msgid "Could not fetch transaction history"
msgstr ""
#: src/js/services/profileService.js #: src/js/services/profileService.js
msgid "Could not import" msgid "Could not import"
msgstr "" msgstr ""
@ -467,15 +471,12 @@ msgstr ""
msgid "Created by" msgid "Created by"
msgstr "" msgstr ""
#: public/views/disclaimer.html
msgid "Creating Profile..."
msgstr ""
#: src/js/controllers/walletHome.js #: src/js/controllers/walletHome.js
msgid "Creating transaction" msgid "Creating transaction"
msgstr "" msgstr ""
#: public/views/create.html #: public/views/create.html
#: public/views/disclaimer.html
msgid "Creating Wallet..." msgid "Creating Wallet..."
msgstr "" msgstr ""
@ -1244,10 +1245,6 @@ msgstr ""
msgid "Required number of signatures" msgid "Required number of signatures"
msgstr "" msgstr ""
#: public/views/disclaimer.html
msgid "Retrying..."
msgstr ""
#: public/views/translators.html #: public/views/translators.html
msgid "Russian" msgid "Russian"
msgstr "" msgstr ""

2
public/views/walletHome.html
View file

@ -59,7 +59,7 @@
<div class="rect4"></div> <div class="rect4"></div>
<div class="rect5"></div> <div class="rect5"></div>
</div> </div>
{{home.onGoingProcess|translate}}... {{home.onGoingProcess}}...
</div> </div>
</div> </div>

20
src/js/controllers/walletHome.js
View file

@ -375,7 +375,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
//if txp has required signatures then broadcast it //if txp has required signatures then broadcast it
var txpHasRequiredSignatures = txpsi.status == 'accepted'; var txpHasRequiredSignatures = txpsi.status == 'accepted';
if (txpHasRequiredSignatures) { if (txpHasRequiredSignatures) {
self.setOngoingProcess(gettext('Broadcasting transaction')); self.setOngoingProcess(gettextCatalog.getString('Broadcasting transaction'));
$scope.loading = true; $scope.loading = true;
fc.broadcastTxProposal(txpsi, function(err, txpsb, memo) { fc.broadcastTxProposal(txpsi, function(err, txpsb, memo) {
self.setOngoingProcess(); self.setOngoingProcess();
@ -404,7 +404,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}; };
$scope.reject = function(txp) { $scope.reject = function(txp) {
self.setOngoingProcess(gettext('Rejecting payment')); self.setOngoingProcess(gettextCatalog.getString('Rejecting payment'));
$scope.loading = true; $scope.loading = true;
$scope.error = null; $scope.error = null;
$timeout(function() { $timeout(function() {
@ -424,7 +424,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.remove = function(txp) { $scope.remove = function(txp) {
self.setOngoingProcess(gettext('Deleting payment')); self.setOngoingProcess(gettextCatalog.getString('Deleting payment'));
$scope.loading = true; $scope.loading = true;
$scope.error = null; $scope.error = null;
$timeout(function() { $timeout(function() {
@ -445,7 +445,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}; };
$scope.broadcast = function(txp) { $scope.broadcast = function(txp) {
self.setOngoingProcess(gettext('Broadcasting Payment')); self.setOngoingProcess(gettextCatalog.getString('Broadcasting Payment'));
$scope.loading = true; $scope.loading = true;
$scope.error = null; $scope.error = null;
$timeout(function() { $timeout(function() {
@ -869,7 +869,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
} }
}; };
self.setOngoingProcess(gettext('Creating transaction')); self.setOngoingProcess(gettextCatalog.getString('Creating transaction'));
$timeout(function() { $timeout(function() {
var paypro = self._paypro; var paypro = self._paypro;
var address, amount; var address, amount;
@ -935,9 +935,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
if (fc.isPrivKeyExternal() && fc.getPrivKeyExternalSourceName() == 'ledger') { if (fc.isPrivKeyExternal() && fc.getPrivKeyExternalSourceName() == 'ledger') {
self.setOngoingProcess(gettext('Requesting Ledger Wallet to sign')); self.setOngoingProcess(gettextCatalog.getString('Requesting Ledger Wallet to sign'));
} else { } else {
self.setOngoingProcess(gettext('Signing payment')); self.setOngoingProcess(gettextCatalog.getString('Signing payment'));
} }
}; };
@ -956,7 +956,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
} }
if (signedTx.status == 'accepted') { if (signedTx.status == 'accepted') {
self.setOngoingProcess(gettext('Broadcasting transaction')); self.setOngoingProcess(gettextCatalog.getString('Broadcasting transaction'));
fc.broadcastTxProposal(signedTx, function(err, btx, memo) { fc.broadcastTxProposal(signedTx, function(err, btx, memo) {
self.setOngoingProcess(); self.setOngoingProcess();
if (err) { if (err) {
@ -1085,7 +1085,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var satToUnit = 1 / this.unitToSatoshi; var satToUnit = 1 / this.unitToSatoshi;
var self = this; var self = this;
/// Get information of payment if using Payment Protocol /// Get information of payment if using Payment Protocol
self.setOngoingProcess(gettext('Fetching Payment Information')); self.setOngoingProcess(gettextCatalog.getString('Fetching Payment Information'));
$log.debug('Fetch PayPro Request...', uri); $log.debug('Fetch PayPro Request...', uri);
$timeout(function() { $timeout(function() {
@ -1274,7 +1274,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.sendAll = function() { this.sendAll = function() {
var self = this; var self = this;
self.error = null; self.error = null;
self.setOngoingProcess(gettext('Getting fee')); self.setOngoingProcess(gettextCatalog.getString('Calculating fee'));
$rootScope.$emit('Local/SetFeeSendMax', function(currentFeePerKb, availableMaxBalance, feeToSendMaxStr) { $rootScope.$emit('Local/SetFeeSendMax', function(currentFeePerKb, availableMaxBalance, feeToSendMaxStr) {
self.setOngoingProcess(); self.setOngoingProcess();
if (lodash.isNull(currentFeePerKb)) { if (lodash.isNull(currentFeePerKb)) {