Commit 589e7f3b authored by Phil Hughes's avatar Phil Hughes

Merge branch 'ee-specific-js-i18n-no-sub-dir' into 'master'

i18n EE files not in sub directories

See merge request gitlab-org/gitlab-ee!13484
parents 5d07a175 90d68fc9
...@@ -80,7 +80,7 @@ export default class ApproversSelect { ...@@ -80,7 +80,7 @@ export default class ApproversSelect {
.then(() => { .then(() => {
this.$approverSelect this.$approverSelect
.select2({ .select2({
placeholder: 'Search for users or groups', placeholder: __('Search for users or groups'),
multiple: true, multiple: true,
minimumInputLength: 0, minimumInputLength: 0,
query: query => { query: query => {
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import $ from 'jquery'; import $ from 'jquery';
import Api from 'ee/api'; import Api from 'ee/api';
import { __ } from '~/locale';
export default function initLDAPGroupsSelect() { export default function initLDAPGroupsSelect() {
var groupFormatSelection, ldapGroupResult; var groupFormatSelection, ldapGroupResult;
...@@ -18,7 +19,7 @@ export default function initLDAPGroupsSelect() { ...@@ -18,7 +19,7 @@ export default function initLDAPGroupsSelect() {
id: function(group) { id: function(group) {
return group.cn; return group.cn;
}, },
placeholder: 'Search for a LDAP group', placeholder: __('Search for a LDAP group'),
minimumInputLength: 1, minimumInputLength: 1,
query: function(query) { query: function(query) {
var provider; var provider;
...@@ -44,7 +45,7 @@ export default function initLDAPGroupsSelect() { ...@@ -44,7 +45,7 @@ export default function initLDAPGroupsSelect() {
formatSelection: groupFormatSelection, formatSelection: groupFormatSelection,
dropdownCssClass: 'ajax-groups-dropdown', dropdownCssClass: 'ajax-groups-dropdown',
formatNoMatches: function(nomatch) { formatNoMatches: function(nomatch) {
return 'Match not found; try refining your search query.'; return __('Match not found; try refining your search query.');
}, },
}); });
}); });
......
...@@ -7898,6 +7898,9 @@ msgstr "" ...@@ -7898,6 +7898,9 @@ msgstr ""
msgid "Marks todo as done." msgid "Marks todo as done."
msgstr "" msgstr ""
msgid "Match not found; try refining your search query."
msgstr ""
msgid "Maven Metadata" msgid "Maven Metadata"
msgstr "" msgstr ""
...@@ -11282,6 +11285,9 @@ msgstr "" ...@@ -11282,6 +11285,9 @@ msgstr ""
msgid "Search files" msgid "Search files"
msgstr "" msgstr ""
msgid "Search for a LDAP group"
msgstr ""
msgid "Search for a group" msgid "Search for a group"
msgstr "" msgstr ""
...@@ -11291,6 +11297,9 @@ msgstr "" ...@@ -11291,6 +11297,9 @@ msgstr ""
msgid "Search for projects, issues, etc." msgid "Search for projects, issues, etc."
msgstr "" msgstr ""
msgid "Search for users or groups"
msgstr ""
msgid "Search forks" msgid "Search forks"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment