From aa3870a83195c9cce1a88139bc8a52cabb1b2693 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 29 Jul 2015 13:07:35 -0300 Subject: [PATCH 1/4] Updates fee levels strings for translate --- public/views/preferences.html | 2 +- public/views/preferencesFee.html | 2 +- src/js/services/feeService.js | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index c8753e221..6f3c7db24 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -81,7 +81,7 @@ Bitcoin Network Fee Policy - {{index.currentFeeLevel}} + {{index.currentFeeLevel|translate}}
  • diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index b0c740745..a1c2c4c84 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -7,7 +7,7 @@ diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index d37df45a7..c76c76223 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 + var feeOpts = [ + gettextCatalog.getString('priority'), + gettextCatalog.getString('normal'), + gettextCatalog.getString('economy') + ]; + root.getCurrentFeeValue = function(cb) { var fc = profileService.focusedClient; var config = configService.getSync().wallet.settings; From 7c69e867717c1c4c97d579d4fd28c39bc6b6b5b9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 29 Jul 2015 13:08:33 -0300 Subject: [PATCH 2/4] Updates template.pot --- i18n/po/template.pot | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 2750d2fb1..571f32eea 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 "" @@ -658,10 +666,6 @@ msgstr "" msgid "New Payment Proposal" msgstr "" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "" - #: public/views/walletHome.html msgid "No Private key" msgstr "" @@ -680,11 +684,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 +812,10 @@ msgstr "" msgid "Preferences" msgstr "" +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "" + #: public/views/modals/customized-amount.html msgid "QR Code" msgstr "" @@ -1219,6 +1222,10 @@ msgstr "" msgid "Your wallet has been imported correctly" msgstr "" +#: src/js/services/feeService.js +msgid "economy" +msgstr "" + #: public/views/preferencesEmail.html msgid "email for wallet notifications" msgstr "" @@ -1227,6 +1234,10 @@ msgstr "" msgid "locked by pending payments" msgstr "" +#: src/js/services/feeService.js +msgid "normal" +msgstr "" + #: public/views/copayers.html #: public/views/walletHome.html #: public/views/includes/sidebar.html @@ -1237,6 +1248,10 @@ msgstr "" msgid "optional" msgstr "" +#: src/js/services/feeService.js +msgid "priority" +msgstr "" + #: public/views/preferences.html msgid "settings" msgstr "" From 458a17e0bed0c5d34c65b43512c036acc8261d41 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 30 Jul 2015 15:26:16 -0300 Subject: [PATCH 3/4] Uses object for level options --- public/views/preferences.html | 2 +- public/views/preferencesFee.html | 2 +- src/js/controllers/index.js | 4 ++-- src/js/services/feeService.js | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index 6f3c7db24..c5f31797e 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -81,7 +81,7 @@ Bitcoin Network Fee Policy - {{index.currentFeeLevel|translate}} + {{index.feeOpts[index.currentFeeLevel]|translate}}
  • diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index a1c2c4c84..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 737cb0520..c47660b94 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 c76c76223..99dde9bff 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -4,11 +4,11 @@ angular.module('copayApp.services').factory('feeService', function($log, profile var root = {}; // Constant fee options to translate - var feeOpts = [ - gettextCatalog.getString('priority'), - gettextCatalog.getString('normal'), - gettextCatalog.getString('economy') - ]; + root.feeOpts = { + priority: gettextCatalog.getString('Priority'), + normal: gettextCatalog.getString('Normal'), + economy: gettextCatalog.getString('Economy') + }; root.getCurrentFeeValue = function(cb) { var fc = profileService.focusedClient; From 0a169ca627c0cf5232005b3d86eb2b78ad92e036 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 30 Jul 2015 15:28:14 -0300 Subject: [PATCH 4/4] Updates pot --- i18n/po/template.pot | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 571f32eea..1b5c24a14 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -406,6 +406,10 @@ msgstr "" msgid "ENTER" msgstr "" +#: src/js/services/feeService.js +msgid "Economy" +msgstr "" + #: public/views/preferences.html msgid "Email Notifications" msgstr "" @@ -674,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" @@ -816,6 +824,10 @@ msgstr "" msgid "Preparing backup..." msgstr "" +#: src/js/services/feeService.js +msgid "Priority" +msgstr "" + #: public/views/modals/customized-amount.html msgid "QR Code" msgstr "" @@ -1222,10 +1234,6 @@ msgstr "" msgid "Your wallet has been imported correctly" msgstr "" -#: src/js/services/feeService.js -msgid "economy" -msgstr "" - #: public/views/preferencesEmail.html msgid "email for wallet notifications" msgstr "" @@ -1234,10 +1242,6 @@ msgstr "" msgid "locked by pending payments" msgstr "" -#: src/js/services/feeService.js -msgid "normal" -msgstr "" - #: public/views/copayers.html #: public/views/walletHome.html #: public/views/includes/sidebar.html @@ -1248,10 +1252,6 @@ msgstr "" msgid "optional" msgstr "" -#: src/js/services/feeService.js -msgid "priority" -msgstr "" - #: public/views/preferences.html msgid "settings" msgstr ""