diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-04-29 14:20:17 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-04-29 14:20:17 +0000 |
| commit | 41fed29a60b10ded9130c0f61119965ffcd28b88 (patch) | |
| tree | 9f94ad4a1c27f993bad2066ba6a13b914f9f268b | |
| parent | fe45f5446f2aefda2066bd4d271ae47162130049 (diff) | |
| parent | ba5cb321b90a50bd24d1acf90fa1bf001120ca85 (diff) | |
| download | gitlab-ce-41fed29a60b10ded9130c0f61119965ffcd28b88.tar.gz | |
Merge branch 'js-i18n-groups' into 'master'
Internationalisation of groups directory
See merge request gitlab-org/gitlab-ce!27679
| -rw-r--r-- | app/assets/javascripts/groups/transfer_dropdown.js | 3 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/groups/transfer_dropdown.js b/app/assets/javascripts/groups/transfer_dropdown.js index 26510fcdb2a..ce0c9256148 100644 --- a/app/assets/javascripts/groups/transfer_dropdown.js +++ b/app/assets/javascripts/groups/transfer_dropdown.js @@ -1,4 +1,5 @@ import $ from 'jquery'; +import { __ } from '~/locale'; export default class TransferDropdown { constructor() { @@ -13,7 +14,7 @@ export default class TransferDropdown { } buildDropdown() { - const extraOptions = [{ id: '', text: 'No parent group' }, 'divider']; + const extraOptions = [{ id: '', text: __('No parent group') }, 'divider']; this.groupDropdown.glDropdown({ selectable: true, diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b973cd2dd8e..0a5cd6730e6 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6038,6 +6038,9 @@ msgstr "" msgid "No other labels with such name or description" msgstr "" +msgid "No parent group" +msgstr "" + msgid "No preview for this file type" msgstr "" |