Commit 1c3576b5 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'vue-i18n-various-js-directories' into 'master'

Vue-i18n: various js directories

See merge request gitlab-org/gitlab-ce!29883
parents cbf4ddd8 f6d14fd4
...@@ -49,9 +49,9 @@ export default { ...@@ -49,9 +49,9 @@ export default {
</p> </p>
</div> </div>
<div class="form-group" :class="{ 'gl-show-field-errors': connectError }"> <div class="form-group" :class="{ 'gl-show-field-errors': connectError }">
<label class="label-bold" for="error-tracking-token">{{ <label class="label-bold" for="error-tracking-token">
s__('ErrorTracking|Auth Token') {{ s__('ErrorTracking|Auth Token') }}
}}</label> </label>
<div class="row"> <div class="row">
<div class="col-8 col-md-9 gl-pr-0"> <div class="col-8 col-md-9 gl-pr-0">
<gl-form-input <gl-form-input
...@@ -65,9 +65,8 @@ export default { ...@@ -65,9 +65,8 @@ export default {
<gl-button <gl-button
class="js-error-tracking-connect prepend-left-5" class="js-error-tracking-connect prepend-left-5"
@click="$emit('handle-connect')" @click="$emit('handle-connect')"
>{{ __('Connect') }}</gl-button
> >
{{ __('Connect') }}
</gl-button>
<icon <icon
v-show="connectSuccessful" v-show="connectSuccessful"
class="js-error-tracking-connect-success prepend-left-5 text-success align-middle" class="js-error-tracking-connect-success prepend-left-5 text-success align-middle"
......
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
<template> <template>
<div> <div>
<div v-if="!isLocalStorageAvailable" class="dropdown-info-note"> <div v-if="!isLocalStorageAvailable" class="dropdown-info-note">
This feature requires local storage to be enabled {{ __('This feature requires local storage to be enabled') }}
</div> </div>
<ul v-else-if="hasItems"> <ul v-else-if="hasItems">
<li v-for="(item, index) in processedItems" :key="`processed-items-${index}`"> <li v-for="(item, index) in processedItems" :key="`processed-items-${index}`">
...@@ -90,10 +90,10 @@ export default { ...@@ -90,10 +90,10 @@ export default {
class="filtered-search-history-clear-button" class="filtered-search-history-clear-button"
@click="onRequestClearRecentSearches($event)" @click="onRequestClearRecentSearches($event)"
> >
Clear recent searches {{ __('Clear recent searches') }}
</button> </button>
</li> </li>
</ul> </ul>
<div v-else class="dropdown-info-note">You don't have any recent searches</div> <div v-else class="dropdown-info-note">{{ __("You don't have any recent searches") }}</div>
</div> </div>
</template> </template>
...@@ -3,7 +3,7 @@ import Visibility from 'visibilityjs'; ...@@ -3,7 +3,7 @@ import Visibility from 'visibilityjs';
import ciIcon from '~/vue_shared/components/ci_icon.vue'; import ciIcon from '~/vue_shared/components/ci_icon.vue';
import Poll from '~/lib/utils/poll'; import Poll from '~/lib/utils/poll';
import Flash from '~/flash'; import Flash from '~/flash';
import { s__, sprintf } from '~/locale'; import { __, s__, sprintf } from '~/locale';
import tooltip from '~/vue_shared/directives/tooltip'; import tooltip from '~/vue_shared/directives/tooltip';
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon } from '@gitlab/ui';
import CommitPipelineService from '../services/commit_pipeline_service'; import CommitPipelineService from '../services/commit_pipeline_service';
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
}, },
errorCallback() { errorCallback() {
this.ciStatus = { this.ciStatus = {
text: 'not found', text: __('not found'),
icon: 'status_notfound', icon: 'status_notfound',
group: 'notfound', group: 'notfound',
}; };
......
...@@ -4,7 +4,7 @@ import { GlTooltipDirective, GlLink, GlBadge } from '@gitlab/ui'; ...@@ -4,7 +4,7 @@ import { GlTooltipDirective, GlLink, GlBadge } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import timeagoMixin from '~/vue_shared/mixins/timeago'; import timeagoMixin from '~/vue_shared/mixins/timeago';
import { sprintf } from '../../locale'; import { __, sprintf } from '../../locale';
export default { export default {
name: 'ReleaseBlock', name: 'ReleaseBlock',
...@@ -27,13 +27,13 @@ export default { ...@@ -27,13 +27,13 @@ export default {
}, },
computed: { computed: {
releasedTimeAgo() { releasedTimeAgo() {
return sprintf('released %{time}', { return sprintf(__('released %{time}'), {
time: this.timeFormated(this.release.created_at), time: this.timeFormated(this.release.created_at),
}); });
}, },
userImageAltDescription() { userImageAltDescription() {
return this.author && this.author.username return this.author && this.author.username
? sprintf("%{username}'s avatar", { username: this.author.username }) ? sprintf(__("%{username}'s avatar"), { username: this.author.username })
: null; : null;
}, },
commit() { commit() {
......
...@@ -110,9 +110,7 @@ export default { ...@@ -110,9 +110,7 @@ export default {
<component :is="linkComponent" :to="routerLinkTo" :href="url" class="str-truncated"> <component :is="linkComponent" :to="routerLinkTo" :href="url" class="str-truncated">
{{ fullPath }} {{ fullPath }}
</component> </component>
<gl-badge v-if="lfsOid" variant="default" class="label-lfs ml-1"> <gl-badge v-if="lfsOid" variant="default" class="label-lfs ml-1">LFS</gl-badge>
LFS
</gl-badge>
<template v-if="isSubmodule"> <template v-if="isSubmodule">
@ <gl-link href="#" class="commit-sha">{{ shortSha }}</gl-link> @ <gl-link href="#" class="commit-sha">{{ shortSha }}</gl-link>
</template> </template>
......
...@@ -251,6 +251,9 @@ msgstr "" ...@@ -251,6 +251,9 @@ msgstr ""
msgid "%{user_name} profile page" msgid "%{user_name} profile page"
msgstr "" msgstr ""
msgid "%{username}'s avatar"
msgstr ""
msgid "%{verb} %{time_spent_value} spent time." msgid "%{verb} %{time_spent_value} spent time."
msgstr "" msgstr ""
...@@ -2149,6 +2152,9 @@ msgstr "" ...@@ -2149,6 +2152,9 @@ msgstr ""
msgid "Clear" msgid "Clear"
msgstr "" msgstr ""
msgid "Clear recent searches"
msgstr ""
msgid "Clear search" msgid "Clear search"
msgstr "" msgstr ""
...@@ -10555,6 +10561,9 @@ msgstr "" ...@@ -10555,6 +10561,9 @@ msgstr ""
msgid "This domain is not verified. You will need to verify ownership before access is enabled." msgid "This domain is not verified. You will need to verify ownership before access is enabled."
msgstr "" msgstr ""
msgid "This feature requires local storage to be enabled"
msgstr ""
msgid "This field is required." msgid "This field is required."
msgstr "" msgstr ""
...@@ -12070,6 +12079,9 @@ msgstr "" ...@@ -12070,6 +12079,9 @@ msgstr ""
msgid "You don't have any deployments right now." msgid "You don't have any deployments right now."
msgstr "" msgstr ""
msgid "You don't have any recent searches"
msgstr ""
msgid "You have been granted %{access_level} access to the %{source_link} %{source_type}." msgid "You have been granted %{access_level} access to the %{source_link} %{source_type}."
msgstr "" msgstr ""
...@@ -12754,6 +12766,9 @@ msgstr "" ...@@ -12754,6 +12766,9 @@ msgstr ""
msgid "none" msgid "none"
msgstr "" msgstr ""
msgid "not found"
msgstr ""
msgid "notification emails" msgid "notification emails"
msgstr "" msgstr ""
...@@ -12803,6 +12818,9 @@ msgstr "" ...@@ -12803,6 +12818,9 @@ msgstr ""
msgid "register" msgid "register"
msgstr "" msgstr ""
msgid "released %{time}"
msgstr ""
msgid "remaining" msgid "remaining"
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