Fix new format

i18n/po/template.pot

@@ -169,9 +169,21 @@ msgid "Address Book"
 msgstr ""
 
 #: www/views/preferencesInformation.html:41
+#: www/views/tab-receive.html:73
 msgid "Address Type"
 msgstr ""
 
+#: www/views/tab-receive.html:76
+#: www/views/addresses.html:45
+msgid "Cash Address"
+msgstr ""
+
+#: www/views/tab-receive.html:77
+#: www/views/addresses.html:46
+msgid "Legacy"
+msgstr ""
+
+
 #: www/views/addresses.html:64
 msgid "Addresses With Balance"
 msgstr ""
@@ -466,6 +478,22 @@ msgstr ""
 msgid "Buy Bitcoin"
 msgstr ""
 
+#: www/views/buyandsell.html:5
+msgid "Buy or Sell Bitcoin"
+msgstr ""
+
+#: www/views/buyandsell.html:13
+msgid "Connect an Exchange"
+msgstr ""
+
+#: www/views/buyandsell.html:14
+msgid "Buy or sell bitcoin directly from your wallet by connecting your exchange accounts."
+msgstr ""
+
+#: src/js/services/buy-bitcoin-com.service.js:14
+msgid "Buy Bitcoin With Credit Card"
+msgstr ""
+
 #: www/views/mercadoLibre.html:22
 #: www/views/mercadoLibre.html:50
 msgid "Buy a Gift Card"
@@ -567,6 +595,7 @@ msgstr ""
 #: www/views/modals/search.html:3
 #: www/views/modals/wallet-balance.html:3
 #: www/views/modals/wallets.html:5
+#: www/views/modals/txp-details.html:4
 msgid "Close"
 msgstr ""
 
@@ -870,6 +899,10 @@ msgstr ""
 msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
 msgstr ""
 
+#: www/views/preferencesInformation.html:79
+msgid "Copayers"
+msgstr ""
+
 #: www/views/modals/txp-details.html:81
 #: www/views/tx-details.html:60
 msgid "Created by"
@@ -1044,7 +1077,7 @@ msgid "Enter Two Factor for your BitPay account"
 msgstr ""
 
 #: www/views/amount.html:4
-msgid "Enter amount"
+msgid "Enter Amount"
 msgstr ""
 
 #: www/views/modals/chooseFeeLevel.html:41
@@ -1208,6 +1241,14 @@ msgstr ""
 msgid "Expires"
 msgstr ""
 
+#: www/views/modals/txp-details.html:65
+msgid "Display legacy address"
+msgstr ""
+
+#: www/views/modals/txp-details.html:68
+msgid "Display new style address"
+msgstr ""
+
 #: www/views/preferencesAdvanced.html:21
 msgid "Export Wallet"
 msgstr ""
@@ -1221,6 +1262,11 @@ msgstr ""
 msgid "Export wallet"
 msgstr ""
 
+#: www/views/preferencesBwsUrl.html:3
+#: www/views/preferencesBwsUrl.html:13
+msgid "Wallet Service URL"
+msgstr ""
+
 #: src/js/services/walletService.js:1174
 #: www/views/tab-export-qrCode.html:9
 msgid "Exporting via QR not supported for this wallet"
@@ -1541,7 +1587,7 @@ msgid "If enabled, the Recent Transactions card - a list of transactions occurin
 msgstr ""
 
 #: www/views/advancedSettings.html:14
-msgid "If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays."
+msgid "If enabled, wallets will also try to spend unconfirmed funds. Turning off this option may cause transaction delays."
 msgstr ""
 
 #: src/js/controllers/onboarding/backupRequest.js:18
@@ -3743,7 +3789,7 @@ msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
 msgstr ""
 
 #: www/views/preferencesBwsUrl.html:21
-msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
+msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and wallet synchronization. The default configuration points to https://bws.bitcoin.com (Bitcoin.com's public BWS instance)."
 msgstr ""
 
 #: src/js/controllers/confirm.js:408

src/js/routes.js

@@ -1207,7 +1207,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       });
   })
-  .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ buydotbitcoindotcomService, pushNotificationsService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService, rateService) {
+  .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ buyBitcoinComService, pushNotificationsService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService, rateService) {
     
     $ionicPlatform.ready(function() { 
 

src/js/services/buy-bitcoin-com.service.js

@@ -0,0 +1,27 @@
+'use strict';
+
+(function() {
+
+  angular
+      .module('bitcoincom.services')
+      .factory('buyBitcoinComService', buyBitcoinComService);
+
+  function buyBitcoinComService(buyAndSellService, gettextCatalog) {
+    var service = {
+
+      // Functions
+      register: register
+    };
+
+    return service;
+
+    function register() {
+      buyAndSellService.register({
+        name: 'buydotbitcoindotcom',
+        logo: 'img/bitcoin-com-logo-grey.png',
+        location: gettextCatalog.getString('Buy Bitcoin With Credit Card'),
+        sref: 'tabs.buyandsell.bitcoindotcom'
+      });
+    };
+  }
+})();

src/js/services/buydotbitcoindotcomService.js

@@ -1,24 +0,0 @@
-'use strict';
-
-angular.module('copayApp.services').factory('buydotbitcoindotcomService', function($http, $log, $window, $filter, platformInfo, storageService, buyAndSellService, lodash, configService, txFormatService) {
-  var root = {};
-  var credentials = {};
-  var isCordova = platformInfo.isCordova;
-
-  root.init = function(cb) {
-
-  };
-
-  var register = function() {
-
-      buyAndSellService.register({
-        name: 'buydotbitcoindotcom',
-        logo: 'img/bitcoin-com-logo-grey.png',
-        location: 'Buy Bitcoin With Credit Card',
-        sref: 'tabs.buyandsell.bitcoindotcom'
-      });
-  };
-
-  register();
-  return root;
-});

www/views/addresses.html

@@ -39,11 +39,11 @@
 
         <div ng-if="showAddressTypes" class="item item-input item-select">
           <div class="view-all input-label" translate>
-            Address type
+            Address Type
           </div>
           <select ng-model="addressType.type">
-            <option value="cashaddr">Cash Address</option>
+            <option value="cashaddr" translate>Cash Address</option>
-            <option value="legacy">Legacy</option>
+            <option value="legacy" translate>Legacy</option>
             <option value="bitpay">BitPay</option>
           </select>
         </div>

www/views/buyandsell.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
     </ion-nav-back-button>
-    <ion-nav-title>Buy or Sell Bitcoin</ion-nav-title>
+    <ion-nav-title translate>Buy or Sell Bitcoin</ion-nav-title>
   </ion-nav-bar>
   <ion-content>
     <div class="list">
@@ -10,8 +10,8 @@
         <i class="icon buy-and-sell-icon">
           <img src="img/icon-bitcoin.svg"/>
         </i>
-        <div class="explain-heading">Connect an Exchange</div>
+        <div class="explain-heading" translate>Connect an Exchange</div>
-        <div class="explain-description">Buy or sell bitcoin directly from your wallet by connecting your exchange accounts.</div>
+        <div class="explain-description" translate>Buy or sell bitcoin directly from your wallet by connecting your exchange accounts.</div>
       </div>
       <div class="item item-divider"></div>
       <div ng-repeat="service in services">

www/views/modals/txp-details.html

@@ -1,6 +1,6 @@
 <ion-modal-view id="txp-details" ng-controller="txpDetailsController" ng-init="init()">
   <ion-header-bar align-title="center" class="bar-royal">
-    <button class="button button-clear" ng-click="close()">
+    <button class="button button-clear" ng-click="close()" translate>
       Close
     </button>
     <div class="title" translate>

www/views/preferencesBwsUrl.html

@@ -1,6 +1,6 @@
 <ion-view class="settings" show-tabs>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-title>Wallet Service URL</ion-nav-title>
+    <ion-nav-title translate>Wallet Service URL</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
@@ -10,7 +10,7 @@
 
     <div class="list settings-list settings-input-group">
       <label class="item item-input item-stacked-label">
-        <span class="input-label">Wallet Service URL</span>
+        <span class="input-label" translate>Wallet Service URL</span>
         <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl.value">
       </label>
       <button class="no-border postfix" on-tap="resetDefaultUrl()">

www/views/preferencesInformation.html

@@ -75,7 +75,7 @@
         </span>
       </div>
 
-      <div ng-show="wallet.cachedStatus.wallet.copayers[0]" class="item item-divider">
+      <div ng-show="wallet.cachedStatus.wallet.copayers[0]" class="item item-divider" translate>
         Copayers
       </div>
 

www/views/tab-receive.html

@@ -73,8 +73,8 @@
               <span translate>Address Type</span>:
             </div>
             <select ng-model="bchAddressType.type" ng-change="displayAddress(bchAddressType.type)">
-              <option value="cashaddr">Cash Address</option>
+              <option value="cashaddr" translate>Cash Address</option>
-              <option value="legacy">Legacy</option>
+              <option value="legacy" translate>Legacy</option>
               <option value="bitpay">BitPay</option>
             </select>
           </label>