Skip to content

Removed unused translation for comment tag #14382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 28, 2018
Merged

Removed unused translation for comment tag #14382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
474fac4
Removed unused translation for comment tag
yogeshaureatelabs Mar 27, 2018
23048d3
Removed unused translation for comment tag
yogeshsuhagiya Mar 27, 2018
bf208d7
Merge branch '2.3-develop' of https://github.com/Yogeshks/magento2 in…
yogeshsuhagiya Mar 28, 2018
1b1e15e
Removed extra slash from comment block
yogeshsuhagiya Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/code/Magento/Analytics/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
"Go to Advanced Reporting" link. </br> For more information, see our <a href="https://magento.com/legal/terms/cloud-terms">
terms and conditions</a>.]]></comment>
<field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Advanced Reporting Service</label>
<source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
<backend_model>Magento\Analytics\Model\Config\Backend\Enabled</backend_model>
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel</frontend_model>
<config_path>analytics/subscription/enabled</config_path>
</field>
<field id="collection_time" translate="label comment" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
<field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Time of day to send data</label>
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel</frontend_model>
<backend_model>Magento\Analytics\Model\Config\Backend\CollectionTime</backend_model>
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Catalog/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
</group>
<group id="recently_products" translate="label" type="text" sortOrder="350" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Recently Viewed/Compared Products</label>
<field id="recently_viewed_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<field id="recently_viewed_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<label>Lifetime of products in Recently Viewed Widget</label>
</field>
<field id="recently_compared_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<field id="recently_compared_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<label>Lifetime of products in Recently Compared Widget</label>
</field>
<field id="synchronize_with_backend" translate="label" type="select" showInDefault="1" canRestore="1">
Expand Down Expand Up @@ -83,7 +83,7 @@
<backend_model>Magento\Catalog\Model\Indexer\Product\Flat\System\Config\Mode</backend_model>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
<field id="default_sort_by" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<field id="default_sort_by" translate="label" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Product Listing Sort by</label>
<source_model>Magento\Catalog\Model\Config\Source\ListSort</source_model>
</field>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class InstantPurchase implements SectionSourceInterface
private $customerSession;

/**
* @var StoreManagerInterface\
* @var StoreManagerInterface
*/
private $storeManager;

Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sales/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@
<comment>We'll use the default error above if you leave this empty.</comment>
</field>
</group>
<group id="dashboard" translate="label comment" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
<group id="dashboard" translate="label" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Dashboard</label>
<field id="use_aggregated_data" translate="label" sortOrder="10" type="select" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<field id="use_aggregated_data" translate="label comment" sortOrder="10" type="select" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<label>Use Aggregated Data</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>Improves dashboard performance but provides non-realtime data.</comment>
</field>
</group>
<group id="orders" translate="label comment" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
<group id="orders" translate="label" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Orders Cron Settings</label>
<field id="delete_pending_after" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<label>Pending Payment Order Lifetime (minutes)</label>
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Swatches/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<system>
<section id="catalog" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<group id="frontend" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="swatches_per_product" translate="label comment" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<field id="swatches_per_product" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Swatches per Product</label>
</field>
<field id="show_swatches_in_product_list" translate="label comment" type="select" sortOrder="310" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<field id="show_swatches_in_product_list" translate="label" type="select" sortOrder="310" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Show Swatches in Product List</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Ups/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<label>Live Account</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
<field id="unit_of_measure" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<field id="unit_of_measure" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<label>Weight Unit</label>
<source_model>Magento\Ups\Model\Config\Source\Unitofmeasure</source_model>
</field>
Expand Down