summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js b/app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js
index 67d9892d9c6..de77ed7ec9c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js
@@ -2,14 +2,13 @@ import { s__ } from '~/locale';
export default {
computed: {
- statusTextBeforeAuthor() {
- return s__('mrWidget|Set by');
- },
- statusTextAfterAuthor() {
- return s__('mrWidget|to be merged automatically when the pipeline succeeds');
+ statusText() {
+ return s__(
+ 'mrWidget|Set by %{merge_author} to be merged automatically when the pipeline succeeds',
+ );
},
cancelButtonText() {
- return s__('mrWidget|Cancel');
+ return s__('mrWidget|Cancel auto-merge');
},
},
};