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

Change the copy from blacklist to blocklist #65419

Merged
merged 2 commits into from
May 7, 2020
Merged

Change the copy from blacklist to blocklist #65419

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
564467e
Change the copy and the id from blacklist to block list for consistency
stratoula May 6, 2020
fc476a2
Merge branch 'master' into 2020-06-05-fix-copy-blocklist
elasticmachine May 7, 2020
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 x-pack/plugins/graph/public/angular/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@
</button>

<button class="kuiButton kuiButton--basic kuiButton--small" ng-disabled="workspace === null ||workspace.selectedNodes.length === 0"
tooltip="{{ ::'xpack.graph.sidebar.topMenu.blacklistButtonTooltip' | i18n: { defaultMessage: 'Blacklist selection from return to workspace' } }}"
aria-label="{{ ::'xpack.graph.sidebar.topMenu.blacklistButtonTooltip' | i18n: { defaultMessage: 'Blacklist selection from return to workspace' } }}"
tooltip="{{ ::'xpack.graph.sidebar.topMenu.blocklistButtonTooltip' | i18n: { defaultMessage: 'Block selection from appearing in workspace' } }}"
aria-label="{{ ::'xpack.graph.sidebar.topMenu.blocklistButtonTooltip' | i18n: { defaultMessage: 'Block selection from appearing in workspace' } }}"
ng-click="workspace.blacklistSelection();">
<span class="kuiIcon fa-ban"></span>
</button>
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6590,7 +6590,6 @@
"xpack.graph.sidebar.selectionsTitle": "選択項目",
"xpack.graph.sidebar.styleVerticesTitle": "スタイルが選択された頂点",
"xpack.graph.sidebar.topMenu.addLinksButtonTooltip": "既存の用語の間にリンクを追加します",
"xpack.graph.sidebar.topMenu.blacklistButtonTooltip": "選択項目がワークスペースに戻らないようブラックリストに追加します",
"xpack.graph.sidebar.topMenu.customStyleButtonTooltip": "選択された頂点のカスタムスタイル",
"xpack.graph.sidebar.topMenu.drillDownButtonTooltip": "ドリルダウン",
"xpack.graph.sidebar.topMenu.expandSelectionButtonTooltip": "選択項目を拡張",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6595,7 +6595,6 @@
"xpack.graph.sidebar.selectionsTitle": "选择的内容",
"xpack.graph.sidebar.styleVerticesTitle": "样式选择的顶点",
"xpack.graph.sidebar.topMenu.addLinksButtonTooltip": "在现有字词之间添加链接",
"xpack.graph.sidebar.topMenu.blacklistButtonTooltip": "返回工作空间时选择的黑名单",
"xpack.graph.sidebar.topMenu.customStyleButtonTooltip": "定制样式选择的顶点",
"xpack.graph.sidebar.topMenu.drillDownButtonTooltip": "向下钻取",
"xpack.graph.sidebar.topMenu.expandSelectionButtonTooltip": "展开选择内容",
Expand Down