diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-11 20:26:39 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-11 20:26:39 +0300 |
| commit | ac2271f861d19b8a676614e5db68b1dbb3f74bea (patch) | |
| tree | 3538e36c6f05a9925b0d7cca3090fcba0f5e3067 /app | |
| parent | e77ecf627fbf21d56db377710908db5cfcba7800 (diff) | |
| parent | cc00f468b0f1c2fe692050cadad9f8ecd7343e45 (diff) | |
Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master'
Add i18n and update specs for UnresolvedDiscussions vue component
See merge request gitlab-org/gitlab-ce!17866
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue | 12 |
1 files changed, 8 insertions, 4 deletions
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 9ade6a91747..a1f7e696795 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 @@ -7,7 +7,10 @@ export default { statusIcon, }, props: { - mr: { type: Object, required: true }, + mr: { + type: Object, + required: true, + }, }, }; </script> @@ -20,13 +23,14 @@ export default { /> <div class="media-body space-children"> <span class="bold"> - There are unresolved discussions. Please resolve these discussions + {{ s__("mrWidget|There are unresolved discussions. Please resolve these discussions") }} </span> <a v-if="mr.createIssueToResolveDiscussionsPath" :href="mr.createIssueToResolveDiscussionsPath" - class="btn btn-default btn-xs js-create-issue"> - Create an issue to resolve them later + class="btn btn-default btn-xs js-create-issue" + > + {{ s__("mrWidget|Create an issue to resolve them later") }} </a> </div> </div> |