diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 21850f9dd..e9611cab0 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -250,6 +250,10 @@ msgstr "" msgid "Buy & Sell Bitcoin" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Calculating fee" +msgstr "" + #: public/views/copayers.html #: public/views/walletHome.html #: public/views/modals/confirmation.html @@ -378,6 +382,10 @@ msgstr "" msgid "Could not broadcast payment" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Could not calculate fee" +msgstr "" + #: src/js/services/addressService.js msgid "Could not create address" msgstr "" @@ -414,10 +422,6 @@ msgstr "" msgid "Could not fetch payment information" msgstr "" -#: public/views/walletHome.html -msgid "Could not fetch transaction history" -msgstr "" - #: src/js/services/profileService.js msgid "Could not import" msgstr "" @@ -467,15 +471,12 @@ msgstr "" msgid "Created by" msgstr "" -#: public/views/disclaimer.html -msgid "Creating Profile..." -msgstr "" - #: src/js/controllers/walletHome.js msgid "Creating transaction" msgstr "" #: public/views/create.html +#: public/views/disclaimer.html msgid "Creating Wallet..." msgstr "" @@ -1244,10 +1245,6 @@ msgstr "" msgid "Required number of signatures" msgstr "" -#: public/views/disclaimer.html -msgid "Retrying..." -msgstr "" - #: public/views/translators.html msgid "Russian" msgstr "" diff --git a/public/views/walletHome.html b/public/views/walletHome.html index e11974b84..18af971ed 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -59,7 +59,7 @@
- {{home.onGoingProcess|translate}}... + {{home.onGoingProcess}}... diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index c2bccb017..c27076b7a 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -375,7 +375,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi //if txp has required signatures then broadcast it var txpHasRequiredSignatures = txpsi.status == 'accepted'; if (txpHasRequiredSignatures) { - self.setOngoingProcess(gettext('Broadcasting transaction')); + self.setOngoingProcess(gettextCatalog.getString('Broadcasting transaction')); $scope.loading = true; fc.broadcastTxProposal(txpsi, function(err, txpsb, memo) { self.setOngoingProcess(); @@ -404,7 +404,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; $scope.reject = function(txp) { - self.setOngoingProcess(gettext('Rejecting payment')); + self.setOngoingProcess(gettextCatalog.getString('Rejecting payment')); $scope.loading = true; $scope.error = null; $timeout(function() { @@ -424,7 +424,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.remove = function(txp) { - self.setOngoingProcess(gettext('Deleting payment')); + self.setOngoingProcess(gettextCatalog.getString('Deleting payment')); $scope.loading = true; $scope.error = null; $timeout(function() { @@ -445,7 +445,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; $scope.broadcast = function(txp) { - self.setOngoingProcess(gettext('Broadcasting Payment')); + self.setOngoingProcess(gettextCatalog.getString('Broadcasting Payment')); $scope.loading = true; $scope.error = null; $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() { var paypro = self._paypro; var address, amount; @@ -935,9 +935,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var fc = profileService.focusedClient; if (fc.isPrivKeyExternal() && fc.getPrivKeyExternalSourceName() == 'ledger') { - self.setOngoingProcess(gettext('Requesting Ledger Wallet to sign')); + self.setOngoingProcess(gettextCatalog.getString('Requesting Ledger Wallet to sign')); } 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') { - self.setOngoingProcess(gettext('Broadcasting transaction')); + self.setOngoingProcess(gettextCatalog.getString('Broadcasting transaction')); fc.broadcastTxProposal(signedTx, function(err, btx, memo) { self.setOngoingProcess(); if (err) { @@ -1085,7 +1085,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var satToUnit = 1 / this.unitToSatoshi; var self = this; /// 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); $timeout(function() { @@ -1274,7 +1274,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.sendAll = function() { var self = this; self.error = null; - self.setOngoingProcess(gettext('Getting fee')); + self.setOngoingProcess(gettextCatalog.getString('Calculating fee')); $rootScope.$emit('Local/SetFeeSendMax', function(currentFeePerKb, availableMaxBalance, feeToSendMaxStr) { self.setOngoingProcess(); if (lodash.isNull(currentFeePerKb)) {