From 28d4a0658572bcc214dc36d85f848bc47892dd6f Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Wed, 12 Jun 2019 14:17:23 +0200 Subject: changed string `discussion` to `thread` in button and description title --- app/assets/javascripts/notes/components/comment_form.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 075c28e8d07..5a4b5f9398b 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -65,7 +65,7 @@ export default { return this.getUserData.id; }, commentButtonTitle() { - return this.noteType === constants.COMMENT ? 'Comment' : 'Start discussion'; + return this.noteType === constants.COMMENT ? 'Comment' : 'Start thread'; }, startDiscussionDescription() { let text = 'Discuss a specific suggestion or question'; @@ -418,7 +418,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown" >
- Start discussion + Start thread

{{ startDiscussionDescription }}

-- cgit v1.2.3 From 897e5eed0887abe8fdeaf57b75c94e2ef9bdeb3a Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Wed, 12 Jun 2019 14:18:22 +0200 Subject: changed string `discussion` to `thread` in reply form --- app/assets/javascripts/notes/mixins/resolvable.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/notes/mixins/resolvable.js b/app/assets/javascripts/notes/mixins/resolvable.js index 2329727bca2..16b7598ee09 100644 --- a/app/assets/javascripts/notes/mixins/resolvable.js +++ b/app/assets/javascripts/notes/mixins/resolvable.js @@ -20,13 +20,13 @@ export default { resolveButtonTitle() { if (this.updatedNoteBody) { if (this.discussionResolved) { - return __('Comment & unresolve discussion'); + return __('Comment & unresolve thread'); } - return __('Comment & resolve discussion'); + return __('Comment & resolve thread'); } - return this.discussionResolved ? __('Unresolve discussion') : __('Resolve discussion'); + return this.discussionResolved ? __('Unresolve thread') : __('Resolve thread'); }, }, methods: { -- cgit v1.2.3 From 83a977f00d09d227db4d98dc603e7ba79d1b4813 Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Wed, 12 Jun 2019 14:22:03 +0200 Subject: changed string `discussion` to `thread` in discussion (thread) counter --- app/assets/javascripts/notes/components/discussion_counter.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index efd84f5722c..d7ffa0abb79 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -61,7 +61,7 @@ export default { {{ resolvedDiscussionsCount }}/{{ resolvableDiscussionsCount }} - {{ n__('discussion resolved', 'discussions resolved', resolvableDiscussionsCount) }} + {{ n__('thread resolved', 'threads resolved', resolvableDiscussionsCount) }}
@@ -81,7 +81,7 @@ export default {
Date: Thu, 13 Jun 2019 15:52:36 +0200 Subject: replaced string `discussion` with string `thread` in mr-widget component state --- .../components/states/unresolved_discussions.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue index a9fb40a4949..d4a5fdb4b97 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue @@ -20,7 +20,7 @@ export default {
- {{ s__('mrWidget|There are unresolved discussions. Please resolve these discussions') }} + {{ s__('mrWidget|There are unresolved threads. Please resolve these threads') }} Date: Fri, 14 Jun 2019 09:05:18 +0200 Subject: replaced string `discussion` wit `thread` in note-form component --- app/assets/javascripts/notes/components/note_form.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue index 042ed196933..01be4f2b094 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -283,11 +283,11 @@ export default { type="checkbox" class="qa-unresolve-review-discussion" /> - {{ __('Unresolve discussion') }} + {{ __('Unresolve thread') }}

-- cgit v1.2.3 From 5a45f78b1edb23ac54abc3329830a6d8463e2611 Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Fri, 14 Jun 2019 09:11:31 +0200 Subject: replaced string `discussion` wit `thread` in discussion template --- app/views/discussions/_discussion.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index cc4d2ab64fa..9659d416a38 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -18,7 +18,7 @@ .inline.discussion-headline-light = discussion.author.to_reference - started a discussion + started a thread - url = discussion_path(discussion) - if discussion.for_commit? && @noteable != discussion.noteable -- cgit v1.2.3 From 791bf1cbf3a950fcdd598b111937dbc8093ec1c8 Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Fri, 14 Jun 2019 09:11:45 +0200 Subject: replaced string `discussion` wit `thread` in comment-button template --- app/views/shared/notes/_comment_button.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/views/shared/notes/_comment_button.html.haml b/app/views/shared/notes/_comment_button.html.haml index c3f5eeb0da6..8d74eacc7dc 100644 --- a/app/views/shared/notes/_comment_button.html.haml +++ b/app/views/shared/notes/_comment_button.html.haml @@ -18,11 +18,11 @@ %li.divider.droplab-item-ignore - %li#discussion{ data: { value: 'DiscussionNote', 'submit-text' => _('Start discussion'), 'close-text' => _("Start discussion & close %{noteable_name}") % { noteable_name: noteable_name }, 'reopen-text' => _("Start discussion & reopen %{noteable_name}") % { noteable_name: noteable_name } } } + %li#discussion{ data: { value: 'DiscussionNote', 'submit-text' => _('Start thread'), 'close-text' => _("Start thread & close %{noteable_name}") % { noteable_name: noteable_name }, 'reopen-text' => _("Start thread & reopen %{noteable_name}") % { noteable_name: noteable_name } } } %button.btn.btn-transparent = icon('check', class: 'icon') .description - %strong= _("Start discussion") + %strong= _("Start thread") %p = succeed '.' do - if @note.noteable.supports_resolvable_notes? -- cgit v1.2.3 From 638542467bfc3d1726312c08a768736f647ba6b5 Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Fri, 14 Jun 2019 10:20:22 +0200 Subject: replaced string `discussion` wit `thread` in noteable-discussion component --- .../javascripts/notes/components/noteable_discussion.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index b8eaff32cce..13cc1ade7ae 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -174,22 +174,22 @@ export default { active: isActive, } = this.discussion; - let text = s__('MergeRequests|started a discussion'); + let text = s__('MergeRequests|started a thread'); if (isForCommit) { text = s__( - 'MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}', + 'MergeRequests|started a thread on commit %{linkStart}%{commitId}%{linkEnd}', ); } else if (isDiffDiscussion && commitId) { text = isActive - ? s__('MergeRequests|started a discussion on commit %{linkStart}%{commitId}%{linkEnd}') + ? s__('MergeRequests|started a thread on commit %{linkStart}%{commitId}%{linkEnd}') : s__( - 'MergeRequests|started a discussion on an outdated change in commit %{linkStart}%{commitId}%{linkEnd}', + 'MergeRequests|started a thread on an outdated change in commit %{linkStart}%{commitId}%{linkEnd}', ); } else if (isDiffDiscussion) { text = isActive - ? s__('MergeRequests|started a discussion on %{linkStart}the diff%{linkEnd}') + ? s__('MergeRequests|started a thread on %{linkStart}the diff%{linkEnd}') : s__( - 'MergeRequests|started a discussion on %{linkStart}an old version of the diff%{linkEnd}', + 'MergeRequests|started a thread on %{linkStart}an old version of the diff%{linkEnd}', ); } -- cgit v1.2.3 From 8f13c3b321fca401cb0261624548f37fe81eb44b Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Fri, 14 Jun 2019 11:04:01 +0200 Subject: replaced string `discussion` with `thread` in issuable-form template --- app/views/shared/issuable/_form.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index c6a391ae563..1bd56e064d5 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -48,13 +48,13 @@ = hidden_field_tag 'merge_request_to_resolve_discussions_of', @merge_request_to_resolve_discussions_of.iid - if @discussion_to_resolve = hidden_field_tag 'discussion_to_resolve', @discussion_to_resolve.id - Creating this issue will resolve the discussion in + Creating this issue will resolve the thread in - else - Creating this issue will resolve all discussions in + Creating this issue will resolve all threads in = link_to_discussions_to_resolve(@merge_request_to_resolve_discussions_of, @discussion_to_resolve) - else The - = @discussion_to_resolve ? 'discussion' : 'discussions' + = @discussion_to_resolve ? 'thread' : 'threads' at = link_to_discussions_to_resolve(@merge_request_to_resolve_discussions_of, @discussion_to_resolve) will stay unresolved. Ask someone with permission to resolve -- cgit v1.2.3 From 2ded70292eee23fe2db89cc584ef5a2f8c42c6d8 Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Fri, 14 Jun 2019 11:28:16 +0200 Subject: prettified noteable_discussion component and updated tests --- app/assets/javascripts/notes/components/noteable_discussion.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 13cc1ade7ae..0031056ad4f 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -176,9 +176,7 @@ export default { let text = s__('MergeRequests|started a thread'); if (isForCommit) { - text = s__( - 'MergeRequests|started a thread on commit %{linkStart}%{commitId}%{linkEnd}', - ); + text = s__('MergeRequests|started a thread on commit %{linkStart}%{commitId}%{linkEnd}'); } else if (isDiffDiscussion && commitId) { text = isActive ? s__('MergeRequests|started a thread on commit %{linkStart}%{commitId}%{linkEnd}') -- cgit v1.2.3 From dde46ac6b345a83afb5e41039810e79a5ef79e6a Mon Sep 17 00:00:00 2001 From: Michel Engelen Date: Tue, 2 Jul 2019 09:43:03 +0200 Subject: replaced `discussion` with `thread` in comment button --- .../javascripts/diff_notes/components/comment_resolve_btn.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js index f66e07ba31a..7817b41514d 100644 --- a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js +++ b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js @@ -32,15 +32,15 @@ const CommentAndResolveBtn = Vue.extend({ buttonText: function() { if (this.isDiscussionResolved) { if (this.textareaIsEmpty) { - return __('Unresolve discussion'); + return __('Unresolve thread'); } else { - return __('Comment & unresolve discussion'); + return __('Comment & unresolve thread'); } } else { if (this.textareaIsEmpty) { - return __('Resolve discussion'); + return __('Resolve thread'); } else { - return __('Comment & resolve discussion'); + return __('Comment & resolve thread'); } } }, -- cgit v1.2.3