Merge pull request #3050 from cmgustavo/translation/updates-fee-levels

Translation/updates fee levels

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 ""

public/views/preferences.html

@@ -81,7 +81,7 @@
       <span translate>Bitcoin Network Fee Policy</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
-        <span class="text-capitalize">{{index.currentFeeLevel}}</span>
+        <span class="text-capitalize">{{index.feeOpts[index.currentFeeLevel]|translate}}</span>
       </span>
     </li> 
     <li class="line-b p20" ng-click="$root.go('preferencesBwsUrl')">

public/views/preferencesFee.html

@@ -7,7 +7,7 @@
   <ul class="no-bullet m0 size-14"> 
     <li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
       ng-click="prefFee.save(fee.level)" class="line-b p20">
-      <span class="text-capitalize">{{fee.level}}</span>
+      <span class="text-capitalize">{{index.feeOpts[fee.level]|translate}}</span>
       <i class="fi-check size-16 right" ng-show="index.currentFeeLevel == fee.level"></i>
     </li>
   </ul>

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;

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;