summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-07-25 13:00:19 +0000
committerPhil Hughes <me@iamphill.com>2019-07-25 13:00:19 +0000
commit0674d1274bb53c3c075acf4adc10d9f65be3db32 (patch)
tree01021818a5c7dffb2f014696485f3bbaabc2b4e7
parent5ebb3d2b35157b3204780cd5926321e5caa639f4 (diff)
parentd3d4a1d968e149182019a064cca0ec45d9134522 (diff)
downloadgitlab-ce-0674d1274bb53c3c075acf4adc10d9f65be3db32.tar.gz
Merge branch '63457-additional-vue-autofixes' into 'master'
Vue-i18n: Autofix additional i18n lints for vue files See merge request gitlab-org/gitlab-ce!31125
-rw-r--r--app/assets/javascripts/boards/components/board_form.vue27
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/success_message.vue4
-rw-r--r--app/assets/javascripts/performance_bar/components/performance_bar_app.vue4
-rw-r--r--locale/gitlab.pot39
4 files changed, 59 insertions, 15 deletions
diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue
index 6754abf4019..ebf48cee2ae 100644
--- a/app/assets/javascripts/boards/components/board_form.vue
+++ b/app/assets/javascripts/boards/components/board_form.vue
@@ -1,4 +1,5 @@
<script>
+import { __ } from '~/locale';
import Flash from '~/flash';
import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
import { visitUrl } from '~/lib/utils/url_utility';
@@ -86,12 +87,12 @@ export default {
},
buttonText() {
if (this.isNewForm) {
- return 'Create board';
+ return __('Create board');
}
if (this.isDeleteForm) {
- return 'Delete';
+ return __('Delete');
}
- return 'Save changes';
+ return __('Save changes');
},
buttonKind() {
if (this.isNewForm) {
@@ -104,15 +105,15 @@ export default {
},
title() {
if (this.isNewForm) {
- return 'Create new board';
+ return __('Create new board');
}
if (this.isDeleteForm) {
- return 'Delete board';
+ return __('Delete board');
}
if (this.readonly) {
- return 'Board scope';
+ return __('Board scope');
}
- return 'Edit board';
+ return __('Edit board');
},
readonly() {
return !this.canAdminBoard;
@@ -138,7 +139,7 @@ export default {
visitUrl(boardsStore.rootPath);
})
.catch(() => {
- Flash('Failed to delete board. Please try again.');
+ Flash(__('Failed to delete board. Please try again.'));
this.isLoading = false;
});
} else {
@@ -149,7 +150,7 @@ export default {
visitUrl(data.board_path);
})
.catch(() => {
- Flash('Unable to save your changes. Please try again.');
+ Flash(__('Unable to save your changes. Please try again.'));
this.isLoading = false;
});
}
@@ -182,17 +183,19 @@ export default {
@submit="submit"
>
<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>
<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
id="board-new-name"
ref="name"
v-model="board.name"
class="form-control"
type="text"
- placeholder="Enter board name"
+ :placeholder="__('Enter board name')"
@keyup.enter="submit"
/>
</div>
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue b/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue
index b1d5de8682d..137f8bb18c7 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue
@@ -10,7 +10,9 @@ export default {
<template>
<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" :alt="s__('IDE|Successful commit')" />
+ </div>
<div class="append-right-default prepend-left-default">
<div class="text-content text-center">
<h4>{{ __('All changes are committed') }}</h4>
diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
index f05db8376a4..73c9c60765a 100644
--- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
+++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
@@ -43,13 +43,13 @@ export default {
},
{
metric: 'rugged',
- header: 'Rugged calls',
+ header: s__('PerformanceBar|Rugged calls'),
details: 'details',
keys: ['feature', 'args'],
},
{
metric: 'redis',
- header: 'Redis calls',
+ header: s__('PerformanceBar|Redis calls'),
details: 'details',
keys: ['cmd'],
},
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index cbab027d4a3..996f082f197 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1239,6 +1239,9 @@ msgstr ""
msgid "Are you sure you want to delete this %{typeOfComment}?"
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."
msgstr ""
@@ -1636,6 +1639,12 @@ msgstr ""
msgid "Blog"
msgstr ""
+msgid "Board name"
+msgstr ""
+
+msgid "Board scope"
+msgstr ""
+
msgid "BoardBlankState|Add default lists"
msgstr ""
@@ -3228,6 +3237,9 @@ msgstr ""
msgid "Create a personal access token on your account to pull or push via %{protocol}."
msgstr ""
+msgid "Create board"
+msgstr ""
+
msgid "Create branch"
msgstr ""
@@ -3267,6 +3279,9 @@ msgstr ""
msgid "Create milestone"
msgstr ""
+msgid "Create new board"
+msgstr ""
+
msgid "Create new branch"
msgstr ""
@@ -3495,6 +3510,9 @@ msgstr ""
msgid "Delete Snippet"
msgstr ""
+msgid "Delete board"
+msgstr ""
+
msgid "Delete comment"
msgstr ""
@@ -3887,6 +3905,9 @@ msgstr ""
msgid "Edit application"
msgstr ""
+msgid "Edit board"
+msgstr ""
+
msgid "Edit comment"
msgstr ""
@@ -4067,6 +4088,9 @@ msgstr ""
msgid "Enter at least three characters to search"
msgstr ""
+msgid "Enter board name"
+msgstr ""
+
msgid "Enter in your Bitbucket Server URL and personal access token below"
msgstr ""
@@ -4583,6 +4607,9 @@ msgstr ""
msgid "Failed to create resources"
msgstr ""
+msgid "Failed to delete board. Please try again."
+msgstr ""
+
msgid "Failed to deploy to"
msgstr ""
@@ -5382,6 +5409,9 @@ msgstr ""
msgid "IDE|Review"
msgstr ""
+msgid "IDE|Successful commit"
+msgstr ""
+
msgid "IP Address"
msgstr ""
@@ -7409,6 +7439,12 @@ msgstr ""
msgid "PerformanceBar|Gitaly calls"
msgstr ""
+msgid "PerformanceBar|Redis calls"
+msgstr ""
+
+msgid "PerformanceBar|Rugged calls"
+msgstr ""
+
msgid "PerformanceBar|SQL queries"
msgstr ""
@@ -11588,6 +11624,9 @@ msgstr ""
msgid "Unable to resolve"
msgstr ""
+msgid "Unable to save your changes. Please try again."
+msgstr ""
+
msgid "Unable to schedule a pipeline to run immediately"
msgstr ""