diff options
| author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-07-08 11:56:06 +1000 |
|---|---|---|
| committer | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-07-08 12:24:03 +1000 |
| commit | da3babc562b4a0c57395b1eb4158d8aee8e30b35 (patch) | |
| tree | 4baa58de7006da7354b9877379d963966456afad /app | |
| parent | c9c52b055f7632604cc273c78e6c70e6051eb39d (diff) | |
| download | gitlab-ce-vue-i18n-js-vue-mr-widget-directory.tar.gz | |
Minor translation namespace fixesvue-i18n-js-vue-mr-widget-directory
Removed some namespaces for translations
and added additional ones to some mrwidget
vue files.
Diffstat (limited to 'app')
3 files changed, 13 insertions, 9 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue index 56f81e635d9..fb826be19f5 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue @@ -90,7 +90,7 @@ export default { v-html="mr.sourceBranchLink" /><clipboard-button :text="branchNameClipboardData" - :title="s__('mrWidget|Copy branch name to clipboard')" + :title="__('Copy branch name to clipboard')" css-class="btn-default btn-transparent btn-clipboard" /> {{ s__('mrWidget|into') }} @@ -139,7 +139,7 @@ export default { type="button" class="btn dropdown-toggle qa-dropdown-toggle" data-toggle="dropdown" - :aria-label="s__('mrWidget|Download as')" + :aria-label="__('Download as')" aria-haspopup="true" aria-expanded="false" > diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue index 2997171922f..8e8e67228ed 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue @@ -101,7 +101,7 @@ export default { class="btn btn-sm btn-default js-cancel-auto-merge" @click.prevent="cancelAutomaticMerge" > - <i v-if="isCancellingAutoMerge" class="fa fa-spinner fa-spin" aria-hidden="true"></i> + <i v-if="isCancellingAutoMerge" class="fa fa-spinner fa-spin" aria-hidden="true"> </i> {{ cancelButtonText }} </a> </h4> @@ -125,7 +125,7 @@ export default { href="#" @click.prevent="removeSourceBranch" > - <i v-if="isRemovingSourceBranch" class="fa fa-spinner fa-spin" aria-hidden="true"></i> + <i v-if="isRemovingSourceBranch" class="fa fa-spinner fa-spin" aria-hidden="true"> </i> {{ s__('mrWidget|Delete source branch') }} </a> </p> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue index 5a3d4fd7d4a..7312b31c01c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue @@ -23,17 +23,21 @@ export default { </div> <div class="text col-md-7 order-md-first col-12"> <span>{{ - __( - 'Merge requests are a place to propose changes you have made to a project and discuss those changes with others.', + s__( + 'mrWidgetNothingToMerge|Merge requests are a place to propose changes you have made to a project and discuss those changes with others.', ) }}</span> <p> - {{ __('Interested parties can even contribute by pushing commits if they want to.') }} + {{ + s__( + 'mrWidgetNothingToMerge|Interested parties can even contribute by pushing commits if they want to.', + ) + }} </p> <p> {{ - __( - "Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch.", + s__( + "mrWidgetNothingToMerge|Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch.", ) }} </p> |