diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /app/assets/javascripts/jobs/components/sidebar_job_details_container.vue | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) | |
download | gitlab-ce-36a59d088eca61b834191dacea009677a96c052f.tar.gz |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'app/assets/javascripts/jobs/components/sidebar_job_details_container.vue')
-rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_job_details_container.vue | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue b/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue index 5428f657252..2ba531c9e95 100644 --- a/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue +++ b/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue @@ -56,7 +56,7 @@ export default { }); }, runnerId() { - const { id, short_sha: token, description } = this.job?.runner; + const { id, short_sha: token, description } = this.job.runner; return `#${id} (${token}) ${description}`; }, @@ -71,11 +71,20 @@ export default { return ''; } - return sprintf(__(` (from %{timeoutSource})`), { + return sprintf(__(' (from %{timeoutSource})'), { timeoutSource: this.job.metadata.timeout_source, }); }, }, + i18n: { + COVERAGE: __('Coverage'), + FINISHED: __('Finished'), + ERASED: __('Erased'), + QUEUED: __('Queued'), + RUNNER: __('Runner'), + TAGS: __('Tags:'), + TIMEOUT: __('Timeout'), + }, }; </script> @@ -86,22 +95,22 @@ export default { v-if="job.finished_at" :value="finishedAt" data-testid="job-finished" - title="Finished" + :title="$options.i18n.FINISHED" /> - <detail-row v-if="job.erased_at" :value="erasedAt" title="Erased" /> - <detail-row v-if="job.queued" :value="queued" title="Queued" /> + <detail-row v-if="job.erased_at" :value="erasedAt" :title="$options.i18n.ERASED" /> + <detail-row v-if="job.queued" :value="queued" :title="$options.i18n.QUEUED" /> <detail-row v-if="hasTimeout" :help-url="runnerHelpUrl" :value="timeout" data-testid="job-timeout" - title="Timeout" + :title="$options.i18n.TIMEOUT" /> - <detail-row v-if="job.runner" :value="runnerId" title="Runner" /> - <detail-row v-if="job.coverage" :value="coverage" title="Coverage" /> + <detail-row v-if="job.runner" :value="runnerId" :title="$options.i18n.RUNNER" /> + <detail-row v-if="job.coverage" :value="coverage" :title="$options.i18n.COVERAGE" /> <p v-if="hasTags" class="build-detail-row" data-testid="job-tags"> - <span class="font-weight-bold">{{ __('Tags:') }}</span> + <span class="font-weight-bold">{{ $options.i18n.TAGS }}</span> <gl-badge v-for="(tag, i) in job.tags" :key="i" variant="info">{{ tag }}</gl-badge> </p> </div> |