Commit 0aca6d56 authored by Clement Ho's avatar Clement Ho

Merge branch 'js-i18n-board' into 'master'

Internationalisation of boards directory

See merge request gitlab-org/gitlab-ce!27672
parents 0f919c1a 359bf846
import $ from 'jquery'; import $ from 'jquery';
import Vue from 'vue'; import Vue from 'vue';
import { __ } from '~/locale';
export default Vue.extend({ export default Vue.extend({
props: { props: {
...@@ -13,7 +14,7 @@ export default Vue.extend({ ...@@ -13,7 +14,7 @@ export default Vue.extend({
$(this.$el).tooltip('hide'); $(this.$el).tooltip('hide');
// eslint-disable-next-line no-alert // eslint-disable-next-line no-alert
if (window.confirm('Are you sure you want to delete this list?')) { if (window.confirm(__('Are you sure you want to delete this list?'))) {
this.list.destroy(); this.list.destroy();
} }
}, },
......
...@@ -45,7 +45,7 @@ export default Vue.extend({ ...@@ -45,7 +45,7 @@ export default Vue.extend({
return Object.keys(this.issue).length; return Object.keys(this.issue).length;
}, },
milestoneTitle() { milestoneTitle() {
return this.issue.milestone ? this.issue.milestone.title : 'No Milestone'; return this.issue.milestone ? this.issue.milestone.title : __('No Milestone');
}, },
canRemove() { canRemove() {
return !this.list.preset; return !this.list.preset;
......
...@@ -123,7 +123,7 @@ export default () => { ...@@ -123,7 +123,7 @@ export default () => {
this.loading = false; this.loading = false;
}) })
.catch(() => { .catch(() => {
Flash('An error occurred while fetching the board lists. Please try again.'); Flash(__('An error occurred while fetching the board lists. Please try again.'));
}); });
}, },
methods: { methods: {
...@@ -223,7 +223,7 @@ export default () => { ...@@ -223,7 +223,7 @@ export default () => {
}, },
tooltipTitle() { tooltipTitle() {
if (this.disabled) { if (this.disabled) {
return 'Please add a list to your board first'; return __('Please add a list to your board first');
} }
return ''; return '';
......
...@@ -7,6 +7,7 @@ import Vue from 'vue'; ...@@ -7,6 +7,7 @@ import Vue from 'vue';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import BoardsStoreEE from 'ee_else_ce/boards/stores/boards_store_ee'; import BoardsStoreEE from 'ee_else_ce/boards/stores/boards_store_ee';
import { getUrlParamsArray, parseBoolean } from '~/lib/utils/common_utils'; import { getUrlParamsArray, parseBoolean } from '~/lib/utils/common_utils';
import { __ } from '~/locale';
const boardsStore = { const boardsStore = {
disabled: false, disabled: false,
...@@ -78,7 +79,7 @@ const boardsStore = { ...@@ -78,7 +79,7 @@ const boardsStore = {
this.addList({ this.addList({
id: 'blank', id: 'blank',
list_type: 'blank', list_type: 'blank',
title: 'Welcome to your Issue Board!', title: __('Welcome to your Issue Board!'),
position: 0, position: 0,
}); });
......
...@@ -822,6 +822,9 @@ msgstr "" ...@@ -822,6 +822,9 @@ msgstr ""
msgid "An error occurred while fetching stages." msgid "An error occurred while fetching stages."
msgstr "" msgstr ""
msgid "An error occurred while fetching the board lists. Please try again."
msgstr ""
msgid "An error occurred while fetching the job log." msgid "An error occurred while fetching the job log."
msgstr "" msgstr ""
...@@ -999,6 +1002,9 @@ msgstr "" ...@@ -999,6 +1002,9 @@ msgstr ""
msgid "Are you sure that you want to unarchive this project?" msgid "Are you sure that you want to unarchive this project?"
msgstr "" msgstr ""
msgid "Are you sure you want to delete this list?"
msgstr ""
msgid "Are you sure you want to delete this pipeline schedule?" msgid "Are you sure you want to delete this pipeline schedule?"
msgstr "" msgstr ""
...@@ -6020,6 +6026,9 @@ msgstr "" ...@@ -6020,6 +6026,9 @@ msgstr ""
msgid "No %{providerTitle} repositories available to import" msgid "No %{providerTitle} repositories available to import"
msgstr "" msgstr ""
msgid "No Milestone"
msgstr ""
msgid "No Tag" msgid "No Tag"
msgstr "" msgstr ""
...@@ -6676,6 +6685,9 @@ msgstr "" ...@@ -6676,6 +6685,9 @@ msgstr ""
msgid "Please accept the Terms of Service before continuing." msgid "Please accept the Terms of Service before continuing."
msgstr "" msgstr ""
msgid "Please add a list to your board first"
msgstr ""
msgid "Please choose a group URL with no special characters." msgid "Please choose a group URL with no special characters."
msgstr "" msgstr ""
...@@ -10399,6 +10411,9 @@ msgstr "" ...@@ -10399,6 +10411,9 @@ msgstr ""
msgid "Webhooks Help" msgid "Webhooks Help"
msgstr "" msgstr ""
msgid "Welcome to your Issue Board!"
msgstr ""
msgid "When a runner is locked, it cannot be assigned to other projects" msgid "When a runner is locked, it cannot be assigned to other projects"
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