diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-07-16 14:35:16 +0200 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-07-16 14:35:16 +0200 |
commit | 2587f77e8efd5b5afec4b79e43afa46c48315f66 (patch) | |
tree | 069cc3e2a2d5cb9c3b3a85cf2a2723ffdae1bb2b | |
parent | 3c03781e6500cd3bec50506a53130e93a7c3683a (diff) | |
download | gitlab-ce-2587f77e8efd5b5afec4b79e43afa46c48315f66.tar.gz |
i18n changes for note cancel confirmations.
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_line_note_form.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_line_note_form.vue b/app/assets/javascripts/diffs/components/diff_line_note_form.vue index 7ed3ddba046..43eee77f15e 100644 --- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue +++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue @@ -59,8 +59,10 @@ export default { ...mapActions(['saveNote', 'refetchDiscussionById']), handleCancelCommentForm(shouldConfirm, isDirty) { if (shouldConfirm && isDirty) { + const msg = s__('Notes|Are you sure you want to cancel creating this comment?'); + // eslint-disable-next-line no-alert - if (!window.confirm('Are you sure you want to cancel creating this comment?')) { + if (!window.confirm(msg)) { return; } } diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 46be43610db..2f1a68731c7 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -6,6 +6,7 @@ import nextDiscussionsSvg from 'icons/_next_discussion.svg'; import { convertObjectPropsToCamelCase, scrollToElement } from '~/lib/utils/common_utils'; import { truncateSha } from '~/lib/utils/text_utility'; import systemNote from '~/vue_shared/components/notes/system_note.vue'; +import { s__ } from '~/locale'; import Flash from '../../flash'; import { SYSTEM_NOTE } from '../constants'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; @@ -194,8 +195,10 @@ export default { }, cancelReplyForm(shouldConfirm, isDirty) { if (shouldConfirm && isDirty) { + const msg = s__('Notes|Are you sure you want to cancel creating this comment?'); + // eslint-disable-next-line no-alert - if (!window.confirm('Are you sure you want to cancel creating this comment?')) { + if (!window.confirm(msg)) { return; } } |