Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1ed7de86
Commit
1ed7de86
authored
Apr 03, 2019
by
Jacques Erasmus
Committed by
Clement Ho
Apr 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Localize the notifications dropdown string
Localized the notifications dropdown string
parent
b6d4e374
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
app/assets/javascripts/notifications_dropdown.js
app/assets/javascripts/notifications_dropdown.js
+2
-1
changelogs/unreleased/localize-notification-dropdown.yml
changelogs/unreleased/localize-notification-dropdown.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/notifications_dropdown.js
View file @
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
'
);
}
}
});
});
}
}
changelogs/unreleased/localize-notification-dropdown.yml
0 → 100644
View file @
1ed7de86
---
title
:
Localize notifications dropdown
merge_request
:
26844
author
:
type
:
changed
locale/gitlab.pot
View file @
1ed7de86
...
@@ -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 ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment