Skip to content
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

Jump to bottom

Translated admin menu titles #17521

Merged
merged 6 commits into from
Aug 20, 2018
Merged

Translated admin menu titles #17521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2a514d
Translated menu titles
yogeshsuhagiya Aug 11, 2018
208c019
Translated acl rule title
yogeshsuhagiya Aug 11, 2018
23a27b6
Translated acl rule title
yogeshsuhagiya Aug 11, 2018
8a32c28
Merge pull request https://github.com/magento/magento2/pull/17525 to …
magento-engcom-team Aug 11, 2018
692f9fb
Reformat the xml code in menu.xml
yogeshsuhagiya Aug 11, 2018
6203162
Merge branch 'yogesh-patch-6' of https://github.com/Yogeshks/magento2…
yogeshsuhagiya Aug 11, 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
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/etc/adminhtml/menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
<menu>
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
</menu>
</config>
2 changes: 1 addition & 1 deletion app/code/Magento/Braintree/etc/acl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<resource id="Magento_Backend::admin">
<resource id="Magento_Reports::report">
<resource id="Magento_Reports::salesroot">
<resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" sortOrder="80" />
<resource id="Magento_Braintree::settlement_report" title="Braintree Settlement" translate="title" sortOrder="80" />
</resource>
</resource>
</resource>
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Braintree/etc/adminhtml/menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<add
id="Magento_Braintree::settlement_report"
title="Braintree Settlement"
translate="title"
module="Magento_Braintree"
sortOrder="80"
parent="Magento_Reports::report_salesroot"
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/Braintree/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,5 @@ Currency,Currency
"Partial settlements are not supported by this processor.","Partial settlements are not supported by this processor."
"Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending.","Transaction can not be voided if status of a PayPal partial settlement child transaction is settlement_pending."
"Too many concurrent attempts to refund this transaction. Try again later.","Too many concurrent attempts to refund this transaction. Try again later."
"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
"Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
"Braintree Settlement","Braintree Settlement"
3 changes: 1 addition & 2 deletions app/code/Magento/Marketplace/etc/adminhtml/menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
<menu>
<add id="Magento_Marketplace::partners" title="Find Partners &amp; Extensions" module="Magento_Marketplace" sortOrder="80"
action="marketplace/index" resource="Magento_Marketplace::partners"/>
<add id="Magento_Marketplace::partners" title="Find Partners &amp; Extensions" translate="title" module="Magento_Marketplace" sortOrder="80" action="marketplace/index" resource="Magento_Marketplace::partners"/>
</menu>
</config>
2 changes: 1 addition & 1 deletion app/code/Magento/TaxImportExport/etc/acl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<resource id="Magento_Backend::admin">
<resource id="Magento_Backend::system">
<resource id="Magento_Backend::convert">
<resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" sortOrder="30" />
<resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" translate="title" sortOrder="30" />
</resource>
</resource>
</resource>
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/TaxImportExport/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ Rate,Rate
"Export Tax Rates","Export Tax Rates"
CSV,CSV
"Excel XML","Excel XML"
"Import/Export Tax Rates","Import/Export Tax Rates"
4 changes: 1 addition & 3 deletions app/code/Magento/UrlRewrite/etc/adminhtml/menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
<menu>
<add id="Magento_UrlRewrite::urlrewrite" title="URL Rewrites" translate="title" module="Magento_UrlRewrite"
sortOrder="20" parent="Magento_Backend::marketing_seo"
action="adminhtml/url_rewrite/index" resource="Magento_UrlRewrite::urlrewrite"/>
<add id="Magento_UrlRewrite::urlrewrite" title="URL Rewrites" translate="title" module="Magento_UrlRewrite" sortOrder="20" parent="Magento_Backend::marketing_seo" action="adminhtml/url_rewrite/index" resource="Magento_UrlRewrite::urlrewrite"/>
</menu>
</config>