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
9ff1a75d
Commit
9ff1a75d
authored
Apr 24, 2020
by
Nadia Sotnikova
Committed by
Natalia Tepluhina
Apr 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the cancel comment note text
parent
e6f013c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+2
-2
changelogs/unreleased/215352-update-cancel-comment-note-text.yml
...ogs/unreleased/215352-update-cancel-comment-note-text.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+6
-3
No files found.
app/assets/javascripts/notes.js
View file @
9ff1a75d
...
...
@@ -256,7 +256,7 @@ export default class Notes {
discussionNoteForm
=
$textarea
.
closest
(
'
.js-discussion-note-form
'
);
if
(
discussionNoteForm
.
length
)
{
if
(
$textarea
.
val
()
!==
''
)
{
if
(
!
window
.
confirm
(
__
(
'
Are you sure you want to cancel creating this comment?
'
)))
{
if
(
!
window
.
confirm
(
__
(
'
Your comment will be discarded.
'
)))
{
return
;
}
}
...
...
@@ -268,7 +268,7 @@ export default class Notes {
originalText
=
$textarea
.
closest
(
'
form
'
).
data
(
'
originalNote
'
);
newText
=
$textarea
.
val
();
if
(
originalText
!==
newText
)
{
if
(
!
window
.
confirm
(
__
(
'
Are you sure you want to
cancel editing
this comment?
'
)))
{
if
(
!
window
.
confirm
(
__
(
'
Are you sure you want to
discard
this comment?
'
)))
{
return
;
}
}
...
...
changelogs/unreleased/215352-update-cancel-comment-note-text.yml
0 → 100644
View file @
9ff1a75d
---
title
:
Update the cancel comment note text to a less ambiguous statement.
merge_request
:
30189
author
:
type
:
changed
locale/gitlab.pot
View file @
9ff1a75d
...
...
@@ -2420,9 +2420,6 @@ msgstr ""
msgid "Are you sure that you want to unarchive this project?"
msgstr ""
msgid "Are you sure you want to cancel creating this comment?"
msgstr ""
msgid "Are you sure you want to cancel editing this comment?"
msgstr ""
...
...
@@ -2456,6 +2453,9 @@ msgstr ""
msgid "Are you sure you want to deploy this environment?"
msgstr ""
msgid "Are you sure you want to discard this comment?"
msgstr ""
msgid "Are you sure you want to erase this build?"
msgstr ""
...
...
@@ -24234,6 +24234,9 @@ msgstr ""
msgid "Your comment could not be updated! Please check your network connection and try again."
msgstr ""
msgid "Your comment will be discarded."
msgstr ""
msgid "Your custom stage '%{title}' was created"
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