diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-01 13:23:35 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-01 13:23:35 +0000 |
| commit | a6701647fffa07f41f4ff1cb0a367deb3204bf51 (patch) | |
| tree | fb316177979d1ca3ffd1ea57c9f20732a9e440bf | |
| parent | f88ab64fef6d6433913bbff0bec09a9690c39e24 (diff) | |
| parent | 763a9e83e42482bb8126a5e60c232e444255fc7a (diff) | |
| download | gitlab-ce-a6701647fffa07f41f4ff1cb0a367deb3204bf51.tar.gz | |
Merge branch 'vue-i18n-js-pipelines-directory' into 'master'
Vue-i18n: autofix for app/assets/javascripts/pipelines directory
See merge request gitlab-org/gitlab-ce!30015
| -rw-r--r-- | app/assets/javascripts/pipelines/components/header_component.vue | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipeline_url.vue | 3 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/pipelines/components/header_component.vue b/app/assets/javascripts/pipelines/components/header_component.vue index b2e365e5cde..39afa87afc3 100644 --- a/app/assets/javascripts/pipelines/components/header_component.vue +++ b/app/assets/javascripts/pipelines/components/header_component.vue @@ -2,6 +2,7 @@ import { GlLoadingIcon } from '@gitlab/ui'; import ciHeader from '../../vue_shared/components/header_ci_component.vue'; import eventHub from '../event_hub'; +import { __ } from '~/locale'; export default { name: 'PipelineHeaderSection', @@ -54,7 +55,7 @@ export default { if (this.pipeline.retry_path) { actions.push({ - label: 'Retry', + label: __('Retry'), path: this.pipeline.retry_path, cssClass: 'js-retry-button btn btn-inverted-secondary', type: 'button', @@ -64,7 +65,7 @@ export default { if (this.pipeline.cancel_path) { actions.push({ - label: 'Cancel running', + label: __('Cancel running'), path: this.pipeline.cancel_path, cssClass: 'js-btn-cancel-pipeline btn btn-danger', type: 'button', diff --git a/app/assets/javascripts/pipelines/components/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipeline_url.vue index 65a2b61396c..3f021a26ec5 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_url.vue +++ b/app/assets/javascripts/pipelines/components/pipeline_url.vue @@ -94,9 +94,8 @@ export default { tabindex="0" class="js-pipeline-url-autodevops badge badge-info autodevops-badge" role="button" + >{{ __('Auto DevOps') }}</gl-link > - Auto DevOps - </gl-link> <span v-if="pipeline.flags.stuck" class="js-pipeline-url-stuck badge badge-warning"> {{ __('stuck') }} </span> diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f0d3001effc..92eb03bd288 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1873,6 +1873,9 @@ msgstr "" msgid "Cancel" msgstr "" +msgid "Cancel running" +msgstr "" + msgid "Cancel this job" msgstr "" |