summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzekiel Kigbo <ekigbo@gitlab.com>2019-06-25 07:47:17 +0000
committerPhil Hughes <me@iamphill.com>2019-06-25 07:47:17 +0000
commit86d013885497684843103cd7b66f8a4fad8d9a18 (patch)
treeff11d173ae63a7939a4933a015cbeb32f4a459c3
parent058774ad2803654a77e515df8d85762fabca51fe (diff)
downloadgitlab-ce-86d013885497684843103cd7b66f8a4fad8d9a18.tar.gz
Vue-i18n: app/assets/javascripts/issue_show directory
i18n linting for .vue files under the app/assets/javascripts/issue_show directory
-rw-r--r--app/assets/javascripts/issue_show/components/edit_actions.vue4
-rw-r--r--app/assets/javascripts/issue_show/components/fields/description.vue6
-rw-r--r--app/assets/javascripts/issue_show/components/fields/description_template.vue25
-rw-r--r--app/assets/javascripts/issue_show/components/fields/title.vue6
-rw-r--r--app/assets/javascripts/issue_show/components/locked_warning.vue7
-rw-r--r--locale/gitlab.pot9
6 files changed, 41 insertions, 16 deletions
diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue
index 42a3de62772..b2f9296c68b 100644
--- a/app/assets/javascripts/issue_show/components/edit_actions.vue
+++ b/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 }"
diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue
index d27dd873125..447d7bf21a5 100644
--- a/app/assets/javascripts/issue_show/components/fields/description.vue
+++ b/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"
>
diff --git a/app/assets/javascripts/issue_show/components/fields/description_template.vue b/app/assets/javascripts/issue_show/components/fields/description_template.vue
index 14f0acf6540..6f955928d8e 100644
--- a/app/assets/javascripts/issue_show/components/fields/description_template.vue
+++ b/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>
diff --git a/app/assets/javascripts/issue_show/components/fields/title.vue b/app/assets/javascripts/issue_show/components/fields/title.vue
index ce4baf17d09..34eb0451d53 100644
--- a/app/assets/javascripts/issue_show/components/fields/title.vue
+++ b/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"
/>
diff --git a/app/assets/javascripts/issue_show/components/locked_warning.vue b/app/assets/javascripts/issue_show/components/locked_warning.vue
index 639221473b1..2f3e611e089 100644
--- a/app/assets/javascripts/issue_show/components/locked_warning.vue
+++ b/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>
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index cb732fb1ec6..64a06c95958 100644
--- a/locale/gitlab.pot
+++ b/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 ""