diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 2750d2fb1..1b5c24a14 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -29,6 +29,9 @@ msgid "About Copay" msgstr "" #: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Accept" msgstr "" @@ -169,8 +172,10 @@ msgstr "" #: public/views/copayers.html #: public/views/walletHome.html +#: public/views/modals/confirmation.html #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Cancel" msgstr "" @@ -214,6 +219,7 @@ msgstr "" #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Confirm" msgstr "" @@ -225,7 +231,9 @@ msgstr "" msgid "Copayers" msgstr "" +#: src/js/controllers/backup.js #: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js msgid "Copied to clipboard" msgstr "" @@ -398,6 +406,10 @@ msgstr "" msgid "ENTER" msgstr "" +#: src/js/services/feeService.js +msgid "Economy" +msgstr "" + #: public/views/preferences.html msgid "Email Notifications" msgstr "" @@ -658,10 +670,6 @@ msgstr "" msgid "New Payment Proposal" msgstr "" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "" - #: public/views/walletHome.html msgid "No Private key" msgstr "" @@ -670,6 +678,10 @@ msgstr "" msgid "No transactions yet" msgstr "" +#: src/js/services/feeService.js +msgid "Normal" +msgstr "" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" @@ -680,11 +692,6 @@ 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 "" @@ -813,6 +820,14 @@ msgstr "" msgid "Preferences" msgstr "" +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "" + +#: src/js/services/feeService.js +msgid "Priority" +msgstr "" + #: public/views/modals/customized-amount.html msgid "QR Code" msgstr "" diff --git a/public/views/preferences.html b/public/views/preferences.html index c8753e221..c5f31797e 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -81,7 +81,7 @@ Bitcoin Network Fee Policy - {{index.currentFeeLevel}} + {{index.feeOpts[index.currentFeeLevel]|translate}}
  • diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index b0c740745..cc9d8c9b6 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -7,7 +7,7 @@ diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index e7528e530..5989c3ca3 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -10,12 +10,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r return (parseFloat(number.toPrecision(12))); }; - self.goHome = function() { go.walletHome(); }; - self.menu = [{ 'title': gettext('Home'), 'icon': 'icon-home', @@ -66,6 +64,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r isoCode: 'ja', }]; + self.feeOpts = feeService.feeOpts; + self.setOngoingProcess = function(processName, isOn) { $log.debug('onGoingProcess', processName, isOn); self[processName] = isOn; diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index d37df45a7..99dde9bff 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -1,8 +1,15 @@ 'use strict'; -angular.module('copayApp.services').factory('feeService', function($log, profileService, configService) { +angular.module('copayApp.services').factory('feeService', function($log, profileService, configService, gettextCatalog) { var root = {}; + // Constant fee options to translate + root.feeOpts = { + priority: gettextCatalog.getString('Priority'), + normal: gettextCatalog.getString('Normal'), + economy: gettextCatalog.getString('Economy') + }; + root.getCurrentFeeValue = function(cb) { var fc = profileService.focusedClient; var config = configService.getSync().wallet.settings;