Merge pull request #67 from magento-api/MAGETWO-44275-mb

[API] [merchant_beta] MAGETWO-44275: Some layout xml files doesn't have translations
magento · Oct 29, 2015 · dbbbaea · dbbbaea
2 parents b725daa + 90c35f6
commit dbbbaea
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 21 deletions.
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -16,19 +16,19 @@
         <arguments>
             <argument name="imageTypes" xsi:type="array">
                 <item name="small" xsi:type="array">
-                    <item name="title" xsi:type="string">Small</item>
+                    <item name="title" xsi:type="string" translate="true">Small</item>
                     <item name="attribute" xsi:type="string">small_image</item>
                 </item>
                 <item name="main" xsi:type="array">
-                    <item name="title" xsi:type="string">Main</item>
+                    <item name="title" xsi:type="string" translate="true">Main</item>
                     <item name="attribute" xsi:type="string">image</item>
                 </item>
                 <item name="cart" xsi:type="array">
-                    <item name="title" xsi:type="string">Thumbnail</item>
+                    <item name="title" xsi:type="string" translate="true">Thumbnail</item>
                     <item name="attribute" xsi:type="string">thumbnail</item>
                 </item>
                 <item name="custom" xsi:type="array">
-                    <item name="title" xsi:type="string">Custom image</item>
+                    <item name="title" xsi:type="string" translate="true">Custom image</item>
                     <item name="attribute" xsi:type="string">custom_image</item>
                 </item>
             </argument>

diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
@@ -112,11 +112,11 @@
             <argument name="options" xsi:type="array">
                 <item name="option1" xsi:type="array">
                     <item name="value" xsi:type="string">container1</item>
-                    <item name="label" xsi:type="string">Product Info Column</item>
+                    <item name="label" xsi:type="string" translate="true">Product Info Column</item>
                 </item>
                 <item name="option2" xsi:type="array">
                     <item name="value" xsi:type="string">container2</item>
-                    <item name="label" xsi:type="string">Block after Info Column</item>
+                    <item name="label" xsi:type="string" translate="true">Block after Info Column</item>
                 </item>
             </argument>
         </arguments>

diff --git a/app/code/Magento/Catalog/etc/widget.xml b/app/code/Magento/Catalog/etc/widget.xml
@@ -96,7 +96,7 @@
                 <block class="Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser">
                     <data>
                         <item name="button" xsi:type="array">
-                            <item name="open" xsi:type="string">Select Product...</item>
+                            <item name="open" xsi:type="string" translate="true">Select Product...</item>
                         </item>
                     </data>
                 </block>
@@ -135,7 +135,7 @@
                 <block class="Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser">
                     <data>
                         <item name="button" xsi:type="array">
-                            <item name="open" xsi:type="string">Select Category...</item>
+                            <item name="open" xsi:type="string" translate="true">Select Category...</item>
                         </item>
                     </data>
                 </block>

diff --git a/app/code/Magento/Checkout/i18n/de_DE.csv b/app/code/Magento/Checkout/i18n/de_DE.csv
@@ -177,3 +177,8 @@ Register,Registrieren
 "Separate by "","".","Separate by "",""."
 "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
 "Your order has been received.","Ihre Bestellung wurde erhalten."
+"For delivery questions.","For delivery questions."
+"You can create an account after checkout.","You can create an account after checkout."
+"Not yet calculated","Not yet calculated"
+"Order Summary","Order Summary"
+"Estimated Total","Estimated Total"
diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -177,3 +177,8 @@ Register,Register
 "Separate by "","".","Separate by "",""."
 "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
 "Your order has been received.","Your order has been received."
+"For delivery questions.","For delivery questions."
+"You can create an account after checkout.","You can create an account after checkout."
+"Not yet calculated","Not yet calculated"
+"Order Summary","Order Summary"
+"Estimated Total","Estimated Total"
diff --git a/app/code/Magento/Checkout/i18n/es_ES.csv b/app/code/Magento/Checkout/i18n/es_ES.csv
@@ -177,3 +177,8 @@ Register,Registrarse
 "Separate by "","".","Separate by "",""."
 "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
 "Your order has been received.","Se recibió su pedido."
+"For delivery questions.","For delivery questions."
+"You can create an account after checkout.","You can create an account after checkout."
+"Not yet calculated","Not yet calculated"
+"Order Summary","Order Summary"
+"Estimated Total","Estimated Total"
diff --git a/app/code/Magento/Checkout/i18n/fr_FR.csv b/app/code/Magento/Checkout/i18n/fr_FR.csv
@@ -177,3 +177,8 @@ Register,S'inscrire
 "Separate by "","".","Separate by "",""."
 "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
 "Your order has been received.","Votre commande a bien été reçue."
+"For delivery questions.","For delivery questions."
+"You can create an account after checkout.","You can create an account after checkout."
+"Not yet calculated","Not yet calculated"
+"Order Summary","Order Summary"
+"Estimated Total","Estimated Total"
diff --git a/app/code/Magento/Checkout/i18n/nl_NL.csv b/app/code/Magento/Checkout/i18n/nl_NL.csv
@@ -177,3 +177,8 @@ Register,Registreer
 "Separate by "","".","Separate by "",""."
 "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
 "Your order has been received.","Uw bestelling is ontvangen."
+"For delivery questions.","For delivery questions."
+"You can create an account after checkout.","You can create an account after checkout."
+"Not yet calculated","Not yet calculated"
+"Order Summary","Order Summary"
+"Estimated Total","Estimated Total"
diff --git a/app/code/Magento/Checkout/i18n/pt_BR.csv b/app/code/Magento/Checkout/i18n/pt_BR.csv
@@ -177,3 +177,8 @@ Register,Registrar
 "Separate by "","".","Separate by "",""."
 "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
 "Your order has been received.","Seu pedido foi recebido."
+"For delivery questions.","For delivery questions."
+"You can create an account after checkout.","You can create an account after checkout."
+"Not yet calculated","Not yet calculated"
+"Order Summary","Order Summary"
+"Estimated Total","Estimated Total"
diff --git a/app/code/Magento/Checkout/i18n/zh_CN.csv b/app/code/Magento/Checkout/i18n/zh_CN.csv
@@ -177,3 +177,8 @@ Register,注册
 "Separate by "","".","Separate by "",""."
 "Send Payment Failed Email Copy Method","Send Payment Failed Email Copy Method"
 "Your order has been received.",我们已经收到您的订单。
+"For delivery questions.","For delivery questions."
+"You can create an account after checkout.","You can create an account after checkout."
+"Not yet calculated","Not yet calculated"
+"Order Summary","Order Summary"
+"Estimated Total","Estimated Total"
diff --git a/app/code/Magento/Cms/etc/widget.xml b/app/code/Magento/Cms/etc/widget.xml
@@ -17,7 +17,7 @@
                 <block class="Magento\Cms\Block\Adminhtml\Page\Widget\Chooser">
                     <data>
                         <item name="button" xsi:type="array">
-                            <item name="open" xsi:type="string">Select Page...</item>
+                            <item name="open" xsi:type="string" translate="true">Select Page...</item>
                         </item>
                     </data>
                 </block>
@@ -52,7 +52,7 @@
                 <block class="Magento\Cms\Block\Adminhtml\Block\Widget\Chooser">
                     <data>
                         <item name="button" xsi:type="array">
-                            <item name="open" xsi:type="string">Select Block...</item>
+                            <item name="open" xsi:type="string" translate="true">Select Block...</item>
                         </item>
                     </data>
                 </block>

diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
@@ -102,7 +102,7 @@
                     </item>
                     <item name="tooltip" xsi:type="array">
                         <item name="link" xsi:type="string">http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes</item>
-                        <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>
+                        <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>
                     </item>
                 </item>
             </argument>

diff --git a/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml
@@ -42,7 +42,7 @@
                                                         <item name="discount" xsi:type="array">
                                                             <item name="component"  xsi:type="string">Magento_SalesRule/js/view/summary/discount</item>
                                                             <item name="config" xsi:type="array">
-                                                                <item name="title" xsi:type="string">Discount</item>
+                                                                <item name="title" xsi:type="string" translate="true">Discount</item>
                                                             </item>
                                                         </item>
                                                     </item>

diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml
@@ -40,16 +40,16 @@
                                                         <item name="subtotal" xsi:type="array">
                                                             <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
                                                             <item name="config" xsi:type="array">
-                                                                <item name="excludingTaxMessage" xsi:type="string">Excl. Tax</item>
-                                                                <item name="includingTaxMessage" xsi:type="string">Incl. Tax</item>
+                                                                <item name="excludingTaxMessage" xsi:type="string" translate="true">Excl. Tax</item>
+                                                                <item name="includingTaxMessage" xsi:type="string" translate="true">Incl. Tax</item>
                                                             </item>
                                                         </item>
                                                         <item name="shipping" xsi:type="array">
                                                             <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/summary/shipping</item>
                                                             <item name="sortOrder" xsi:type="string">20</item>
                                                             <item name="config" xsi:type="array">
-                                                                <item name="excludingTaxMessage" xsi:type="string">Excl. Tax</item>
-                                                                <item name="includingTaxMessage" xsi:type="string">Incl. Tax</item>
+                                                                <item name="excludingTaxMessage" xsi:type="string" translate="true">Excl. Tax</item>
+                                                                <item name="includingTaxMessage" xsi:type="string" translate="true">Incl. Tax</item>
                                                             </item>
                                                         </item>
                                                         <item name="before_grandtotal" xsi:type="array">
@@ -62,16 +62,16 @@
                                                         <item name="tax" xsi:type="array">
                                                             <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/summary/tax</item>
                                                             <item name="config" xsi:type="array">
-                                                                <item name="title" xsi:type="string">Tax</item>
+                                                                <item name="title" xsi:type="string" translate="true">Tax</item>
                                                             </item>
                                                         </item>
                                                         <item name="grand-total" xsi:type="array">
                                                             <item name="component"  xsi:type="string">Magento_Tax/js/view/checkout/summary/grand-total</item>
                                                             <item name="config" xsi:type="array">
-                                                                <item name="exclTaxLabel" xsi:type="string">Order Total Excl. Tax</item>
-                                                                <item name="inclTaxLabel" xsi:type="string">Order Total Incl. Tax</item>
-                                                                <item name="basicCurrencyMessage" xsi:type="string">Your credit card will be charged for</item>
-                                                                <item name="title" xsi:type="string">Order Total</item>
+                                                                <item name="exclTaxLabel" xsi:type="string" translate="true">Order Total Excl. Tax</item>
+                                                                <item name="inclTaxLabel" xsi:type="string" translate="true">Order Total Incl. Tax</item>
+                                                                <item name="basicCurrencyMessage" xsi:type="string" translate="true">Your credit card will be charged for</item>
+                                                                <item name="title" xsi:type="string" translate="true">Order Total</item>
                                                             </item>
                                                         </item>
                                                     </item>