Skip to content

Commit 7fc2956

Browse files
author
Cari Spruiell
committed
Merge branch 'API-44275-test' into API-Bug-PR
# Conflicts: # app/code/Magento/Checkout/i18n/de_DE.csv # app/code/Magento/Checkout/i18n/en_US.csv # app/code/Magento/Checkout/i18n/es_ES.csv # app/code/Magento/Checkout/i18n/fr_FR.csv # app/code/Magento/Checkout/i18n/nl_NL.csv # app/code/Magento/Checkout/i18n/pt_BR.csv # app/code/Magento/Checkout/i18n/zh_Hans_CN.csv # app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
2 parents bf7df36 + 86e59e3 commit 7fc2956

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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/view/frontend/layout/checkout_cart_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<item name="subtotal" xsi:type="array">
143143
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
144144
<item name="config" xsi:type="array">
145-
<item name="title" xsi:type="string">Subtotal</item>
145+
<item name="title" xsi:type="string" translate="true">Subtotal</item>
146146
<item name="template" xsi:type="string">Magento_Checkout/cart/totals/subtotal</item>
147147
</item>
148148
</item>

app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<item name="component" xsi:type="string">Magento_Checkout/js/view/form/element/email</item>
128128
<item name="displayArea" xsi:type="string">customer-email</item>
129129
<item name="tooltip" xsi:type="array">
130-
<item name="description" xsi:type="string">We'll send your order confirmation here.</item>
130+
<item name="description" xsi:type="string" translate="true">We'll send your order confirmation here.</item>
131131
</item>
132132
<item name="children" xsi:type="array">
133133
<item name="before-login-form" xsi:type="array">
@@ -231,7 +231,7 @@
231231
<item name="telephone" xsi:type="array">
232232
<item name="config" xsi:type="array">
233233
<item name="tooltip" xsi:type="array">
234-
<item name="description" xsi:type="string">For delivery questions.</item>
234+
<item name="description" xsi:type="string" translate="true">For delivery questions.</item>
235235
</item>
236236
</item>
237237
</item>
@@ -270,7 +270,7 @@
270270
<item name="component" xsi:type="string">Magento_Checkout/js/view/form/element/email</item>
271271
<item name="displayArea" xsi:type="string">customer-email</item>
272272
<item name="tooltip" xsi:type="array">
273-
<item name="description" xsi:type="string">We'll send your order confirmation here.</item>
273+
<item name="description" xsi:type="string" translate="true">We'll send your order confirmation here.</item>
274274
</item>
275275
<item name="children" xsi:type="array">
276276
<item name="before-login-form" xsi:type="array">
@@ -365,7 +365,7 @@
365365
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/shipping</item>
366366
<item name="config" xsi:type="array">
367367
<item name="title" xsi:type="string" translate="true">Shipping</item>
368-
<item name="notCalculatedMessage" xsi:type="string">Not yet calculated</item>
368+
<item name="notCalculatedMessage" xsi:type="string" translate="true">Not yet calculated</item>
369369
</item>
370370
</item>
371371
<item name="grand-total" xsi:type="array">

0 commit comments

Comments
 (0)