Commit 14ae3837 authored by Clement Ho's avatar Clement Ho

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

Localize the notifications dropdown (port to ee)

Closes #10686

See merge request gitlab-org/gitlab-ee!10535
parents b6d4e374 1ed7de86
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
...@@ -4366,6 +4366,9 @@ msgstr "" ...@@ -4366,6 +4366,9 @@ msgstr ""
msgid "Failed to reset key. Please try again." msgid "Failed to reset key. Please try again."
msgstr "" msgstr ""
msgid "Failed to save new settings"
msgstr ""
msgid "Failed to signing using smartcard authentication" msgid "Failed to signing using smartcard authentication"
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