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

Internationalisation of boards directory

See merge request gitlab-org/gitlab-ce!27672

5 files changed, 22 insertions, 5 deletions

diff --git a/app/assets/javascripts/boards/components/board_delete.js b/app/assets/javascripts/boards/components/board_delete.js
index a5f9d65e4d5..a06db359c94 100644
--- a/app/assets/javascripts/boards/components/board_delete.js
+++ b/app/assets/javascripts/boards/components/board_delete.js
@@ -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();
       }
     },
diff --git a/app/assets/javascripts/boards/components/board_sidebar.js b/app/assets/javascripts/boards/components/board_sidebar.js
index 915d1676e62..c587b276fa3 100644
--- a/app/assets/javascripts/boards/components/board_sidebar.js
+++ b/app/assets/javascripts/boards/components/board_sidebar.js
@@ -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;
diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js
index 009ae5dd331..4995a8d9367 100644
--- a/app/assets/javascripts/boards/index.js
+++ b/app/assets/javascripts/boards/index.js
@@ -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 '';
diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js
index a34222b6887..70861fbf2b3 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js
+++ b/app/assets/javascripts/boards/stores/boards_store.js
@@ -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,
     });
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 967606e44bf..7e2c2a160ef 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -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 ""