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

Merge pull request #6871 from cmgustavo/bug/meli-texts-01

Browse source 
Bug/meli texts 01
This commit is contained in:
Javier Donadío 2017-10-10 09:35:55 -03:00 • committed by GitHub
commit 8402f84579
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
i18n/po/template.pot
View file

@ -1335,16 +1335,16 @@ msgstr ""
msgid "Getting fee levels..."
msgstr ""
#: www/views/buyAmazon.html:43
#: www/views/buyMercadoLibre.html:42
msgid "Gift Card"
msgstr ""
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
msgstr ""
#: www/views/buyAmazon.html:43
#: www/views/buyMercadoLibre.html:42
msgid "Gift card"
msgstr ""
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr ""

12
src/js/controllers/buyMercadoLibre.js
View file

@ -54,7 +54,7 @@ angular.module('copayApp.controllers').controller('buyMercadoLibreController', f
var statusChangeHandler = function(processName, showName, isOn) {
$log.debug('statusChangeHandler: ', processName, showName, isOn);
if (processName == 'Comprando Vale-presente' && !isOn) {
if (processName == 'Comprando Vale-Presente' && !isOn) {
$scope.sendStatus = 'success';
$timeout(function() {
$scope.$digest();
@ -174,14 +174,14 @@ angular.module('copayApp.controllers').controller('buyMercadoLibreController', f
$log.debug("creating gift card " + count);
if (err) {
$scope.sendStatus = '';
ongoingProcess.set('Comprando Vale-presente', false, statusChangeHandler);
ongoingProcess.set('Comprando Vale-Presente', false, statusChangeHandler);
giftCard = {};
giftCard.status = 'FAILURE';
}
if (giftCard && giftCard.cardStatus && (giftCard.cardStatus != 'active' && giftCard.cardStatus != 'inactive' && giftCard.cardStatus != 'expired')) {
$scope.sendStatus = '';
ongoingProcess.set('Comprando Vale-presente', false, statusChangeHandler);
ongoingProcess.set('Comprando Vale-Presente', false, statusChangeHandler);
giftCard = {};
giftCard.status = 'FAILURE';
}
@ -205,7 +205,7 @@ angular.module('copayApp.controllers').controller('buyMercadoLibreController', f
newData['uuid'] = dataSrc.uuid;
mercadoLibreService.savePendingGiftCard(newData, null, function(err) {
ongoingProcess.set('Comprando Vale-presente', false, statusChangeHandler);
ongoingProcess.set('Comprando Vale-Presente', false, statusChangeHandler);
$log.debug("Saving new gift card with status: " + newData.status);
$scope.mlGiftCard = newData;
});
@ -311,10 +311,10 @@ angular.module('copayApp.controllers').controller('buyMercadoLibreController', f
return;
}
ongoingProcess.set('Comprando Vale-presente', true, statusChangeHandler);
ongoingProcess.set('Comprando Vale-Presente', true, statusChangeHandler);
publishAndSign($scope.wallet, createdTx, function() {}, function(err, txSent) {
if (err) {
ongoingProcess.set('Comprando Vale-presente', false, statusChangeHandler);
ongoingProcess.set('Comprando Vale-Presente', false, statusChangeHandler);
showError(gettextCatalog.getString('Could not send transaction'), err);
return;
}

2
www/views/buyAmazon.html
View file

@ -40,7 +40,7 @@
Details
</div>
<div class="item">
<span translate>Gift card</span>
<span translate>Gift Card</span>
<span class="item-note">
{{amount | currency:'$ ':2}}<span ng-if="amount"> {{currencyIsoCode}}</span>
</span>

4
www/views/buyMercadoLibre.html
View file

@ -16,7 +16,7 @@
<i class="icon big-icon-svg">
<div class="bg icon-amazon"></div>
</i>
<span>Vales-Presente do Mercado Livre Brasil</span>
<span>Vale-Presente do Mercado Livre Brasil</span>
</div>
<div class="amount-label">
<div class="amount">{{amountUnitStr}}</div>
@ -39,7 +39,7 @@
Details
</div>
<div class="item">
<span translate>Gift card</span>
<span translate>Gift Card</span>
<span class="item-note">
{{amount | currency:'$ ':2}}<span ng-if="amount"> {{currencyIsoCode}}</span>
</span>

2
www/views/modals/mercadolibre-card-details.html
View file

@ -20,7 +20,7 @@
<div ng-show="card.cardStatus == 'active'">
<div class="redeem-pin" copy-to-clipboard="card.pin">{{card.pin}}</div>
<button class="button-redeem"
ng-click="openExternalLink('https://www.mercadolivre.com.br/redeem?pin=' + card.pin)" translate>
ng-click="openExternalLink('https://www.mercadolivre.com.br')" translate>
Redeem now
</button>
</div>