Commit 2a346fad authored by Michel Engelen's avatar Michel Engelen

replaced string `discussion` with `thread`

parent a32512e6
......@@ -39,7 +39,7 @@ export default {
return file.file_path;
}
return sprintf(__("%{authorsName}'s discussion"), {
return sprintf(__("%{authorsName}'s thread"), {
authorsName: this.discussion.notes.find(note => !note.system).author.name,
});
},
......
......@@ -36,14 +36,14 @@ export default {
if (discussionToBeResolved) {
if (discussionResolved) {
message = s__('MergeRequests|Discussion stays resolved');
message = s__('MergeRequests|Thread stays resolved');
} else {
message = s__('MergeRequests|Discussion will be resolved');
message = s__('MergeRequests|Thread will be resolved');
}
} else if (discussionResolved) {
message = s__('MergeRequests|Discussion will be unresolved');
message = s__('MergeRequests|Thread will be unresolved');
} else if (this.$options.showStaysResolved) {
message = s__('MergeRequests|Discussion stays unresolved');
message = s__('MergeRequests|Thread stays unresolved');
}
return message;
......
......@@ -21,7 +21,7 @@ export const addDraftToDiscussion = ({ commit }, { endpoint, data }) =>
return res;
})
.catch(() => {
flash(__('An error occurred adding a draft to the discussion.'));
flash(__('An error occurred adding a draft to the thread.'));
});
export const createNewDraft = ({ commit }, { endpoint, data }) =>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment