From 6cbcc787b9be0223a61297c2d070060c8f55c532 Mon Sep 17 00:00:00 2001 From: jerasmus Date: Tue, 2 Apr 2019 10:26:45 +0200 Subject: [PATCH 1/5] Localize the notifications dropdown string Localized the notifications dropdown string --- app/assets/javascripts/notifications_dropdown.js | 3 ++- locale/gitlab.pot | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/notifications_dropdown.js b/app/assets/javascripts/notifications_dropdown.js index 6aed2492084094..08545dcea463ef 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/locale/gitlab.pot b/locale/gitlab.pot index 27dd698af86d51..35b11f4aecedfb 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4366,6 +4366,9 @@ msgstr "" msgid "Failed to reset key. Please try again." msgstr "" +msgid "Failed to save new settings" +msgstr "" + msgid "Failed to signing using smartcard authentication" msgstr "" -- GitLab From 96a17983a9ca11c38bea4e23ef6b6fca6af90450 Mon Sep 17 00:00:00 2001 From: jerasmus Date: Tue, 2 Apr 2019 10:39:28 +0200 Subject: [PATCH 2/5] Add changelog entry Added a changelog entry for the change --- .../unreleased/localize-notification-dropdown-ee.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 ee/changelogs/unreleased/localize-notification-dropdown-ee.yml diff --git a/ee/changelogs/unreleased/localize-notification-dropdown-ee.yml b/ee/changelogs/unreleased/localize-notification-dropdown-ee.yml new file mode 100644 index 00000000000000..7d4eefa4e0ba7f --- /dev/null +++ b/ee/changelogs/unreleased/localize-notification-dropdown-ee.yml @@ -0,0 +1,5 @@ +--- +title: Localize notifications dropdown +merge_request: 10535 +author: +type: changed -- GitLab From 41dc1c13f04b17ab990c712e618b52275d8046be Mon Sep 17 00:00:00 2001 From: Jacques Erasmus Date: Tue, 2 Apr 2019 10:20:54 +0000 Subject: [PATCH 3/5] Remove redundant entry Removed the redundant changelog entry --- .../unreleased/localize-notification-dropdown-ee.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 ee/changelogs/unreleased/localize-notification-dropdown-ee.yml diff --git a/ee/changelogs/unreleased/localize-notification-dropdown-ee.yml b/ee/changelogs/unreleased/localize-notification-dropdown-ee.yml deleted file mode 100644 index 7d4eefa4e0ba7f..00000000000000 --- a/ee/changelogs/unreleased/localize-notification-dropdown-ee.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Localize notifications dropdown -merge_request: 10535 -author: -type: changed -- GitLab From f77782a818946c353989437863a59e72068f0e00 Mon Sep 17 00:00:00 2001 From: Jacques Erasmus Date: Tue, 2 Apr 2019 12:17:12 +0000 Subject: [PATCH 4/5] Fix pipeline errors Fixed the broken pipeline --- changelogs/unreleased/localize-notification-dropdown.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/localize-notification-dropdown.yml diff --git a/changelogs/unreleased/localize-notification-dropdown.yml b/changelogs/unreleased/localize-notification-dropdown.yml new file mode 100644 index 00000000000000..9b1cd8255010ba --- /dev/null +++ b/changelogs/unreleased/localize-notification-dropdown.yml @@ -0,0 +1,5 @@ +--- +title: Localize notifications dropdown +merge_request: 26844 +author: +type: changed \ No newline at end of file -- GitLab From 6ac24e5f3b45026610e792429d9ce9af6d28e50d Mon Sep 17 00:00:00 2001 From: Jacques Erasmus Date: Tue, 2 Apr 2019 13:56:55 +0000 Subject: [PATCH 5/5] Add newline at end of changelog entry Added a new line to satisfy the pipeline --- changelogs/unreleased/localize-notification-dropdown.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/localize-notification-dropdown.yml b/changelogs/unreleased/localize-notification-dropdown.yml index 9b1cd8255010ba..9599aaf344bf3a 100644 --- a/changelogs/unreleased/localize-notification-dropdown.yml +++ b/changelogs/unreleased/localize-notification-dropdown.yml @@ -2,4 +2,4 @@ title: Localize notifications dropdown merge_request: 26844 author: -type: changed \ No newline at end of file +type: changed -- GitLab