Commit 65fd517c authored by Phil Hughes's avatar Phil Hughes

Merge branch '63457-additional-vue-autofixes-ee' into 'master'

Autofix i18n lints for vue files

See merge request gitlab-org/gitlab-ee!14837
parents 8cdf2451 5debfdd5
<script> <script>
import { __ } from '~/locale';
import Flash from '~/flash'; import Flash from '~/flash';
import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue'; import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
import { visitUrl } from '~/lib/utils/url_utility'; import { visitUrl } from '~/lib/utils/url_utility';
...@@ -86,12 +87,12 @@ export default { ...@@ -86,12 +87,12 @@ export default {
}, },
buttonText() { buttonText() {
if (this.isNewForm) { if (this.isNewForm) {
return 'Create board'; return __('Create board');
} }
if (this.isDeleteForm) { if (this.isDeleteForm) {
return 'Delete'; return __('Delete');
} }
return 'Save changes'; return __('Save changes');
}, },
buttonKind() { buttonKind() {
if (this.isNewForm) { if (this.isNewForm) {
...@@ -104,15 +105,15 @@ export default { ...@@ -104,15 +105,15 @@ export default {
}, },
title() { title() {
if (this.isNewForm) { if (this.isNewForm) {
return 'Create new board'; return __('Create new board');
} }
if (this.isDeleteForm) { if (this.isDeleteForm) {
return 'Delete board'; return __('Delete board');
} }
if (this.readonly) { if (this.readonly) {
return 'Board scope'; return __('Board scope');
} }
return 'Edit board'; return __('Edit board');
}, },
readonly() { readonly() {
return !this.canAdminBoard; return !this.canAdminBoard;
...@@ -138,7 +139,7 @@ export default { ...@@ -138,7 +139,7 @@ export default {
visitUrl(boardsStore.rootPath); visitUrl(boardsStore.rootPath);
}) })
.catch(() => { .catch(() => {
Flash('Failed to delete board. Please try again.'); Flash(__('Failed to delete board. Please try again.'));
this.isLoading = false; this.isLoading = false;
}); });
} else { } else {
...@@ -149,7 +150,7 @@ export default { ...@@ -149,7 +150,7 @@ export default {
visitUrl(data.board_path); visitUrl(data.board_path);
}) })
.catch(() => { .catch(() => {
Flash('Unable to save your changes. Please try again.'); Flash(__('Unable to save your changes. Please try again.'));
this.isLoading = false; this.isLoading = false;
}); });
} }
...@@ -182,17 +183,19 @@ export default { ...@@ -182,17 +183,19 @@ export default {
@submit="submit" @submit="submit"
> >
<template slot="body"> <template slot="body">
<p v-if="isDeleteForm">Are you sure you want to delete this board?</p> <p v-if="isDeleteForm">{{ __('Are you sure you want to delete this board?') }}</p>
<form v-else class="js-board-config-modal" @submit.prevent> <form v-else class="js-board-config-modal" @submit.prevent>
<div v-if="!readonly" class="append-bottom-20"> <div v-if="!readonly" class="append-bottom-20">
<label class="form-section-title label-bold" for="board-new-name"> Board name </label> <label class="form-section-title label-bold" for="board-new-name">{{
__('Board name')
}}</label>
<input <input
id="board-new-name" id="board-new-name"
ref="name" ref="name"
v-model="board.name" v-model="board.name"
class="form-control" class="form-control"
type="text" type="text"
placeholder="Enter board name" :placeholder="__('Enter board name')"
@keyup.enter="submit" @keyup.enter="submit"
/> />
</div> </div>
......
...@@ -10,7 +10,7 @@ export default { ...@@ -10,7 +10,7 @@ export default {
<template> <template>
<div class="multi-file-commit-panel-success-message" aria-live="assertive"> <div class="multi-file-commit-panel-success-message" aria-live="assertive">
<div class="svg-content svg-80"><img :src="committedStateSvgPath" alt="" /></div> <div class="svg-content svg-80"><img :src="committedStateSvgPath" /></div>
<div class="append-right-default prepend-left-default"> <div class="append-right-default prepend-left-default">
<div class="text-content text-center"> <div class="text-content text-center">
<h4>{{ __('All changes are committed') }}</h4> <h4>{{ __('All changes are committed') }}</h4>
......
...@@ -43,13 +43,13 @@ export default { ...@@ -43,13 +43,13 @@ export default {
}, },
{ {
metric: 'rugged', metric: 'rugged',
header: 'Rugged calls', header: s__('PerformanceBar|Rugged calls'),
details: 'details', details: 'details',
keys: ['feature', 'args'], keys: ['feature', 'args'],
}, },
{ {
metric: 'redis', metric: 'redis',
header: 'Redis calls', header: s__('PerformanceBar|Redis calls'),
details: 'details', details: 'details',
keys: ['cmd'], keys: ['cmd'],
}, },
......
...@@ -1614,6 +1614,9 @@ msgstr "" ...@@ -1614,6 +1614,9 @@ msgstr ""
msgid "Are you sure you want to delete this %{typeOfComment}?" msgid "Are you sure you want to delete this %{typeOfComment}?"
msgstr "" msgstr ""
msgid "Are you sure you want to delete this board?"
msgstr ""
msgid "Are you sure you want to delete this device? This action cannot be undone." msgid "Are you sure you want to delete this device? This action cannot be undone."
msgstr "" msgstr ""
...@@ -2144,6 +2147,12 @@ msgstr "" ...@@ -2144,6 +2147,12 @@ msgstr ""
msgid "Blue helpers indicate an action to be taken." msgid "Blue helpers indicate an action to be taken."
msgstr "" msgstr ""
msgid "Board name"
msgstr ""
msgid "Board scope"
msgstr ""
msgid "BoardBlankState|Add default lists" msgid "BoardBlankState|Add default lists"
msgstr "" msgstr ""
...@@ -3949,6 +3958,9 @@ msgstr "" ...@@ -3949,6 +3958,9 @@ msgstr ""
msgid "Create an issue. Issues are created for each alert triggered." msgid "Create an issue. Issues are created for each alert triggered."
msgstr "" msgstr ""
msgid "Create board"
msgstr ""
msgid "Create branch" msgid "Create branch"
msgstr "" msgstr ""
...@@ -3991,6 +4003,9 @@ msgstr "" ...@@ -3991,6 +4003,9 @@ msgstr ""
msgid "Create milestone" msgid "Create milestone"
msgstr "" msgstr ""
msgid "Create new board"
msgstr ""
msgid "Create new branch" msgid "Create new branch"
msgstr "" msgstr ""
...@@ -4273,6 +4288,9 @@ msgstr "" ...@@ -4273,6 +4288,9 @@ msgstr ""
msgid "Delete Snippet" msgid "Delete Snippet"
msgstr "" msgstr ""
msgid "Delete board"
msgstr ""
msgid "Delete comment" msgid "Delete comment"
msgstr "" msgstr ""
...@@ -4834,6 +4852,9 @@ msgstr "" ...@@ -4834,6 +4852,9 @@ msgstr ""
msgid "Edit application" msgid "Edit application"
msgstr "" msgstr ""
msgid "Edit board"
msgstr ""
msgid "Edit comment" msgid "Edit comment"
msgstr "" msgstr ""
...@@ -5059,6 +5080,9 @@ msgstr "" ...@@ -5059,6 +5080,9 @@ msgstr ""
msgid "Enter at least three characters to search" msgid "Enter at least three characters to search"
msgstr "" msgstr ""
msgid "Enter board name"
msgstr ""
msgid "Enter in your Bitbucket Server URL and personal access token below" msgid "Enter in your Bitbucket Server URL and personal access token below"
msgstr "" msgstr ""
...@@ -5701,6 +5725,9 @@ msgstr "" ...@@ -5701,6 +5725,9 @@ msgstr ""
msgid "Failed to create resources" msgid "Failed to create resources"
msgstr "" msgstr ""
msgid "Failed to delete board. Please try again."
msgstr ""
msgid "Failed to deploy to" msgid "Failed to deploy to"
msgstr "" msgstr ""
...@@ -9837,6 +9864,12 @@ msgstr "" ...@@ -9837,6 +9864,12 @@ msgstr ""
msgid "PerformanceBar|Gitaly calls" msgid "PerformanceBar|Gitaly calls"
msgstr "" msgstr ""
msgid "PerformanceBar|Redis calls"
msgstr ""
msgid "PerformanceBar|Rugged calls"
msgstr ""
msgid "PerformanceBar|SQL queries" msgid "PerformanceBar|SQL queries"
msgstr "" msgstr ""
...@@ -15016,6 +15049,9 @@ msgstr "" ...@@ -15016,6 +15049,9 @@ msgstr ""
msgid "Unable to resolve" msgid "Unable to resolve"
msgstr "" msgstr ""
msgid "Unable to save your changes. Please try again."
msgstr ""
msgid "Unable to schedule a pipeline to run immediately" msgid "Unable to schedule a pipeline to run immediately"
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