Skip to content

Commit 2948639

Browse files
Merge remote-tracking branch 'remotes/github/MAGETWO-95811' into EPAM-PR-41
2 parents 42a10b1 + 4d67602 commit 2948639

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

app/code/Magento/Ui/view/base/web/js/grid/search/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ define([
1818
return Element.extend({
1919
defaults: {
2020
template: 'ui/grid/search/search',
21-
placeholder: $t('Search by keyword'),
21+
placeholder: 'Search by keyword',
2222
label: $t('Keyword'),
2323
value: '',
2424
previews: [],

app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<div class="admin__action-dropdown-wrap admin__data-grid-action-bookmarks" collapsible>
88
<button class="admin__action-dropdown" type="button" toggleCollapsible>
9-
<span class="admin__action-dropdown-text" text="activeView.label"/>
9+
<span class="admin__action-dropdown-text" translate="activeView.label"/>
1010
</button>
1111
<ul class="admin__action-dropdown-menu">
1212
<repeat args="foreach: viewsArray, item: '$view'">

app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</div>
3131

3232
<div class="action-dropdown-menu-item">
33-
<a href="" class="action-dropdown-menu-link" text="$view().label" click="applyView.bind($data, $view().index)" closeCollapsible/>
33+
<a href="" class="action-dropdown-menu-link" translate="$view().label" click="applyView.bind($data, $view().index)" closeCollapsible/>
3434

3535
<div class="action-dropdown-menu-item-actions" if="$view().editable">
3636
<button class="action-edit" type="button" attr="title: $t('Edit bookmark')" click="editView.bind($data, $view().index)">

app/code/Magento/Ui/view/base/web/templates/grid/search/search.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
</label>
1111
<input class="admin__control-text data-grid-search-control" type="text"
1212
data-bind="
13+
i18n: placeholder,
1314
attr: {
1415
id: index,
15-
placeholder: placeholder
16+
placeholder: $t(placeholder)
1617
},
1718
textInput: inputValue,
1819
keyboard: {

app/code/Magento/Ui/view/base/web/templates/grid/submenu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<ul class="action-submenu" each="data: action.actions, as: 'action'" css="_active: action.visible">
88
<li css="_visible: $data.visible">
9-
<span class="action-menu-item" text="label" click="$parent.applyAction.bind($parent, type)"/>
9+
<span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"/>
1010
<render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
1111
</li>
1212
</ul>

app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="action-menu-items">
1212
<ul class="action-menu" each="data: actions, as: 'action'" css="_active: opened">
1313
<li css="_visible: $data.visible, _parent: $data.actions">
14-
<span class="action-menu-item" text="label" click="$parent.applyAction.bind($parent, type)"/>
14+
<span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"/>
1515
<render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
1616
</li>
1717
</ul>

0 commit comments

Comments
 (0)