Skip to content

Commit dbbbaea

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request #67 from magento-api/MAGETWO-44275-mb
[API] [merchant_beta] MAGETWO-44275: Some layout xml files doesn't have translations
2 parents b725daa + 90c35f6 commit dbbbaea

File tree

14 files changed

+56
-21
lines changed

14 files changed

+56
-21
lines changed

‎app/code/Magento/Catalog/etc/adminhtml/di.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
<arguments>
1717
<argument name="imageTypes" xsi:type="array">
1818
<item name="small" xsi:type="array">
19-
<item name="title" xsi:type="string">Small</item>
19+
<item name="title" xsi:type="string" translate="true">Small</item>
2020
<item name="attribute" xsi:type="string">small_image</item>
2121
</item>
2222
<item name="main" xsi:type="array">
23-
<item name="title" xsi:type="string">Main</item>
23+
<item name="title" xsi:type="string" translate="true">Main</item>
2424
<item name="attribute" xsi:type="string">image</item>
2525
</item>
2626
<item name="cart" xsi:type="array">
27-
<item name="title" xsi:type="string">Thumbnail</item>
27+
<item name="title" xsi:type="string" translate="true">Thumbnail</item>
2828
<item name="attribute" xsi:type="string">thumbnail</item>
2929
</item>
3030
<item name="custom" xsi:type="array">
31-
<item name="title" xsi:type="string">Custom image</item>
31+
<item name="title" xsi:type="string" translate="true">Custom image</item>
3232
<item name="attribute" xsi:type="string">custom_image</item>
3333
</item>
3434
</argument>

‎app/code/Magento/Catalog/etc/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@
112112
<argument name="options" xsi:type="array">
113113
<item name="option1" xsi:type="array">
114114
<item name="value" xsi:type="string">container1</item>
115-
<item name="label" xsi:type="string">Product Info Column</item>
115+
<item name="label" xsi:type="string" translate="true">Product Info Column</item>
116116
</item>
117117
<item name="option2" xsi:type="array">
118118
<item name="value" xsi:type="string">container2</item>
119-
<item name="label" xsi:type="string">Block after Info Column</item>
119+
<item name="label" xsi:type="string" translate="true">Block after Info Column</item>
120120
</item>
121121
</argument>
122122
</arguments>

‎app/code/Magento/Catalog/etc/widget.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<block class="Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser">
9797
<data>
9898
<item name="button" xsi:type="array">
99-
<item name="open" xsi:type="string">Select Product...</item>
99+
<item name="open" xsi:type="string" translate="true">Select Product...</item>
100100
</item>
101101
</data>
102102
</block>
@@ -135,7 +135,7 @@
135135
<block class="Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser">
136136
<data>
137137
<item name="button" xsi:type="array">
138-
<item name="open" xsi:type="string">Select Category...</item>
138+
<item name="open" xsi:type="string" translate="true">Select Category...</item>
139139
</item>
140140
</data>
141141
</block>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,8 @@ Register,Registrieren
177177
"Separate by "","".","Separate by "",""."
178178
"Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
179179
"Your order has been received.","Ihre Bestellung wurde erhalten."
180+
"For delivery questions.","For delivery questions."
181+
"You can create an account after checkout.","You can create an account after checkout."
182+
"Not yet calculated","Not yet calculated"
183+
"Order Summary","Order Summary"
184+
"Estimated Total","Estimated Total"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,8 @@ Register,Register
177177
"Separate by "","".","Separate by "",""."
178178
"Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
179179
"Your order has been received.","Your order has been received."
180+
"For delivery questions.","For delivery questions."
181+
"You can create an account after checkout.","You can create an account after checkout."
182+
"Not yet calculated","Not yet calculated"
183+
"Order Summary","Order Summary"
184+
"Estimated Total","Estimated Total"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,8 @@ Register,Registrarse
177177
"Separate by "","".","Separate by "",""."
178178
"Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
179179
"Your order has been received.","Se recibió su pedido."
180+
"For delivery questions.","For delivery questions."
181+
"You can create an account after checkout.","You can create an account after checkout."
182+
"Not yet calculated","Not yet calculated"
183+
"Order Summary","Order Summary"
184+
"Estimated Total","Estimated Total"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,8 @@ Register,S'inscrire
177177
"Separate by "","".","Separate by "",""."
178178
"Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
179179
"Your order has been received.","Votre commande a bien été reçue."
180+
"For delivery questions.","For delivery questions."
181+
"You can create an account after checkout.","You can create an account after checkout."
182+
"Not yet calculated","Not yet calculated"
183+
"Order Summary","Order Summary"
184+
"Estimated Total","Estimated Total"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,8 @@ Register,Registreer
177177
"Separate by "","".","Separate by "",""."
178178
"Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
179179
"Your order has been received.","Uw bestelling is ontvangen."
180+
"For delivery questions.","For delivery questions."
181+
"You can create an account after checkout.","You can create an account after checkout."
182+
"Not yet calculated","Not yet calculated"
183+
"Order Summary","Order Summary"
184+
"Estimated Total","Estimated Total"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,8 @@ Register,Registrar
177177
"Separate by "","".","Separate by "",""."
178178
"Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
179179
"Your order has been received.","Seu pedido foi recebido."
180+
"For delivery questions.","For delivery questions."
181+
"You can create an account after checkout.","You can create an account after checkout."
182+
"Not yet calculated","Not yet calculated"
183+
"Order Summary","Order Summary"
184+
"Estimated Total","Estimated Total"

‎app/code/Magento/Checkout/i18n/zh_CN.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,8 @@ Register,注册
177177
"Separate by "","".","Separate by "",""."
178178
"Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
179179
"Your order has been received.",我们已经收到您的订单。
180+
"For delivery questions.","For delivery questions."
181+
"You can create an account after checkout.","You can create an account after checkout."
182+
"Not yet calculated","Not yet calculated"
183+
"Order Summary","Order Summary"
184+
"Estimated Total","Estimated Total"

‎app/code/Magento/Cms/etc/widget.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<block class="Magento\Cms\Block\Adminhtml\Page\Widget\Chooser">
1818
<data>
1919
<item name="button" xsi:type="array">
20-
<item name="open" xsi:type="string">Select Page...</item>
20+
<item name="open" xsi:type="string" translate="true">Select Page...</item>
2121
</item>
2222
</data>
2323
</block>
@@ -52,7 +52,7 @@
5252
<block class="Magento\Cms\Block\Adminhtml\Block\Widget\Chooser">
5353
<data>
5454
<item name="button" xsi:type="array">
55-
<item name="open" xsi:type="string">Select Block...</item>
55+
<item name="open" xsi:type="string" translate="true">Select Block...</item>
5656
</item>
5757
</data>
5858
</block>

‎app/code/Magento/Customer/view/base/ui_component/customer_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</item>
103103
<item name="tooltip" xsi:type="array">
104104
<item name="link" xsi:type="string">http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes</item>
105-
<item name="description" xsi:type="string">If your Magento site has multiple views, you can set the scope to apply to a specific view.</item>
105+
<item name="description" xsi:type="string" translate="true">If your Magento site has multiple views, you can set the scope to apply to a specific view.</item>
106106
</item>
107107
</item>
108108
</argument>

‎app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<item name="discount" xsi:type="array">
4343
<item name="component" xsi:type="string">Magento_SalesRule/js/view/summary/discount</item>
4444
<item name="config" xsi:type="array">
45-
<item name="title" xsi:type="string">Discount</item>
45+
<item name="title" xsi:type="string" translate="true">Discount</item>
4646
</item>
4747
</item>
4848
</item>

‎app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040
<item name="subtotal" xsi:type="array">
4141
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
4242
<item name="config" xsi:type="array">
43-
<item name="excludingTaxMessage" xsi:type="string">Excl. Tax</item>
44-
<item name="includingTaxMessage" xsi:type="string">Incl. Tax</item>
43+
<item name="excludingTaxMessage" xsi:type="string" translate="true">Excl. Tax</item>
44+
<item name="includingTaxMessage" xsi:type="string" translate="true">Incl. Tax</item>
4545
</item>
4646
</item>
4747
<item name="shipping" xsi:type="array">
4848
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/shipping</item>
4949
<item name="sortOrder" xsi:type="string">20</item>
5050
<item name="config" xsi:type="array">
51-
<item name="excludingTaxMessage" xsi:type="string">Excl. Tax</item>
52-
<item name="includingTaxMessage" xsi:type="string">Incl. Tax</item>
51+
<item name="excludingTaxMessage" xsi:type="string" translate="true">Excl. Tax</item>
52+
<item name="includingTaxMessage" xsi:type="string" translate="true">Incl. Tax</item>
5353
</item>
5454
</item>
5555
<item name="before_grandtotal" xsi:type="array">
@@ -62,16 +62,16 @@
6262
<item name="tax" xsi:type="array">
6363
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/tax</item>
6464
<item name="config" xsi:type="array">
65-
<item name="title" xsi:type="string">Tax</item>
65+
<item name="title" xsi:type="string" translate="true">Tax</item>
6666
</item>
6767
</item>
6868
<item name="grand-total" xsi:type="array">
6969
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/grand-total</item>
7070
<item name="config" xsi:type="array">
71-
<item name="exclTaxLabel" xsi:type="string">Order Total Excl. Tax</item>
72-
<item name="inclTaxLabel" xsi:type="string">Order Total Incl. Tax</item>
73-
<item name="basicCurrencyMessage" xsi:type="string">Your credit card will be charged for</item>
74-
<item name="title" xsi:type="string">Order Total</item>
71+
<item name="exclTaxLabel" xsi:type="string" translate="true">Order Total Excl. Tax</item>
72+
<item name="inclTaxLabel" xsi:type="string" translate="true">Order Total Incl. Tax</item>
73+
<item name="basicCurrencyMessage" xsi:type="string" translate="true">Your credit card will be charged for</item>
74+
<item name="title" xsi:type="string" translate="true">Order Total</item>
7575
</item>
7676
</item>
7777
</item>

0 commit comments

Comments
 (0)