Skip to content

Commit f319dc5

Browse files
author
Stanislav Idolov
authored
ENGCOM-2883: [Forwardport] Added and removed unnecessary translation for label/comment tags #17740 
2 parents 1cc306b + bb2be4d commit f319dc5

File tree

22 files changed

+71
-71
lines changed

22 files changed

+71
-71
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
</group>
198198
<group id="image" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="0" showInStore="0">
199199
<label>Image Processing Settings</label>
200-
<field id="default_adapter" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
200+
<field id="default_adapter" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
201201
<label>Image Adapter</label>
202202
<source_model>Magento\Config\Model\Config\Source\Image\Adapter</source_model>
203203
<backend_model>Magento\Config\Model\Config\Backend\Image\Adapter</backend_model>
@@ -314,11 +314,11 @@
314314
<label>Disable Email Communications</label>
315315
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
316316
</field>
317-
<field id="host" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
317+
<field id="host" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
318318
<label>Host</label>
319319
<comment>For Windows server only.</comment>
320320
</field>
321-
<field id="port" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
321+
<field id="port" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
322322
<label>Port (25)</label>
323323
<comment>For Windows server only.</comment>
324324
</field>
@@ -435,7 +435,7 @@
435435
<![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.).]]>
436436
</comment>
437437
</field>
438-
<field id="redirect_to_base" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
438+
<field id="redirect_to_base" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
439439
<label>Auto-redirect to Base URL</label>
440440
<source_model>Magento\Config\Model\Config\Source\Web\Redirect</source_model>
441441
<comment>I.e. redirect from http://example.com/store/ to http://www.example.com/store/</comment>
@@ -448,15 +448,15 @@
448448
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
449449
</field>
450450
</group>
451-
<group id="unsecure" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
451+
<group id="unsecure" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
452452
<label>Base URLs</label>
453453
<comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/</comment>
454454
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
455455
<label>Base URL</label>
456456
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
457457
<comment>Specify URL or {{base_url}} placeholder.</comment>
458458
</field>
459-
<field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
459+
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
460460
<label>Base Link URL</label>
461461
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
462462
<comment>May start with {{unsecure_base_url}} placeholder.</comment>
@@ -466,21 +466,21 @@
466466
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
467467
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
468468
</field>
469-
<field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
469+
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
470470
<label>Base URL for User Media Files</label>
471471
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
472472
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
473473
</field>
474474
</group>
475-
<group id="secure" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
475+
<group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
476476
<label>Base URLs (Secure)</label>
477477
<comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/</comment>
478478
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
479479
<label>Secure Base URL</label>
480480
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
481481
<comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
482482
</field>
483-
<field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
483+
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
484484
<label>Secure Base Link URL</label>
485485
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
486486
<comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
@@ -490,24 +490,24 @@
490490
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
491491
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
492492
</field>
493-
<field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
493+
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
494494
<label>Secure Base URL for User Media Files</label>
495495
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
496496
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
497497
</field>
498-
<field id="use_in_frontend" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
498+
<field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
499499
<label>Use Secure URLs on Storefront</label>
500500
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
501501
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
502502
<comment>Enter https protocol to use Secure URLs on Storefront.</comment>
503503
</field>
504-
<field id="use_in_adminhtml" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
504+
<field id="use_in_adminhtml" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
505505
<label>Use Secure URLs in Admin</label>
506506
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
507507
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
508508
<comment>Enter https protocol to use Secure URLs in Admin.</comment>
509509
</field>
510-
<field id="enable_hsts" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
510+
<field id="enable_hsts" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
511511
<label>Enable HTTP Strict Transport Security (HSTS)</label>
512512
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
513513
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
@@ -517,7 +517,7 @@
517517
<field id="use_in_adminhtml">1</field>
518518
</depends>
519519
</field>
520-
<field id="enable_upgrade_insecure" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
520+
<field id="enable_upgrade_insecure" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
521521
<label>Upgrade Insecure Requests</label>
522522
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
523523
<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>

0 commit comments

Comments
 (0)