diff --git a/public/views/modals/addressbook.html b/public/views/modals/addressbook.html index f70719f38..94ebe34f4 100644 --- a/public/views/modals/addressbook.html +++ b/public/views/modals/addressbook.html @@ -3,7 +3,7 @@ - + Close diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index 302a82ef1..ed729f44f 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -5,9 +5,9 @@ - + Warning! - Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED + Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html index 8beea5fb4..d1d050a0d 100644 --- a/public/views/preferencesLanguage.html +++ b/public/views/preferencesLanguage.html @@ -13,7 +13,7 @@ All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + https://crowdin.com/project/copay. Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. diff --git a/public/views/translators.html b/public/views/translators.html index d8c4dbc94..30343cd76 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -21,7 +21,7 @@ All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + https://crowdin.com/project/copay. Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css index 4b536aadf..82225aa3e 100644 --- a/src/css/ionic-migration.css +++ b/src/css/ionic-migration.css @@ -101,6 +101,10 @@ button, .button { padding: 0; } +.create-tab .row { + padding: 0; +} + /* Override the default modal size for large devices */ @media (min-width: 680px) { .modal { 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 {
All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + https://crowdin.com/project/copay.