kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Internationalisation of boards directory

See merge request gitlab-org/gitlab-ce!27672
This commit is contained in:
Clement Ho 2019-05-01 15:02:07 +00:00
commit 0aca6d56ca
5 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/boards/components/board_delete.js
View file

@ -1,5 +1,6 @@
import $ from 'jquery';
import Vue from 'vue';
import { __ } from '~/locale';
export default Vue.extend({
props: {
@ -13,7 +14,7 @@ export default Vue.extend({
$(this.$el).tooltip('hide');
// 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();
}
},

2
app/assets/javascripts/boards/components/board_sidebar.js
View file

@ -45,7 +45,7 @@ export default Vue.extend({
return Object.keys(this.issue).length;
},
milestoneTitle() {
return this.issue.milestone ? this.issue.milestone.title : 'No Milestone';
return this.issue.milestone ? this.issue.milestone.title : __('No Milestone');
},
canRemove() {
return !this.list.preset;

4
app/assets/javascripts/boards/index.js
View file

@ -123,7 +123,7 @@ export default () => {
this.loading = false;
})
.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: {
@ -223,7 +223,7 @@ export default () => {
},
tooltipTitle() {
if (this.disabled) {
return 'Please add a list to your board first';
return __('Please add a list to your board first');
}
return '';

3
app/assets/javascripts/boards/stores/boards_store.js
View file

@ -7,6 +7,7 @@ import Vue from 'vue';
import Cookies from 'js-cookie';
import BoardsStoreEE from 'ee_else_ce/boards/stores/boards_store_ee';
import { getUrlParamsArray, parseBoolean } from '~/lib/utils/common_utils';
import { __ } from '~/locale';
const boardsStore = {
disabled: false,
@ -78,7 +79,7 @@ const boardsStore = {
this.addList({
id: 'blank',
list_type: 'blank',
title: 'Welcome to your Issue Board!',
title: __('Welcome to your Issue Board!'),
position: 0,
});

15
locale/gitlab.pot
View file

@ -822,6 +822,9 @@ msgstr ""
msgid "An error occurred while fetching stages."
msgstr ""
msgid "An error occurred while fetching the board lists. Please try again."
msgstr ""
msgid "An error occurred while fetching the job log."
msgstr ""
@ -999,6 +1002,9 @@ msgstr ""
msgid "Are you sure that you want to unarchive this project?"
msgstr ""
msgid "Are you sure you want to delete this list?"
msgstr ""
msgid "Are you sure you want to delete this pipeline schedule?"
msgstr ""
@ -6020,6 +6026,9 @@ msgstr ""
msgid "No %{providerTitle} repositories available to import"
msgstr ""
msgid "No Milestone"
msgstr ""
msgid "No Tag"
msgstr ""
@ -6676,6 +6685,9 @@ msgstr ""
msgid "Please accept the Terms of Service before continuing."
msgstr ""
msgid "Please add a list to your board first"
msgstr ""
msgid "Please choose a group URL with no special characters."
msgstr ""
@ -10399,6 +10411,9 @@ msgstr ""
msgid "Webhooks Help"
msgstr ""
msgid "Welcome to your Issue Board!"
msgstr ""
msgid "When a runner is locked, it cannot be assigned to other projects"
msgstr ""