diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-04-03 16:15:16 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-04-03 16:15:16 +0000 |
| commit | ee72dc1b34d893662fe0cb7793a1a960312b1f48 (patch) | |
| tree | 9bab67fc0f3b64b0dd3618af487460f40ebb5987 | |
| parent | b39209f34a915aed9690510b64e454c5a307135d (diff) | |
| parent | 6e61a6a73dadc758bedefb528601494469d8eac9 (diff) | |
| download | gitlab-ce-ee72dc1b34d893662fe0cb7793a1a960312b1f48.tar.gz | |
Merge branch 'localize-notification-dropdown' into 'master'
Localize notifications dropdown
Closes gitlab-ee#10686
See merge request gitlab-org/gitlab-ce!26844
| -rw-r--r-- | app/assets/javascripts/notifications_dropdown.js | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/localize-notification-dropdown.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/notifications_dropdown.js b/app/assets/javascripts/notifications_dropdown.js index 6aed2492084..08545dcea46 100644 --- a/app/assets/javascripts/notifications_dropdown.js +++ b/app/assets/javascripts/notifications_dropdown.js @@ -1,5 +1,6 @@ import $ from 'jquery'; import Flash from './flash'; +import { __ } from '~/locale'; export default function notificationsDropdown() { $(document).on('click', '.update-notification', function updateNotificationCallback(e) { @@ -27,7 +28,7 @@ export default function notificationsDropdown() { .closest('.js-notification-dropdown') .replaceWith(data.html); } else { - Flash('Failed to save new settings', 'alert'); + Flash(__('Failed to save new settings'), 'alert'); } }); } diff --git a/changelogs/unreleased/localize-notification-dropdown.yml b/changelogs/unreleased/localize-notification-dropdown.yml new file mode 100644 index 00000000000..9599aaf344b --- /dev/null +++ b/changelogs/unreleased/localize-notification-dropdown.yml @@ -0,0 +1,5 @@ +--- +title: Localize notifications dropdown +merge_request: 26844 +author: +type: changed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index bb145a0984f..985a2a2f417 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3595,6 +3595,9 @@ msgstr "" msgid "Failed to remove user key." msgstr "" +msgid "Failed to save new settings" +msgstr "" + msgid "Failed to update issues, please try again." msgstr "" |