Skip to content

Commit 26ee9db

Browse files
author
Robert He
committed
Merge branch 'FearlessKiwis-MAGETWO-43614-fpt-option-name' of https://github.corp.magento.com/magento-fearless-kiwis/magento2ce into develop-PR
2 parents 792822b + 01b6ddc commit 26ee9db

File tree

10 files changed

+32
-26
lines changed

10 files changed

+32
-26
lines changed

‎app/code/Magento/Weee/Model/Config/Source/Display.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,22 @@ class Display implements \Magento\Framework\Option\ArrayInterface
1515
public function toOptionArray()
1616
{
1717
return [
18-
['value' => \Magento\Weee\Model\Tax::DISPLAY_INCL, 'label' => __('Including FPT only')],
18+
[
19+
'value' => \Magento\Weee\Model\Tax::DISPLAY_INCL,
20+
'label' => __('Including FPT only')
21+
],
1922
[
2023
'value' => \Magento\Weee\Model\Tax::DISPLAY_INCL_DESCR,
2124
'label' => __('Including FPT and FPT description')
2225
],
2326
[
2427
'value' => \Magento\Weee\Model\Tax::DISPLAY_EXCL_DESCR_INCL,
25-
'label' => __('Excluding FPT, FPT description, final price')
28+
'label' => __('Excluding FPT. Including FPT description and final price')
2629
],
27-
['value' => \Magento\Weee\Model\Tax::DISPLAY_EXCL, 'label' => __('Excluding FPT')]
30+
[
31+
'value' => \Magento\Weee\Model\Tax::DISPLAY_EXCL,
32+
'label' => __('Excluding FPT')
33+
]
2834
];
2935
}
3036
}

‎app/code/Magento/Weee/Model/Tax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
2727
const DISPLAY_INCL_DESCR = 1;
2828

2929
/**
30-
* Excluding FPT, FPT description, final price
30+
* Excluding FPT. Including FPT description and final price
3131
*/
3232
const DISPLAY_EXCL_DESCR_INCL = 2;
3333

‎app/code/Magento/Weee/i18n/de_DE.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Website,Website
77
"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
88
"Including FPT only","Lediglich einschließlich FPT"
99
"Including FPT and FPT description","Einschließlich FPT und FPT-Beschreibung"
10-
"Excluding FPT, FPT description, final price","Ausschließlich FPT, FPT-Beschreibung, Endpreis"
10+
"Excluding FPT. Including FPT description and final price","Excluding FPT. Including FPT description and final price"
1111
"Excluding FPT","Ausschließlich FPT"
1212
"Fixed Product Tax","Feste Produktsteuer"
1313
Country/State,Country/State

‎app/code/Magento/Weee/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Website,Website
77
"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
88
"Including FPT only","Including FPT only"
99
"Including FPT and FPT description","Including FPT and FPT description"
10-
"Excluding FPT, FPT description, final price","Excluding FPT, FPT description, final price"
10+
"Excluding FPT. Including FPT description and final price","Excluding FPT. Including FPT description and final price"
1111
"Excluding FPT","Excluding FPT"
1212
"Fixed Product Tax","Fixed Product Tax"
1313
Country/State,Country/State

‎app/code/Magento/Weee/i18n/es_ES.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Website,Website
77
"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
88
"Including FPT only","Incluir sólo FPT"
99
"Including FPT and FPT description","Inlcuir impuestos y descripción de los impuestos"
10-
"Excluding FPT, FPT description, final price","Excluido FPT, descripción FPT, precio final"
10+
"Excluding FPT. Including FPT description and final price","Excluding FPT. Including FPT description and final price"
1111
"Excluding FPT","FPT no incluido"
1212
"Fixed Product Tax","Impuesto fijo del producto"
1313
Country/State,Country/State

‎app/code/Magento/Weee/i18n/fr_FR.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Website,Website
77
"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
88
"Including FPT only","Inclure uniquement les taxes sur les produits fixes"
99
"Including FPT and FPT description","Inclure les taxes sur les produits fixes et leur description"
10-
"Excluding FPT, FPT description, final price","Exclure les taxes sur les produits fixes, les descriptions, et le prix final"
10+
"Excluding FPT. Including FPT description and final price","Excluding FPT. Including FPT description and final price"
1111
"Excluding FPT","Exclure les taxes sur les produits fixes"
1212
"Fixed Product Tax","Taxe sur le produit fixe"
1313
Country/State,Country/State

‎app/code/Magento/Weee/i18n/nl_NL.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Website,Website
77
"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
88
"Including FPT only","Inclusief alleen FPT"
99
"Including FPT and FPT description","Inclusief FPT en FPT omschrijving"
10-
"Excluding FPT, FPT description, final price","Met uitzondering van FPT, FPT omschrijving, definitieve prijs"
10+
"Excluding FPT. Including FPT description and final price","Excluding FPT. Including FPT description and final price"
1111
"Excluding FPT","Met uitzondering van FPT"
1212
"Fixed Product Tax","Vaste Product Belasting"
1313
Country/State,Country/State

‎app/code/Magento/Weee/i18n/pt_BR.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Website,Website
77
"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
88
"Including FPT only","Incluindo somente FPT"
99
"Including FPT and FPT description","Incluindo FPT e descrição de FPT"
10-
"Excluding FPT, FPT description, final price","Excluindo FPT, descrição de FPT, preço final"
10+
"Excluding FPT. Including FPT description and final price","Excluding FPT. Including FPT description and final price"
1111
"Excluding FPT","Excluindo FPT"
1212
"Fixed Product Tax","Imposto fixo do produto"
1313
Country/State,Country/State

‎app/code/Magento/Weee/i18n/zh_Hans_CN.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Website,Website
77
"We found a duplicate of website, country and state fields for a fixed product tax","We found a duplicate of website, country and state fields for a fixed product tax"
88
"Including FPT only","仅包含 FPT"
99
"Including FPT and FPT description","包含 FPT 和 FPT 描述"
10-
"Excluding FPT, FPT description, final price","不包含 FPT，FPT 描述，最终价格"
10+
"Excluding FPT. Including FPT description and final price","Excluding FPT. Including FPT description and final price"
1111
"Excluding FPT","不包含 FPT"
1212
"Fixed Product Tax",固定产品税费
1313
Country/State,Country/State

‎dev/tests/functional/tests/app/Magento/Weee/Test/Repository/ConfigData.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,19 @@
9292
<field name="tax/weee/display_list" xsi:type="array">
9393
<item name="scope" xsi:type="string">tax</item>
9494
<item name="scope_id" xsi:type="number">1</item>
95-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
95+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
9696
<item name="value" xsi:type="number">2</item>
9797
</field>
9898
<field name="tax/weee/display" xsi:type="array">
9999
<item name="scope" xsi:type="string">tax</item>
100100
<item name="scope_id" xsi:type="number">1</item>
101-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
101+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
102102
<item name="value" xsi:type="number">2</item>
103103
</field>
104104
<field name="tax/weee/display_sales" xsi:type="array">
105105
<item name="scope" xsi:type="string">tax</item>
106106
<item name="scope_id" xsi:type="number">1</item>
107-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
107+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
108108
<item name="value" xsi:type="number">2</item>
109109
</field>
110110
<field name="tax/weee/apply_vat" xsi:type="array">
@@ -242,19 +242,19 @@
242242
<field name="tax/weee/display_list" xsi:type="array">
243243
<item name="scope" xsi:type="string">tax</item>
244244
<item name="scope_id" xsi:type="number">1</item>
245-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
245+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
246246
<item name="value" xsi:type="number">2</item>
247247
</field>
248248
<field name="tax/weee/display" xsi:type="array">
249249
<item name="scope" xsi:type="string">tax</item>
250250
<item name="scope_id" xsi:type="number">1</item>
251-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
251+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
252252
<item name="value" xsi:type="number">2</item>
253253
</field>
254254
<field name="tax/weee/display_sales" xsi:type="array">
255255
<item name="scope" xsi:type="string">tax</item>
256256
<item name="scope_id" xsi:type="number">1</item>
257-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
257+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
258258
<item name="value" xsi:type="number">2</item>
259259
</field>
260260
<field name="tax/weee/apply_vat" xsi:type="array">
@@ -392,19 +392,19 @@
392392
<field name="tax/weee/display_list" xsi:type="array">
393393
<item name="scope" xsi:type="string">tax</item>
394394
<item name="scope_id" xsi:type="number">1</item>
395-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
395+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
396396
<item name="value" xsi:type="number">2</item>
397397
</field>
398398
<field name="tax/weee/display" xsi:type="array">
399399
<item name="scope" xsi:type="string">tax</item>
400400
<item name="scope_id" xsi:type="number">1</item>
401-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
401+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
402402
<item name="value" xsi:type="number">2</item>
403403
</field>
404404
<field name="tax/weee/display_sales" xsi:type="array">
405405
<item name="scope" xsi:type="string">tax</item>
406406
<item name="scope_id" xsi:type="number">1</item>
407-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
407+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
408408
<item name="value" xsi:type="number">2</item>
409409
</field>
410410
<field name="tax/weee/apply_vat" xsi:type="array">
@@ -467,19 +467,19 @@
467467
<field name="tax/weee/display_list" xsi:type="array">
468468
<item name="scope" xsi:type="string">tax</item>
469469
<item name="scope_id" xsi:type="number">1</item>
470-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
470+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
471471
<item name="value" xsi:type="number">2</item>
472472
</field>
473473
<field name="tax/weee/display" xsi:type="array">
474474
<item name="scope" xsi:type="string">tax</item>
475475
<item name="scope_id" xsi:type="number">1</item>
476-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
476+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
477477
<item name="value" xsi:type="number">2</item>
478478
</field>
479479
<field name="tax/weee/display_sales" xsi:type="array">
480480
<item name="scope" xsi:type="string">tax</item>
481481
<item name="scope_id" xsi:type="number">1</item>
482-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
482+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
483483
<item name="value" xsi:type="number">2</item>
484484
</field>
485485
<field name="tax/weee/apply_vat" xsi:type="array">
@@ -542,19 +542,19 @@
542542
<field name="tax/weee/display_list" xsi:type="array">
543543
<item name="scope" xsi:type="string">tax</item>
544544
<item name="scope_id" xsi:type="number">1</item>
545-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
545+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
546546
<item name="value" xsi:type="number">2</item>
547547
</field>
548548
<field name="tax/weee/display" xsi:type="array">
549549
<item name="scope" xsi:type="string">tax</item>
550550
<item name="scope_id" xsi:type="number">1</item>
551-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
551+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
552552
<item name="value" xsi:type="number">2</item>
553553
</field>
554554
<field name="tax/weee/display_sales" xsi:type="array">
555555
<item name="scope" xsi:type="string">tax</item>
556556
<item name="scope_id" xsi:type="number">1</item>
557-
<item name="label" xsi:type="string">Excluding FPT, FPT description, final price</item>
557+
<item name="label" xsi:type="string">Excluding FPT. Including FPT description and final price</item>
558558
<item name="value" xsi:type="number">2</item>
559559
</field>
560560
<field name="tax/weee/apply_vat" xsi:type="array">

0 commit comments

Comments
 (0)