anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #226 from Bitcoin-com/wallet/task/442

Browse source 
442 - Missing "Price Display" translation
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-08 10:54:21 +09:00 • committed by GitHub
commit 06ffa4c233
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
i18n/po/template.pot
View file

@ -197,6 +197,20 @@ msgstr ""
msgid "Alternative Currency" msgid "Alternative Currency"
msgstr "" msgstr ""
#: www/views/tab-settings.html:75
msgid "Price Display"
msgstr ""
#: src/js/controllers/tab-settings.js:19
#: www/views/preferencesPriceDisplay.html:12
msgid "Fiat"
msgstr ""
#: src/js/controllers/tab-settings.js:19
#: www/views/preferencesPriceDisplay.html:15
msgid "Cryptocurrency"
msgstr ""
#: src/js/controllers/buyAmazon.js:98 #: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later." msgid "Amazon.com is not available at this moment. Please try back later."
msgstr "" msgstr ""

2
src/js/controllers/tab-settings.js
View file

@ -16,7 +16,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
isoCode: config.wallet.settings.alternativeIsoCode isoCode: config.wallet.settings.alternativeIsoCode
}; };
$scope.selectedPriceDisplay = config.wallet.settings.priceDisplay; $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay === 'crypto' ? gettextCatalog.getString('Cryptocurrency') : gettextCatalog.getString('Fiat');
// TODO move this to a generic service // TODO move this to a generic service
bitpayAccountService.getAccounts(function(err, data) { bitpayAccountService.getAccounts(function(err, data) {

10
www/views/preferencesPriceDisplay.html
View file

@ -1,18 +1,18 @@
<ion-view id="settings-pricedisplay" class="settings" show-tabs> <ion-view id="settings-pricedisplay" class="settings" show-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title> <ion-nav-title>
{{'Price display'|translate}} {{'Price Display'|translate}}
</ion-nav-title> </ion-nav-title>
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>
</ion-nav-bar> </ion-nav-bar>
<ion-content> <ion-content>
<div class="price-display"> <div class="price-display">
<ion-radio class="capitalize" ng-value="'fiat'" ng-model="selectedPriceDisplay" ng-click="save(selectedPriceDisplay)"> <ion-radio ng-value="'fiat'" ng-model="selectedPriceDisplay" ng-click="save(selectedPriceDisplay)">
fiat <span translate>Fiat</span>
</ion-radio> </ion-radio>
<ion-radio class="capitalize" ng-value="'crypto'" ng-model="selectedPriceDisplay" ng-click="save(selectedPriceDisplay)"> <ion-radio ng-value="'crypto'" ng-model="selectedPriceDisplay" ng-click="save(selectedPriceDisplay)">
cryptocurrency <span translate>Cryptocurrency</span>
</ion-radio> </ion-radio>
</div> </div>
</ion-content> </ion-content>