Skip to content

Commit d91c0c0

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #16576: [Backport] Declare module namespace before template path name (by @mageprince) - #16557: Updated SynonymGroup.xml (by @sanganinamrata) - #16553: Update mini-cart checkout translations (by @JeroenVanLeusden) - #16549: Corrected function comment (by @sanganinamrata) - #16524: Clear converted file data (by @gelanivishal) - #16517: Fix responsive tables showing broken heading (by @LordZardeck) - #16393: Rework for PR #16222 . (by @phoenix128) - #16090: Added and removed unnecessary translation for label/comment tags (by @yogeshks) - #16581: Removed double occurrences from files. (by @sanganinamrata) - #15909: [Backport] Fix for Wrong price amount on product page (by @gelanivishal) Fixed GitHub Issues: - #11717: Wrong price amount on product page (reported by @HirokazuNishi) has been fixed in #15909 by @gelanivishal in 2.2-develop branch Related commits: 1. ea16687 2. 8a4d966
2 parents aa6b899 + 575e071 commit d91c0c0

File tree

82 files changed

+219
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+219
-144
lines changed

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
</group>
182182
<group id="image" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="0" showInStore="0">
183183
<label>Image Processing Settings</label>
184-
<field id="default_adapter" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
184+
<field id="default_adapter" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
185185
<label>Image Adapter</label>
186186
<source_model>Magento\Config\Model\Config\Source\Image\Adapter</source_model>
187187
<backend_model>Magento\Config\Model\Config\Backend\Image\Adapter</backend_model>
@@ -298,11 +298,11 @@
298298
<label>Disable Email Communications</label>
299299
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
300300
</field>
301-
<field id="host" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
301+
<field id="host" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
302302
<label>Host</label>
303303
<comment>For Windows server only.</comment>
304304
</field>
305-
<field id="port" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
305+
<field id="port" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
306306
<label>Port (25)</label>
307307
<comment>For Windows server only.</comment>
308308
</field>
@@ -419,7 +419,7 @@
419419
<![CDATA[<strong style="color:red">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]>
420420
</comment>
421421
</field>
422-
<field id="redirect_to_base" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
422+
<field id="redirect_to_base" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
423423
<label>Auto-redirect to Base URL</label>
424424
<source_model>Magento\Config\Model\Config\Source\Web\Redirect</source_model>
425425
<comment>I.e. redirect from http://example.com/store/ to http://www.example.com/store/</comment>
@@ -432,15 +432,15 @@
432432
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
433433
</field>
434434
</group>
435-
<group id="unsecure" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
435+
<group id="unsecure" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
436436
<label>Base URLs</label>
437437
<comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/</comment>
438438
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
439439
<label>Base URL</label>
440440
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
441441
<comment>Specify URL or {{base_url}} placeholder.</comment>
442442
</field>
443-
<field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
443+
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
444444
<label>Base Link URL</label>
445445
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
446446
<comment>May start with {{unsecure_base_url}} placeholder.</comment>
@@ -450,21 +450,21 @@
450450
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
451451
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
452452
</field>
453-
<field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
453+
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
454454
<label>Base URL for User Media Files</label>
455455
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
456456
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
457457
</field>
458458
</group>
459-
<group id="secure" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
459+
<group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
460460
<label>Base URLs (Secure)</label>
461461
<comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/</comment>
462462
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
463463
<label>Secure Base URL</label>
464464
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
465465
<comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
466466
</field>
467-
<field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
467+
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
468468
<label>Secure Base Link URL</label>
469469
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
470470
<comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
@@ -474,24 +474,24 @@
474474
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
475475
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
476476
</field>
477-
<field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
477+
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
478478
<label>Secure Base URL for User Media Files</label>
479479
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
480480
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
481481
</field>
482-
<field id="use_in_frontend" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
482+
<field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
483483
<label>Use Secure URLs on Storefront</label>
484484
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
485485
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
486486
<comment>Enter https protocol to use Secure URLs on Storefront.</comment>
487487
</field>
488-
<field id="use_in_adminhtml" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
488+
<field id="use_in_adminhtml" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
489489
<label>Use Secure URLs in Admin</label>
490490
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
491491
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
492492
<comment>Enter https protocol to use Secure URLs in Admin.</comment>
493493
</field>
494-
<field id="enable_hsts" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
494+
<field id="enable_hsts" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
495495
<label>Enable HTTP Strict Transport Security (HSTS)</label>
496496
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
497497
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
@@ -501,7 +501,7 @@
501501
<field id="use_in_adminhtml">1</field>
502502
</depends>
503503
</field>
504-
<field id="enable_upgrade_insecure" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
504+
<field id="enable_upgrade_insecure" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
505505
<label>Upgrade Insecure Requests</label>
506506
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
507507
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>

‎app/code/Magento/Braintree/etc/adminhtml/system.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,18 @@
8484
<label>Vault Title</label>
8585
<config_path>payment/braintree_cc_vault/title</config_path>
8686
</field>
87-
<field id="merchant_account_id" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
87+
<field id="merchant_account_id" translate="label comment" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
8888
<label>Merchant Account ID</label>
8989
<comment>If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account.</comment>
9090
<config_path>payment/braintree/merchant_account_id</config_path>
9191
</field>
92-
<field id="fraudprotection" translate="label" type="select" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="0">
92+
<field id="fraudprotection" translate="label comment" type="select" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="0">
9393
<label>Advanced Fraud Protection</label>
9494
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
9595
<comment>Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section</comment>
9696
<config_path>payment/braintree/fraudprotection</config_path>
9797
</field>
98-
<field id="kount_id" translate="label" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="0">
98+
<field id="kount_id" translate="label comment" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="0">
9999
<label>Kount Merchant ID</label>
100100
<comment><![CDATA[Used for direct fraud tool integration. Make sure you also contact <a href="mailto:[email protected]">[email protected]</a> to setup your Kount account.]]></comment>
101101
<depends>
@@ -108,7 +108,7 @@
108108
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
109109
<config_path>payment/braintree/debug</config_path>
110110
</field>
111-
<field id="useccv" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
111+
<field id="useccv" translate="label comment" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
112112
<label>CVV Verification</label>
113113
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
114114
<comment>Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section.</comment>
@@ -149,7 +149,7 @@
149149
<group id="braintree_paypal" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
150150
<label>PayPal through Braintree</label>
151151
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
152-
<field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
152+
<field id="title" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
153153
<label>Title</label>
154154
<config_path>payment/braintree_paypal/title</config_path>
155155
<comment>It is recommended to set this value to "PayPal" per store views.</comment>
@@ -187,7 +187,7 @@
187187
<can_be_empty>1</can_be_empty>
188188
<config_path>payment/braintree_paypal/specificcountry</config_path>
189189
</field>
190-
<field id="require_billing_address" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
190+
<field id="require_billing_address" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
191191
<label>Require Customer's Billing Address</label>
192192
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
193193
<config_path>payment/braintree_paypal/require_billing_address</config_path>
@@ -203,7 +203,7 @@
203203
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
204204
<config_path>payment/braintree_paypal/debug</config_path>
205205
</field>
206-
<field id="display_on_shopping_cart" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
206+
<field id="display_on_shopping_cart" translate="label comment" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
207207
<label>Display on Shopping Cart</label>
208208
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
209209
<config_path>payment/braintree_paypal/display_on_shopping_cart</config_path>
@@ -239,29 +239,29 @@
239239
<config_path>payment/braintree/verify_specific_countries</config_path>
240240
</field>
241241
</group>
242-
<group id="braintree_dynamic_descriptor" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
242+
<group id="braintree_dynamic_descriptor" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
243243
<label>Dynamic Descriptors</label>
244244
<comment><![CDATA[Dynamic descriptors are sent on a per-transaction basis and define what will appear on your customers credit card statements for a specific purchase.
245245
The clearer the description of your product, the less likely customers will issue chargebacks due to confusion or non-recognition.
246246
Dynamic descriptors are not enabled on all accounts by default. If you receive a validation error of 92203 or if your dynamic descriptors are not displaying as expected,
247247
please <a href="mailto:[email protected]">Braintree Support</a>.]]></comment>
248248
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
249-
<field id="name" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
249+
<field id="name" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
250250
<label>Name</label>
251251
<config_path>payment/braintree/descriptor_name</config_path>
252252
<comment>
253253
The value in the business name field of a customer's statement. Company name/DBA section must be either 3, 7 or 12 characters
254254
and the product descriptor can be up to 18, 14, or 9 characters respectively (with an * in between for a total descriptor name of 22 characters).
255255
</comment>
256256
</field>
257-
<field id="phone" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
257+
<field id="phone" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
258258
<label>Phone</label>
259259
<config_path>payment/braintree/descriptor_phone</config_path>
260260
<comment>
261261
The value in the phone number field of a customer's statement. Phone must be 10-14 characters and can only contain numbers, dashes, parentheses and periods.
262262
</comment>
263263
</field>
264-
<field id="url" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
264+
<field id="url" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
265265
<label>URL</label>
266266
<config_path>payment/braintree/descriptor_url</config_path>
267267
<comment>

‎app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template
1313
/**
1414
* @var string
1515
*/
16-
protected $_template = 'default.phtml';
16+
protected $_template = 'Magento_Captcha::default.phtml';
1717

1818
/**
1919
* @var string

‎app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AssignProducts extends \Magento\Backend\Block\Template
1313
*
1414
* @var string
1515
*/
16-
protected $_template = 'catalog/category/edit/assign_products.phtml';
16+
protected $_template = 'Magento_Catalog::catalog/category/edit/assign_products.phtml';
1717

1818
/**
1919
* @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
2929
/**
3030
* @var string
3131
*/
32-
protected $_template = 'catalog/category/tree.phtml';
32+
protected $_template = 'Magento_Catalog::catalog/category/tree.phtml';
3333

3434
/**
3535
* @var \Magento\Backend\Model\Auth\Session

0 commit comments

Comments
 (0)