Commit ee72dc1b authored by Clement Ho's avatar Clement Ho

Merge branch 'localize-notification-dropdown' into 'master'

Localize notifications dropdown

Closes gitlab-ee#10686

See merge request gitlab-org/gitlab-ce!26844
parents b39209f3 6e61a6a7
import $ from 'jquery'; import $ from 'jquery';
import Flash from './flash'; import Flash from './flash';
import { __ } from '~/locale';
export default function notificationsDropdown() { export default function notificationsDropdown() {
$(document).on('click', '.update-notification', function updateNotificationCallback(e) { $(document).on('click', '.update-notification', function updateNotificationCallback(e) {
...@@ -27,7 +28,7 @@ export default function notificationsDropdown() { ...@@ -27,7 +28,7 @@ export default function notificationsDropdown() {
.closest('.js-notification-dropdown') .closest('.js-notification-dropdown')
.replaceWith(data.html); .replaceWith(data.html);
} else { } else {
Flash('Failed to save new settings', 'alert'); Flash(__('Failed to save new settings'), 'alert');
} }
}); });
} }
---
title: Localize notifications dropdown
merge_request: 26844
author:
type: changed
...@@ -3595,6 +3595,9 @@ msgstr "" ...@@ -3595,6 +3595,9 @@ msgstr ""
msgid "Failed to remove user key." msgid "Failed to remove user key."
msgstr "" msgstr ""
msgid "Failed to save new settings"
msgstr ""
msgid "Failed to update issues, please try again." msgid "Failed to update issues, please try again."
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