Skip to content

Commit a2e284c

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-mftf-pr10
2 parents bce1876 + be2badc commit a2e284c

File tree

20 files changed

+45
-42
lines changed

20 files changed

+45
-42
lines changed

‎app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
4444
<?php endif; ?>
4545

4646
<?php if(!empty($fraudDetails['fraud_filters'])): ?>
47-
<b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
48-
</b></br>
47+
<strong><?= $block->escapeHtml(__('Fraud Filters')) ?>:
48+
</strong></br>
4949
<?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
5050
<?= $block->escapeHtml($filter['name']) ?>:
5151
<?= $block->escapeHtml($filter['action']) ?>

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ define([
8282
return function (config, element) {
8383
config = config || {};
8484
jQuery(element).on('click', function () {
85-
categorySubmit(config.url, config.ajax);
85+
categorySubmit();
8686
});
8787
};
8888
});

‎app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,43 +23,43 @@ <h1>{{trans "Payment Transaction Failed"}}</h1>
2323

2424
<ul>
2525
<li>
26-
<b>{{trans "Reason"}}</b><br />
26+
<strong>{{trans "Reason"}}</strong><br />
2727
{{var reason}}
2828
</li>
2929
<li>
30-
<b>{{trans "Checkout Type"}}</b><br />
30+
<strong>{{trans "Checkout Type"}}</strong><br />
3131
{{var checkoutType}}
3232
</li>
3333
<li>
34-
<b>{{trans "Customer:"}}</b><br />
34+
<strong>{{trans "Customer:"}}</strong><br />
3535
<a href="mailto:{{var customerEmail}}">{{var customer}}</a> &lt;{{var customerEmail}}&gt;
3636
</li>
3737
<li>
38-
<b>{{trans "Items"}}</b><br />
38+
<strong>{{trans "Items"}}</strong><br />
3939
{{var items|raw}}
4040
</li>
4141
<li>
42-
<b>{{trans "Total:"}}</b><br />
42+
<strong>{{trans "Total:"}}</strong><br />
4343
{{var total}}
4444
</li>
4545
<li>
46-
<b>{{trans "Billing Address:"}}</b><br />
46+
<strong>{{trans "Billing Address:"}}</strong><br />
4747
{{var billingAddress.format('html')|raw}}
4848
</li>
4949
<li>
50-
<b>{{trans "Shipping Address:"}}</b><br />
50+
<strong>{{trans "Shipping Address:"}}</strong><br />
5151
{{var shippingAddress.format('html')|raw}}
5252
</li>
5353
<li>
54-
<b>{{trans "Shipping Method:"}}</b><br />
54+
<strong>{{trans "Shipping Method:"}}</strong><br />
5555
{{var shippingMethod}}
5656
</li>
5757
<li>
58-
<b>{{trans "Payment Method:"}}</b><br />
58+
<strong>{{trans "Payment Method:"}}</strong><br />
5959
{{var paymentMethod}}
6060
</li>
6161
<li>
62-
<b>{{trans "Date & Time:"}}</b><br />
62+
<strong>{{trans "Date & Time:"}}</strong><br />
6363
{{var dateAndTime}}
6464
</li>
6565
</ul>

‎app/code/Magento/Contact/view/frontend/email/submitted_form.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
<table class="message-details">
1818
<tr>
19-
<td><b>{{trans "Name"}}</b></td>
19+
<td><strong>{{trans "Name"}}</strong></td>
2020
<td>{{var data.name}}</td>
2121
</tr>
2222
<tr>
23-
<td><b>{{trans "Email"}}</b></td>
23+
<td><strong>{{trans "Email"}}</strong></td>
2424
<td>{{var data.email}}</td>
2525
</tr>
2626
<tr>
27-
<td><b>{{trans "Phone"}}</b></td>
27+
<td><strong>{{trans "Phone"}}</strong></td>
2828
<td>{{var data.telephone}}</td>
2929
</tr>
3030
</table>
31-
<p><b>{{trans "Message"}}</b></p>
31+
<p><strong>{{trans "Message"}}</strong></p>
3232
<p>{{var data.comment}}</p>
3333

3434
{{template config_path="design/email/footer_template"}}

‎app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
4545
class="admin__control-text"
4646
<?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
4747
<?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
48-
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
48+
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></div>
4949
<?php endif; ?>
5050
</td>
5151
<?php else: ?>
@@ -56,7 +56,7 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
5656
class="admin__control-text"
5757
<?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
5858
<?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
59-
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
59+
<div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></div>
6060
<?php endif; ?>
6161
</td>
6262
<?php endif; ?>

‎dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,22 @@ public function layoutDirectiveDataProvider()
130130
'area parameter - omitted' => [
131131
'adminhtml',
132132
'handle="email_template_test_handle"',
133-
'<b>Email content for frontend/Magento/default theme</b>',
133+
'<strong>Email content for frontend/Magento/default theme</strong>',
134134
],
135135
'area parameter - frontend' => [
136136
'adminhtml',
137137
'handle="email_template_test_handle" area="frontend"',
138-
'<b>Email content for frontend/Magento/default theme</b>',
138+
'<strong>Email content for frontend/Magento/default theme</strong>',
139139
],
140140
'area parameter - backend' => [
141141
'frontend',
142142
'handle="email_template_test_handle" area="adminhtml"',
143-
'<b>Email content for adminhtml/Magento/default theme</b>',
143+
'<strong>Email content for adminhtml/Magento/default theme</strong>',
144144
],
145145
'custom parameter' => [
146146
'frontend',
147147
'handle="email_template_test_handle" template="Magento_Email::sample_email_content_custom.phtml"',
148-
'<b>Custom Email content for frontend/Magento/default theme</b>',
148+
'<strong>Custom Email content for frontend/Magento/default theme</strong>',
149149
],
150150
];
151151
return $result;

‎dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,25 +315,25 @@ public function templateDirectiveDataProvider()
315315
Area::AREA_FRONTEND,
316316
TemplateTypesInterface::TYPE_HTML,
317317
'{{template config_path="customer/create_account/email_template"}}',
318-
'<b>customer_create_account_email_template template from Vendor/custom_theme</b>',
318+
'<strong>customer_create_account_email_template template from Vendor/custom_theme</strong>',
319319
],
320320
'Template from parent theme - frontend' => [
321321
Area::AREA_FRONTEND,
322322
TemplateTypesInterface::TYPE_HTML,
323323
'{{template config_path="customer/create_account/email_confirmation_template"}}',
324-
'<b>customer_create_account_email_confirmation_template template from Vendor/default</b>',
324+
'<strong>customer_create_account_email_confirmation_template template from Vendor/default</strong',
325325
],
326326
'Template from grandparent theme - frontend' => [
327327
Area::AREA_FRONTEND,
328328
TemplateTypesInterface::TYPE_HTML,
329329
'{{template config_path="customer/create_account/email_confirmed_template"}}',
330-
'<b>customer_create_account_email_confirmed_template template from Magento/default</b>',
330+
'<strong>customer_create_account_email_confirmed_template template from Magento/default</strong',
331331
],
332332
'Template from grandparent theme - adminhtml' => [
333333
BackendFrontNameResolver::AREA_CODE,
334334
TemplateTypesInterface::TYPE_HTML,
335335
'{{template config_path="catalog/productalert_cron/error_email_template"}}',
336-
'<b>catalog_productalert_cron_error_email_template template from Magento/default</b>',
336+
'<strong>catalog_productalert_cron_error_email_template template from Magento/default</strong',
337337
null,
338338
null,
339339
true,

‎dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* See COPYING.txt for license details.
55
*/
66
?>
7-
<b>Email content for adminhtml/Magento/default theme</b>
7+
<strong>Email content for adminhtml/Magento/default theme</strong>

‎dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<b>catalog_productalert_cron_error_email_template template from Magento/default</b>
7+
<strong>catalog_productalert_cron_error_email_template template from Magento/default</strong>

‎dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<b>customer_create_account_email_confirmed_template template from Magento/default</b>
7+
<strong>customer_create_account_email_confirmed_template template from Magento/default</strong>

0 commit comments

Comments
 (0)