Commit e2aad4a5 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'fl-missing-i18n' into 'master'

Adds missing i18n to pipelines table

See merge request gitlab-org/gitlab-ce!22690
parents 912741cf c2d379b3
<script> <script>
import { s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import icon from '../../vue_shared/components/icon.vue'; import Icon from '../../vue_shared/components/icon.vue';
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
import GlCountdown from '~/vue_shared/components/gl_countdown.vue'; import GlCountdown from '~/vue_shared/components/gl_countdown.vue';
...@@ -10,7 +10,7 @@ export default { ...@@ -10,7 +10,7 @@ export default {
tooltip, tooltip,
}, },
components: { components: {
icon, Icon,
GlCountdown, GlCountdown,
}, },
props: { props: {
......
<script> <script>
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
import icon from '../../vue_shared/components/icon.vue'; import Icon from '../../vue_shared/components/icon.vue';
export default { export default {
directives: { directives: {
tooltip, tooltip,
}, },
components: { components: {
icon, Icon,
}, },
props: { props: {
artifacts: { artifacts: {
......
...@@ -88,25 +88,25 @@ export default { ...@@ -88,25 +88,25 @@ export default {
class="table-section section-10 js-pipeline-status pipeline-status" class="table-section section-10 js-pipeline-status pipeline-status"
role="rowheader" role="rowheader"
> >
Status {{ s__('Pipeline|Status') }}
</div> </div>
<div <div
class="table-section section-15 js-pipeline-info pipeline-info" class="table-section section-15 js-pipeline-info pipeline-info"
role="rowheader" role="rowheader"
> >
Pipeline {{ s__('Pipeline|Pipeline') }}
</div> </div>
<div <div
class="table-section section-20 js-pipeline-commit pipeline-commit" class="table-section section-20 js-pipeline-commit pipeline-commit"
role="rowheader" role="rowheader"
> >
Commit {{ s__('Pipeline|Commit') }}
</div> </div>
<div <div
class="table-section section-20 js-pipeline-stages pipeline-stages" class="table-section section-20 js-pipeline-stages pipeline-stages"
role="rowheader" role="rowheader"
> >
Stages {{ s__('Pipeline|Stages') }}
</div> </div>
</div> </div>
<pipelines-table-row-component <pipelines-table-row-component
......
...@@ -261,7 +261,7 @@ export default { ...@@ -261,7 +261,7 @@ export default {
class="table-mobile-header" class="table-mobile-header"
role="rowheader" role="rowheader"
> >
Status {{ s__('Pipeline|Status') }}
</div> </div>
<div class="table-mobile-content"> <div class="table-mobile-content">
<ci-badge <ci-badge
...@@ -279,8 +279,9 @@ export default { ...@@ -279,8 +279,9 @@ export default {
<div class="table-section section-20"> <div class="table-section section-20">
<div <div
class="table-mobile-header" class="table-mobile-header"
role="rowheader"> role="rowheader"
Commit >
{{ s__('Pipeline|Commit') }}
</div> </div>
<div class="table-mobile-content"> <div class="table-mobile-content">
<commit-component <commit-component
...@@ -298,8 +299,9 @@ export default { ...@@ -298,8 +299,9 @@ export default {
<div class="table-section section-wrap section-20 stage-cell"> <div class="table-section section-wrap section-20 stage-cell">
<div <div
class="table-mobile-header" class="table-mobile-header"
role="rowheader"> role="rowheader"
Stages >
{{ s__('Pipeline|Stages') }}
</div> </div>
<div class="table-mobile-content"> <div class="table-mobile-content">
<template v-if="pipeline.details.stages.length > 0"> <template v-if="pipeline.details.stages.length > 0">
......
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
class="table-mobile-header" class="table-mobile-header"
role="rowheader" role="rowheader"
> >
Duration {{ s__('Pipeline|Duration') }}
</div> </div>
<div class="table-mobile-content"> <div class="table-mobile-content">
<p <p
...@@ -87,7 +87,8 @@ export default { ...@@ -87,7 +87,8 @@ export default {
v-tooltip v-tooltip
:title="tooltipTitle(finishedTime)" :title="tooltipTitle(finishedTime)"
data-placement="top" data-placement="top"
data-container="body"> data-container="body"
>
{{ timeFormated(finishedTime) }} {{ timeFormated(finishedTime) }}
</time> </time>
</p> </p>
......
---
title: Adds missing i18n to pipelines table
merge_request:
author:
type: other
...@@ -4488,15 +4488,24 @@ msgstr "" ...@@ -4488,15 +4488,24 @@ msgstr ""
msgid "Pipelines|This project is not currently set up to run pipelines." msgid "Pipelines|This project is not currently set up to run pipelines."
msgstr "" msgstr ""
msgid "Pipeline|Commit"
msgstr ""
msgid "Pipeline|Create for" msgid "Pipeline|Create for"
msgstr "" msgstr ""
msgid "Pipeline|Create pipeline" msgid "Pipeline|Create pipeline"
msgstr "" msgstr ""
msgid "Pipeline|Duration"
msgstr ""
msgid "Pipeline|Existing branch name or tag" msgid "Pipeline|Existing branch name or tag"
msgstr "" msgstr ""
msgid "Pipeline|Pipeline"
msgstr ""
msgid "Pipeline|Run Pipeline" msgid "Pipeline|Run Pipeline"
msgstr "" msgstr ""
...@@ -4506,6 +4515,12 @@ msgstr "" ...@@ -4506,6 +4515,12 @@ msgstr ""
msgid "Pipeline|Specify variable values to be used in this run. The values specified in %{settings_link} will be used by default." msgid "Pipeline|Specify variable values to be used in this run. The values specified in %{settings_link} will be used by default."
msgstr "" msgstr ""
msgid "Pipeline|Stages"
msgstr ""
msgid "Pipeline|Status"
msgstr ""
msgid "Pipeline|Stop pipeline" msgid "Pipeline|Stop pipeline"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment