Merge pull request #6576 from cmgustavo/ref/differents-fee-names

Fix fee names. Updates translation
This commit is contained in:
Matias Alejo Garcia 2017-08-17 15:01:09 +02:00 committed by GitHub
commit 3daa1f20aa
5 changed files with 17 additions and 17 deletions

View file

@ -54,7 +54,7 @@
"angular": "1.4.6",
"angular-mocks": "1.4.10",
"bezier-easing": "^2.0.3",
"bhttp": "^1.2.1",
"bhttp": "1.2.1",
"bitauth": "^0.2.1",
"bitcore-wallet-client": "5.3.0",
"bower": "^1.7.9",

View file

@ -1533,12 +1533,6 @@ msgstr ""
msgid "Invitation to share a {{appName}} Wallet"
msgstr ""
#: www/views/buyAmazon.html:49
#: www/views/buyMercadoLibre.html:48
#: www/views/topup.html:56
msgid "Invoice Fee"
msgstr ""
#: www/views/mercadoLibreCards.html:20
#: www/views/modals/mercadolibre-card-details.html:48
msgid "Invoice expired"
@ -1687,6 +1681,12 @@ msgstr ""
msgid "Merchant Message"
msgstr ""
#: www/views/buyAmazon.html:55
#: www/views/buyMercadoLibre.html:54
#: www/views/topup.html:63
msgid "Miner Fee"
msgstr ""
#: src/js/services/bwcError.js:134
msgid "Missing parameter"
msgstr ""
@ -1724,10 +1724,10 @@ msgstr ""
msgid "Name"
msgstr ""
#: www/views/buyAmazon.html:55
#: www/views/buyMercadoLibre.html:54
#: www/views/topup.html:63
msgid "Network Fee"
#: www/views/buyAmazon.html:49
#: www/views/buyMercadoLibre.html:48
#: www/views/topup.html:56
msgid "Network Cost"
msgstr ""
#: src/js/services/bwcError.js:47

View file

@ -46,13 +46,13 @@
</span>
</div>
<div class="item">
<span translate>Invoice Fee</span>
<span translate>Network Cost</span>
<span class="item-note">
<span>{{invoiceFee | currency:'$ ':2}}<span ng-if="invoiceFee"> {{currencyIsoCode}}</span>
</span>
</div>
<div class="item">
<span translate>Network Fee</span>
<span translate>Miner Fee</span>
<span class="item-note">
<span>{{networkFee | currency:'$ ':2}}<span ng-if="networkFee"> {{currencyIsoCode}}</span>
</span>

View file

@ -45,13 +45,13 @@
</span>
</div>
<div class="item">
<span translate>Invoice Fee</span>
<span translate>Network Cost</span>
<span class="item-note">
<span>{{invoiceFee | currency:'$ ':2}}<span ng-if="invoiceFee"> {{currencyIsoCode}}</span>
</span>
</div>
<div class="item">
<span translate>Network Fee</span>
<span translate>Miner Fee</span>
<span class="item-note">
<span>{{networkFee | currency:'$ ':2}}<span ng-if="networkFee"> {{currencyIsoCode}}</span>
</span>

View file

@ -53,14 +53,14 @@
</span>
</div>
<div class="item">
<span translate>Invoice Fee</span>
<span translate>Network Cost</span>
<span class="item-note">
<span ng-if="invoiceFee">{{invoiceFee | currency:currencySymbol:2}} {{currencyIsoCode}}</span>
<span ng-if="!invoiceFee">...</span>
</span>
</div>
<div class="item">
<span translate>Network Fee</span>
<span translate>Miner Fee</span>
<span class="item-note">
<span ng-if="networkFee">{{networkFee | currency:currencySymbol:2}} {{currencyIsoCode}}</span>
<span ng-if="!networkFee">...</span>