Merge branch '215352-update-cancel-comment-note-text' into 'master'

Update the cancel comment note text

Closes #215352

See merge request gitlab-org/gitlab!30189

app/assets/javascripts/notes.js

@@ -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

+---
+title: Update the cancel comment note text to a less ambiguous statement.
+merge_request: 30189
+author:
+type: changed

locale/gitlab.pot

@@ -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 ""
 
@@ -24252,6 +24252,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 ""