From cfd3e5a9f1b1337ad0db0c8dec8a92f8b73a577a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 15 Jun 2016 10:30:15 -0300 Subject: [PATCH] Fix translations for onGoingProcess --- src/js/services/onGoingProcess.js | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js index 48179e6f2..69cd9abbf 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -1,33 +1,33 @@ 'use strict'; -angular.module('copayApp.services').factory('ongoingProcess', function($log, $timeout, lodash, $ionicLoading, gettextCatalog, platformInfo) { +angular.module('copayApp.services').factory('ongoingProcess', function($log, $timeout, $filter, lodash, $ionicLoading, gettext, platformInfo) { var root = {}; var isCordova = platformInfo.isCordova; var ongoingProcess = {}; var processNames = { - 'scanning': gettextCatalog.getString('Scanning Wallet funds...'), - 'recreating': gettextCatalog.getString('Recreating Wallet...'), - 'generatingCSV': gettextCatalog.getString('Generating .csv file...'), - 'creatingTx': gettextCatalog.getString('Creating transaction'), - 'sendingTx': gettextCatalog.getString('Sending transaction'), - 'signingTx': gettextCatalog.getString('Signing transaction'), - 'broadcastingTx': gettextCatalog.getString('Broadcasting transaction'), - 'fetchingPayPro': gettextCatalog.getString('Fetching Payment Information'), - 'calculatingFee': gettextCatalog.getString('Calculating fee'), - 'joiningWallet': gettextCatalog.getString('Joining Wallet...'), - 'retrivingInputs': gettextCatalog.getString('Retrieving inputs information'), - 'creatingWallet': gettextCatalog.getString('Creating Wallet...'), - 'validatingWallet': gettextCatalog.getString('Validating wallet integrity...'), - 'connectingledger': gettextCatalog.getString('Waiting for Ledger...'), - 'connectingtrezor': gettextCatalog.getString('Waiting for Trezor...'), - 'validatingWords': gettextCatalog.getString('Validating recovery phrase...'), - 'connectingCoinbase': gettextCatalog.getString('Connecting to Coinbase...'), - 'connectingGlidera': gettextCatalog.getString('Connecting to Glidera...'), - 'importingWallet': gettextCatalog.getString('Importing Wallet...'), - 'sweepingWallet': gettextCatalog.getString('Sweeping Wallet...'), - 'deletingWallet': gettextCatalog.getString('Deleting Wallet...'), + 'scanning': gettext('Scanning Wallet funds...'), + 'recreating': gettext('Recreating Wallet...'), + 'generatingCSV': gettext('Generating .csv file...'), + 'creatingTx': gettext('Creating transaction'), + 'sendingTx': gettext('Sending transaction'), + 'signingTx': gettext('Signing transaction'), + 'broadcastingTx': gettext('Broadcasting transaction'), + 'fetchingPayPro': gettext('Fetching Payment Information'), + 'calculatingFee': gettext('Calculating fee'), + 'joiningWallet': gettext('Joining Wallet...'), + 'retrivingInputs': gettext('Retrieving inputs information'), + 'creatingWallet': gettext('Creating Wallet...'), + 'validatingWallet': gettext('Validating wallet integrity...'), + 'connectingledger': gettext('Waiting for Ledger...'), + 'connectingtrezor': gettext('Waiting for Trezor...'), + 'validatingWords': gettext('Validating recovery phrase...'), + 'connectingCoinbase': gettext('Connecting to Coinbase...'), + 'connectingGlidera': gettext('Connecting to Glidera...'), + 'importingWallet': gettext('Importing Wallet...'), + 'sweepingWallet': gettext('Sweeping Wallet...'), + 'deletingWallet': gettext('Deleting Wallet...'), }; root.clear = function() { @@ -48,7 +48,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti // The first one root.onGoingProcessName = name; - var showName = processNames[name] || gettextCatalog.getString(name); + var showName = $filter('translate')(processNames[name] || name); if (root.onGoingProcessName) { if (isCordova) { @@ -57,7 +57,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti var tmpl = '' + showName; $ionicLoading.show({ - template: tmpl, + template: tmpl }); } } else {