diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
commit | 286fe61013674fe2d245ffc8d2233baf09923e70 (patch) | |
tree | 2037291f5863105e54e75be056b49f7d62007cae /app/assets/javascripts/ide/components/commit_sidebar/form.vue | |
parent | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (diff) | |
download | gitlab-ce-286fe61013674fe2d245ffc8d2233baf09923e70.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide/components/commit_sidebar/form.vue')
-rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/form.vue | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/form.vue b/app/assets/javascripts/ide/components/commit_sidebar/form.vue index 5ec3fc4041b..f6ca728defc 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/form.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/form.vue @@ -1,6 +1,6 @@ <script> import { mapState, mapActions, mapGetters } from 'vuex'; -import { sprintf, __ } from '~/locale'; +import { n__, __ } from '~/locale'; import LoadingButton from '~/vue_shared/components/loading_button.vue'; import CommitMessageField from './message_field.vue'; import Actions from './actions.vue'; @@ -26,15 +26,7 @@ export default { ...mapGetters(['hasChanges']), ...mapGetters('commit', ['discardDraftButtonDisabled', 'preBuiltCommitMessage']), overviewText() { - return sprintf( - __( - '<strong>%{stagedFilesLength} staged</strong> and <strong>%{changedFilesLength} unstaged</strong> changes', - ), - { - stagedFilesLength: this.stagedFiles.length, - changedFilesLength: this.changedFiles.length, - }, - ); + return n__('%d changed file', '%d changed files', this.stagedFiles.length); }, commitButtonText() { return this.stagedFiles.length ? __('Commit') : __('Stage & Commit'); @@ -125,7 +117,7 @@ export default { > {{ __('Commit…') }} </button> - <p class="text-center" v-html="overviewText"></p> + <p class="text-center bold">{{ overviewText }}</p> </div> <form v-if="!isCompact" ref="formEl" @submit.prevent.stop="commitChanges"> <transition name="fade"> <success-message v-show="lastCommitMsg" /> </transition> |