Merge branch 'vue-i18n-js-jobs-directory' into 'master'
Vue-i18n: autofix for app/assets/javascripts/jobs directory See merge request gitlab-org/gitlab-ce!29969
This commit is contained in:
commit
2b2d2911ab
|
@ -3,7 +3,7 @@ import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui';
|
|||
import { polyfillSticky } from '~/lib/utils/sticky';
|
||||
import Icon from '~/vue_shared/components/icon.vue';
|
||||
import { numberToHumanSize } from '~/lib/utils/number_utils';
|
||||
import { sprintf } from '~/locale';
|
||||
import { __, sprintf } from '~/locale';
|
||||
import scrollDown from '../svg/scroll_down.svg';
|
||||
|
||||
export default {
|
||||
|
@ -50,7 +50,7 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
jobLogSize() {
|
||||
return sprintf('Showing last %{size} of log -', {
|
||||
return sprintf(__('Showing last %{size} of log -'), {
|
||||
size: numberToHumanSize(this.size),
|
||||
});
|
||||
},
|
||||
|
@ -74,14 +74,12 @@ export default {
|
|||
<div class="js-truncated-info truncated-info d-none d-sm-block float-left">
|
||||
<template v-if="isTraceSizeVisible">
|
||||
{{ jobLogSize }}
|
||||
|
||||
<gl-link
|
||||
v-if="rawPath"
|
||||
:href="rawPath"
|
||||
class="js-raw-link text-plain text-underline prepend-left-5"
|
||||
>{{ s__('Job|Complete Raw') }}</gl-link
|
||||
>
|
||||
{{ s__('Job|Complete Raw') }}
|
||||
</gl-link>
|
||||
</template>
|
||||
</div>
|
||||
<!-- eo truncate information -->
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
<script>
|
||||
import { __, sprintf } from '~/locale';
|
||||
import _ from 'underscore';
|
||||
import { mapActions, mapState } from 'vuex';
|
||||
import { GlLink, GlButton } from '@gitlab/ui';
|
||||
|
@ -63,7 +64,9 @@ export default {
|
|||
|
||||
let t = this.job.metadata.timeout_human_readable;
|
||||
if (this.job.metadata.timeout_source !== '') {
|
||||
t += ` (from ${this.job.metadata.timeout_source})`;
|
||||
t += sprintf(__(` (from %{timeoutSource})`), {
|
||||
timeoutSource: this.job.metadata.timeout_source,
|
||||
});
|
||||
}
|
||||
|
||||
return t;
|
||||
|
|
|
@ -16,6 +16,9 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
|
||||
|
||||
msgid " (from %{timeoutSource})"
|
||||
msgstr ""
|
||||
|
||||
msgid " Please sign in."
|
||||
msgstr ""
|
||||
|
||||
|
@ -9181,6 +9184,9 @@ msgid_plural "Showing %d events"
|
|||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
msgid "Showing last %{size} of log -"
|
||||
msgstr ""
|
||||
|
||||
msgid "Side-by-side"
|
||||
msgstr ""
|
||||
|
||||
|
|
Loading…
Reference in New Issue