From 5b581d3be23ca604f2ff6821920723986a3de903 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Thu, 13 Sep 2018 15:06:35 +0200 Subject: [PATCH 1/7] Address types translatable --- i18n/po/template.pot | 10 ++++++++++ www/views/tab-receive.html | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 2b1068ad4..2158c4afd 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -169,9 +169,19 @@ 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 +msgid "Cash Address" +msgstr "" + +#: www/views/tab-receive.html:77 +msgid "Legacy" +msgstr "" + + #: www/views/addresses.html:64 msgid "Addresses With Balance" msgstr "" diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 07cad7f7e..9ebc19c52 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -73,8 +73,8 @@ Address Type: From 829c8f958e68d89f81fa2c41921a69c53fe1ef84 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Thu, 13 Sep 2018 15:21:29 +0200 Subject: [PATCH 2/7] buy.bitcoin.com service translatable --- i18n/po/template.pot | 16 ++++++++++++ src/js/routes.js | 2 +- src/js/services/buy-bitcoin-com.service.js | 25 +++++++++++++++++++ src/js/services/buydotbitcoindotcomService.js | 24 ------------------ www/views/buyandsell.html | 6 ++--- 5 files changed, 45 insertions(+), 28 deletions(-) create mode 100644 src/js/services/buy-bitcoin-com.service.js delete mode 100644 src/js/services/buydotbitcoindotcomService.js diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 2158c4afd..a24369a16 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -476,6 +476,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" diff --git a/src/js/routes.js b/src/js/routes.js index d2b78aac3..a712a01c1 100644 --- a/src/js/routes.js +++ b/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() { diff --git a/src/js/services/buy-bitcoin-com.service.js b/src/js/services/buy-bitcoin-com.service.js new file mode 100644 index 000000000..06b1e73c6 --- /dev/null +++ b/src/js/services/buy-bitcoin-com.service.js @@ -0,0 +1,25 @@ +'use strict'; + +(function() { + + angular + .module('bitcoincom.services') + .factory('buyBitcoinComService', buyBitcoinComService); + + function buyBitcoinComService($http, $log, $window, $filter, platformInfo, storageService, buyAndSellService, gettextCatalog) { + var service = {}; + + service.register = function() { + buyAndSellService.register({ + name: 'buydotbitcoindotcom', + logo: 'img/bitcoin-com-logo-grey.png', + location: gettextCatalog.getString('Buy Bitcoin With Credit Card'), + sref: 'tabs.buyandsell.bitcoindotcom' + }); + }; + + service.register(); + + return service; + } +})(); diff --git a/src/js/services/buydotbitcoindotcomService.js b/src/js/services/buydotbitcoindotcomService.js deleted file mode 100644 index 085c61285..000000000 --- a/src/js/services/buydotbitcoindotcomService.js +++ /dev/null @@ -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; -}); diff --git a/www/views/buyandsell.html b/www/views/buyandsell.html index f18866aa5..9a1fb5538 100644 --- a/www/views/buyandsell.html +++ b/www/views/buyandsell.html @@ -2,7 +2,7 @@ - Buy or Sell Bitcoin + Buy or Sell Bitcoin
@@ -10,8 +10,8 @@ -
Connect an Exchange
-
Buy or sell bitcoin directly from your wallet by connecting your exchange accounts.
+
Connect an Exchange
+
Buy or sell bitcoin directly from your wallet by connecting your exchange accounts.
From e4568a7c3d9facccfd9968e1295377452a3c145e Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Thu, 13 Sep 2018 15:24:42 +0200 Subject: [PATCH 3/7] "Enter Amount" translatable --- i18n/po/template.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index a24369a16..855bedddb 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -1070,7 +1070,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 From 20ef3bffc6b133524c95c593524579c3e5b68c07 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Thu, 13 Sep 2018 15:30:43 +0200 Subject: [PATCH 4/7] BWS url preference view translatable --- i18n/po/template.pot | 7 ++++++- www/views/preferencesBwsUrl.html | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 855bedddb..5aa0ade61 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -1247,6 +1247,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" @@ -3769,7 +3774,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 diff --git a/www/views/preferencesBwsUrl.html b/www/views/preferencesBwsUrl.html index 2b3c593fa..ff945ac69 100644 --- a/www/views/preferencesBwsUrl.html +++ b/www/views/preferencesBwsUrl.html @@ -1,6 +1,6 @@ - Wallet Service URL + Wallet Service URL @@ -10,7 +10,7 @@
diff --git a/www/views/preferencesInformation.html b/www/views/preferencesInformation.html index 4fe0012f2..a3c664693 100644 --- a/www/views/preferencesInformation.html +++ b/www/views/preferencesInformation.html @@ -75,7 +75,7 @@
-
+
Copayers
From 8e1ffbb008a6a55d1ceac95da6280b18941f79b4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Fri, 21 Sep 2018 12:00:21 +0200 Subject: [PATCH 7/7] Fix new format --- src/js/services/buy-bitcoin-com.service.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/js/services/buy-bitcoin-com.service.js b/src/js/services/buy-bitcoin-com.service.js index 06b1e73c6..7638edddd 100644 --- a/src/js/services/buy-bitcoin-com.service.js +++ b/src/js/services/buy-bitcoin-com.service.js @@ -6,10 +6,16 @@ .module('bitcoincom.services') .factory('buyBitcoinComService', buyBitcoinComService); - function buyBitcoinComService($http, $log, $window, $filter, platformInfo, storageService, buyAndSellService, gettextCatalog) { - var service = {}; + function buyBitcoinComService(buyAndSellService, gettextCatalog) { + var service = { - service.register = function() { + // Functions + register: register + }; + + return service; + + function register() { buyAndSellService.register({ name: 'buydotbitcoindotcom', logo: 'img/bitcoin-com-logo-grey.png', @@ -17,9 +23,5 @@ sref: 'tabs.buyandsell.bitcoindotcom' }); }; - - service.register(); - - return service; } })();