Skip to content

Commit 4f1aae7

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-6231: added fix to ticket 25455 #25456
- Merge Pull Request #25456 from Ashna-Jahan/magento2:fix-25455 - Merged commits: 1. 9de8696
2 parents dac1ea5 + 9de8696 commit 4f1aae7

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<label>Backup Settings</label>
1313
<field id="functionality_enabled" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
1414
<label>Enable Backup</label>
15-
<comment>Disabled by default for security reasons</comment>
15+
<comment>Disabled by default for security reasons.</comment>
1616
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1717
</field>
1818
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</field>
6666
<field id="grid_per_page" translate="label comment" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
6767
<label>Products per Page on Grid Default Value</label>
68-
<comment>Must be in the allowed values list</comment>
68+
<comment>Must be in the allowed values list.</comment>
6969
<validate>validate-per-page-value</validate>
7070
</field>
7171
<field id="list_per_page_values" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -75,7 +75,7 @@
7575
</field>
7676
<field id="list_per_page" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
7777
<label>Products per Page on List Default Value</label>
78-
<comment>Must be in the allowed values list</comment>
78+
<comment>Must be in the allowed values list.</comment>
7979
<validate>validate-per-page-value</validate>
8080
</field>
8181
<field id="flat_catalog_category" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
@@ -90,12 +90,12 @@
9090
</field>
9191
<field id="default_sort_by" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
9292
<label>Product Listing Sort by</label>
93-
<comment>Applies to category pages</comment>
93+
<comment>Applies to category pages.</comment>
9494
<source_model>Magento\Catalog\Model\Config\Source\ListSort</source_model>
9595
</field>
9696
<field id="list_allow_all" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
9797
<label>Allow All Products per Page</label>
98-
<comment>Whether to show "All" option in the "Show X Per Page" dropdown</comment>
98+
<comment>Whether to show "All" option in the "Show X Per Page" dropdown.</comment>
9999
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
100100
</field>
101101
<field id="remember_pagination" translate="label comment" type="select" sortOrder="7" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<label>Frontend Development Workflow</label>
1212
<field id="type" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
1313
<label>Workflow type</label>
14-
<comment>Not available in production mode</comment>
14+
<comment>Not available in production mode.</comment>
1515
<source_model>Magento\Developer\Model\Config\Source\WorkflowType</source_model>
1616
<frontend_model>Magento\Developer\Block\Adminhtml\System\Config\WorkflowType</frontend_model>
1717
<backend_model>Magento\Developer\Model\Config\Backend\WorkflowType</backend_model>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
</field>
8989
<field id="ready_time" translate="label comment" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
9090
<label>Ready time</label>
91-
<comment>Package ready time after order submission (in hours)</comment>
91+
<comment>Package ready time after order submission (in hours).</comment>
9292
</field>
9393
<field id="specificerrmsg" translate="label" type="textarea" sortOrder="800" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
9494
<label>Displayed Error Message</label>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
1414
<field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
1515
<label>Merchant Country</label>
16-
<comment>If not specified, Default Country from General Config will be used</comment>
16+
<comment>If not specified, Default Country from General Config will be used.</comment>
1717
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Country</frontend_model>
1818
<source_model>Magento\Paypal\Model\System\Config\Source\MerchantCountry</source_model>
1919
<backend_model>Magento\Paypal\Model\System\Config\Backend\MerchantCountry</backend_model>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@
9393
<field id="amount" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
9494
<label>Minimum Amount</label>
9595
<validate>validate-number validate-greater-than-zero</validate>
96-
<comment>Subtotal after discount</comment>
96+
<comment>Subtotal after discount.</comment>
9797
</field>
9898
<field id="include_discount_amount" translate="label" sortOrder="12" type="select" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
9999
<label>Include Discount Amount</label>
100100
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
101-
<comment>Choosing yes will be used subtotal after discount, otherwise only subtotal will be used</comment>
101+
<comment>Choosing yes will be used subtotal after discount, otherwise only subtotal will be used.</comment>
102102
</field>
103103
<field id="tax_including" translate="label" sortOrder="15" type="select" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
104104
<label>Include Tax to Amount</label>
@@ -182,7 +182,7 @@
182182
</field>
183183
<field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
184184
<label>Send Order Email Copy To</label>
185-
<comment>Comma-separated</comment>
185+
<comment>Comma-separated.</comment>
186186
<validate>validate-emails</validate>
187187
</field>
188188
<field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -212,7 +212,7 @@
212212
</field>
213213
<field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
214214
<label>Send Order Comment Email Copy To</label>
215-
<comment>Comma-separated</comment>
215+
<comment>Comma-separated.</comment>
216216
<validate>validate-emails</validate>
217217
</field>
218218
<field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -242,7 +242,7 @@
242242
</field>
243243
<field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
244244
<label>Send Invoice Email Copy To</label>
245-
<comment>Comma-separated</comment>
245+
<comment>Comma-separated.</comment>
246246
<validate>validate-emails</validate>
247247
</field>
248248
<field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -272,7 +272,7 @@
272272
</field>
273273
<field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
274274
<label>Send Invoice Comment Email Copy To</label>
275-
<comment>Comma-separated</comment>
275+
<comment>Comma-separated.</comment>
276276
<validate>validate-emails</validate>
277277
</field>
278278
<field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -302,7 +302,7 @@
302302
</field>
303303
<field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
304304
<label>Send Shipment Email Copy To</label>
305-
<comment>Comma-separated</comment>
305+
<comment>Comma-separated.</comment>
306306
<validate>validate-emails</validate>
307307
</field>
308308
<field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -332,7 +332,7 @@
332332
</field>
333333
<field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
334334
<label>Send Shipment Comment Email Copy To</label>
335-
<comment>Comma-separated</comment>
335+
<comment>Comma-separated.</comment>
336336
<validate>validate-emails</validate>
337337
</field>
338338
<field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -362,7 +362,7 @@
362362
</field>
363363
<field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
364364
<label>Send Credit Memo Email Copy To</label>
365-
<comment>Comma-separated</comment>
365+
<comment>Comma-separated.</comment>
366366
<validate>validate-emails</validate>
367367
</field>
368368
<field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -392,7 +392,7 @@
392392
</field>
393393
<field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
394394
<label>Send Credit Memo Comment Email Copy To</label>
395-
<comment>Comma-separated</comment>
395+
<comment>Comma-separated.</comment>
396396
<validate>validate-emails</validate>
397397
</field>
398398
<field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</field>
3939
<field id="api_key" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
4040
<label>API Key</label>
41-
<comment><![CDATA[Your API key can be found on the <a href="http://signifyd.com/settings" target="_blank">settings page</a> in the Signifyd console]]></comment>
41+
<comment><![CDATA[Your API key can be found on the <a href="http://signifyd.com/settings" target="_blank">settings page</a> in the Signifyd console.]]></comment>
4242
<config_path>fraud_protection/signifyd/api_key</config_path>
4343
<backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
4444
</field>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<field id="include_taxes" translate="label" type="select" sortOrder="45" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
135135
<label>Request Tax-Inclusive Rate</label>
136136
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
137-
<comment>When applicable, taxes (sales tax, VAT etc.) are included in the rate</comment>
137+
<comment>When applicable, taxes (sales tax, VAT etc.) are included in the rate.</comment>
138138
</field>
139139
<field id="shipper_number" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
140140
<label>Shipper Number</label>

‎dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
1414
<field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
1515
<label>Merchant Country</label>
16-
<comment>If not specified, Default Country from General Config will be used</comment>
16+
<comment>If not specified, Default Country from General Config will be used.</comment>
1717
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Country</frontend_model>
1818
<source_model>Magento\Paypal\Model\System\Config\Source\MerchantCountry</source_model>
1919
<backend_model>Magento\Paypal\Model\System\Config\Backend\MerchantCountry</backend_model>

0 commit comments

Comments
 (0)