summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-14 10:20:22 +0200
committerMichel Engelen <michel.engelen@diva-e.com>2019-06-14 10:20:22 +0200
commitdd6747c2c6cb1e0319d02026db70780b835f7237 (patch)
tree40bdeb1b29c0b69e7724a478d43b2ef61d04fbea
parenta3126ecbc1d9816d63618b7ce2bbc51c83235501 (diff)
downloadgitlab-ce-dd6747c2c6cb1e0319d02026db70780b835f7237.tar.gz
replaced string `discussion` wit `thread` in noteable-discussion component
-rw-r--r--app/assets/javascripts/notes/components/noteable_discussion.vue12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index eb6a4a67fff..27bd6d51bfc 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -177,22 +177,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}',
);
}