Skip to content

Added translate for strings and added missing node in existing translate attribute on xml. #25114

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 2 commits into from
Dec 16, 2019
Merged

Added translate for strings and added missing node in existing translate attribute on xml. #25114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5787de
Added translate for strings and added missing node in existing transl…
Oct 17, 2019
61580f4
Merge branch '2.4-develop' of https://github.com/magento/magento2 int…
Nazar65 Dec 13, 2019
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/AdvancedSearch/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<field id="search_suggestion_enabled">1</field>
</depends>
</field>
<field id="search_suggestion_count_results_enabled" translate="label" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="search_suggestion_count_results_enabled" translate="label comment" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Show Results Count for Each Suggestion</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>When you enable this option your site may slow down.</comment>
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -29,7 +29,7 @@
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel</frontend_model>
<backend_model>Magento\Analytics\Model\Config\Backend\CollectionTime</backend_model>
</field>
<field id="vertical" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
<field id="vertical" translate="hint label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
<hint>Industry Data</hint>
<label>Industry</label>
<comment>In order to personalize your Advanced Reporting experience, please select your industry.</comment>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<actionsColumn name="actions" class="\Magento\AsynchronousOperations\Ui\Component\Listing\Column\Actions">
<settings>
<indexField>id</indexField>
<label>Action</label>
<label translate="true">Action</label>
</settings>
</actionsColumn>
</columns>
Expand Down
4 changes: 2 additions & 2 deletions .../design/adminhtml/Magento/test_default/Magento_Backend/layout/layout_test_grid_handle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
<item name="option_id1" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Option One</item>
<item name="url" xsi:type="string">*/*/option1</item>
<item name="complete" xsi:type="string">Test</item>
<item name="complete" xsi:type="string" translate="true">Test</item>
</item>
<item name="option_id2" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Option Two</item>
<item name="url" xsi:type="string">*/*/option2</item>
<item name="confirm" xsi:type="string">Are you sure?</item>
<item name="confirm" xsi:type="string" translate="true">Are you sure?</item>
</item>
<item name="option_id3" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Option Three</item>
Expand Down