Skip to content

Commit 99967eb

Browse files
author
Olexii Korshenko
committed
Merge branch 'checkout-new' into checkout
# Conflicts: # app/code/Magento/Payment/view/base/web/images/cc/ae.png # app/code/Magento/Payment/view/base/web/images/cc/di.png # app/code/Magento/Payment/view/base/web/images/cc/dn.png # app/code/Magento/Payment/view/base/web/images/cc/jc.png # app/code/Magento/Payment/view/base/web/images/cc/mc.png # app/code/Magento/Payment/view/base/web/images/cc/sm.png # app/code/Magento/Payment/view/base/web/images/cc/un.png # app/code/Magento/Payment/view/base/web/images/cc/vi.png
2 parents 8e16f36 + 777751d commit 99967eb

File tree

23 files changed

+81
-13
lines changed

23 files changed

+81
-13
lines changed

app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ private function processPaymentConfiguration(array &$configuration, array $eleme
169169
'telephone' => [
170170
'config' => [
171171
'tooltip' => [
172-
'description' => 'For delivery Questions',
172+
'description' => 'For delivery questions.',
173173
],
174174
],
175175
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
<item name="telephone" xsi:type="array">
215215
<item name="config" xsi:type="array">
216216
<item name="tooltip" xsi:type="array">
217-
<item name="description" xsi:type="string">For delivery Questions</item>
217+
<item name="description" xsi:type="string">For delivery questions.</item>
218218
</item>
219219
</item>
220220
</item>

app/code/Magento/Checkout/view/frontend/web/template/shipping.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<!--Shipping method template-->
5151
<li id="opc-shipping_method" data-bind="fadeVisible: visible(), blockLoader: isLoading" role="presentation">
5252
<div class="checkout-shipping-method">
53-
<div class="step-title" data-bind="text: $t('Shipping Method')" data-role="title"></div>
53+
<div class="step-title" data-bind="text: $t('Shipping Methods')" data-role="title"></div>
5454
<!-- ko foreach: getRegion('before-shipping-method-form') -->
5555
<!-- ko template: getTemplate() --><!-- /ko -->
5656
<!-- /ko -->

app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active'}}">
99
<div class="title" data-role="title">
1010
<strong role="heading"><span data-bind="text: getItemsQty()"></span>
11-
<!-- ko text: $t('Items in cart') --><!-- /ko -->
11+
<!-- ko text: $t('Items in Cart') --><!-- /ko -->
1212
</strong>
1313
</div>
1414
<div class="content minicart-items" data-role="content">
@@ -32,7 +32,7 @@
3232
<div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active', 'active': true}}">
3333
<div class="title" data-role="title">
3434
<strong role="heading"><span data-bind="text: getItemsQty()"></span>
35-
<!-- ko text: $t('Items in cart') --><!-- /ko -->
35+
<!-- ko text: $t('Items in Cart') --><!-- /ko -->
3636
</strong>
3737
</div>
3838
<div class="content minicart-items" data-role="content">

app/code/Magento/Customer/view/frontend/web/template/customer-email.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
data-validate="{required:true, 'validate-email':true}"
2626
id="customer-email" />
2727
<!-- ko template: 'ui/form/element/helper/tooltip' --><!-- /ko -->
28-
<span class="note"><!-- ko text: $t("(You can create an account after checkout)")--><!-- /ko --></span>
28+
<span class="note"><!-- ko text: $t("You can create an account after checkout.")--><!-- /ko --></span>
2929
</div>
3030
</div>
3131

Loading
Loading
Loading
Binary file not shown.
Loading

0 commit comments

Comments
 (0)