Merge branch 'vue-i18n-js-issue-show-directory' into 'master'

Vue-i18n: autofix for app/assets/javascripts/issue_show directory

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

app/assets/javascripts/issue_show/components/edit_actions.vue

@@ -73,7 +73,9 @@ export default {
       Save changes
       <i v-if="formState.updateLoading" class="fa fa-spinner fa-spin" aria-hidden="true"> </i>
     </button>
-    <button class="btn btn-default float-right" type="button" @click="closeForm">Cancel</button>
+    <button class="btn btn-default float-right" type="button" @click="closeForm">
+      {{ __('Cancel') }}
+    </button>
     <button
       v-if="shouldShowDeleteButton"
       :class="{ disabled: deleteLoading }"

app/assets/javascripts/issue_show/components/fields/description.vue

@@ -39,7 +39,7 @@ export default {
 
 <template>
   <div class="common-note-form">
-    <label class="sr-only" for="issue-description"> Description </label>
+    <label class="sr-only" for="issue-description">{{ __('Description') }}</label>
     <markdown-field
       :markdown-preview-path="markdownPreviewPath"
       :markdown-docs-path="markdownDocsPath"
@@ -55,8 +55,8 @@ export default {
         qa-description-textarea"
         dir="auto"
         data-supports-quick-actions="false"
-        aria-label="Description"
-        placeholder="Write a comment or drag your files here…"
+        :aria-label="__('Description')"
+        :placeholder="__('Write a comment or drag your files here…')"
         @keydown.meta.enter="updateIssuable"
         @keydown.ctrl.enter="updateIssuable"
       >

app/assets/javascripts/issue_show/components/fields/description_template.vue

@@ -56,22 +56,31 @@ export default {
       data-selected="null"
       data-toggle="dropdown"
     >
-      <span class="dropdown-toggle-text"> Choose a template </span>
+      <span class="dropdown-toggle-text">{{ __('Choose a template') }}</span>
       <i aria-hidden="true" class="fa fa-chevron-down"> </i>
     </button>
     <div class="dropdown-menu dropdown-select">
       <div class="dropdown-title">
         Choose a template
-        <button class="dropdown-title-button dropdown-menu-close" aria-label="Close" type="button">
+        <button
+          class="dropdown-title-button dropdown-menu-close"
+          :aria-label="__('Close')"
+          type="button"
+        >
           <i aria-hidden="true" class="fa fa-times dropdown-menu-close-icon"> </i>
         </button>
       </div>
       <div class="dropdown-input">
-        <input type="search" class="dropdown-input-field" placeholder="Filter" autocomplete="off" />
+        <input
+          type="search"
+          class="dropdown-input-field"
+          :placeholder="__('Filter')"
+          autocomplete="off"
+        />
         <i aria-hidden="true" class="fa fa-search dropdown-input-search"> </i>
         <i
           role="button"
-          aria-label="Clear templates search input"
+          :aria-label="__('Clear templates search input')"
           class="fa fa-times dropdown-input-clear js-dropdown-input-clear"
         >
         </i>
@@ -79,8 +88,12 @@ export default {
       <div class="dropdown-content"></div>
       <div class="dropdown-footer">
         <ul class="dropdown-footer-list">
-          <li><a class="no-template"> No template </a></li>
-          <li><a class="reset-template"> Reset template </a></li>
+          <li>
+            <a class="no-template">{{ __('No template') }}</a>
+          </li>
+          <li>
+            <a class="reset-template">{{ __('Reset template') }}</a>
+          </li>
         </ul>
       </div>
     </div>

app/assets/javascripts/issue_show/components/fields/title.vue

@@ -14,7 +14,7 @@ export default {
 
 <template>
   <fieldset>
-    <label class="sr-only" for="issuable-title"> Title </label>
+    <label class="sr-only" for="issuable-title">{{ __('Title') }}</label>
     <input
       id="issuable-title"
       ref="input"
@@ -22,8 +22,8 @@ export default {
       class="form-control qa-title-input"
       dir="auto"
       type="text"
-      placeholder="Title"
-      aria-label="Title"
+      :placeholder="__('Title')"
+      :aria-label="__('Title')"
       @keydown.meta.enter="updateIssuable"
       @keydown.ctrl.enter="updateIssuable"
     />

app/assets/javascripts/issue_show/components/locked_warning.vue

@@ -10,8 +10,9 @@ export default {
 
 <template>
   <div class="alert alert-danger">
-    Someone edited the issue at the same time you did. Please check out
-    <a :href="currentPath" target="_blank" rel="nofollow">the issue</a> and make sure your changes
-    will not unintentionally remove theirs.
+    {{ sprintf(__("Someone edited the issue at the same time you did. Please check out
+    %{linkStart}%the issue%{linkEnd} and make sure your changes will not unintentionally remove
+    theirs."), { linkStart: `<a href="${currentPath}" target="_blank" rel="nofollow">` linkEnd: '</a
+    >', }) }}
   </div>
 </template>

locale/gitlab.pot

@@ -2064,6 +2064,9 @@ msgstr ""
 msgid "Clear search input"
 msgstr ""
 
+msgid "Clear templates search input"
+msgstr ""
+
 msgid "Click any <strong>project name</strong> in the project list below to navigate to the project milestone."
 msgstr ""
 
@@ -6665,6 +6668,9 @@ msgstr ""
 msgid "No schedules"
 msgstr ""
 
+msgid "No template"
+msgstr ""
+
 msgid "No, directly import the existing email addresses and usernames."
 msgstr ""
 
@@ -8562,6 +8568,9 @@ msgstr ""
 msgid "Reset runners registration token"
 msgstr ""
 
+msgid "Reset template"
+msgstr ""
+
 msgid "Resolve all discussions in new issue"
 msgstr ""