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

Vue-i18n: various js directories

See merge request gitlab-org/gitlab-ce!29883

6 files changed, 31 insertions, 16 deletions

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