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

i18n JS files starting with i

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

4 files changed, 16 insertions, 9 deletions

diff --git a/app/assets/javascripts/issuable_bulk_update_actions.js b/app/assets/javascripts/issuable_bulk_update_actions.js
index ccbe591a63e..bc9d7fcf30d 100644
--- a/app/assets/javascripts/issuable_bulk_update_actions.js
+++ b/app/assets/javascripts/issuable_bulk_update_actions.js
@@ -4,6 +4,7 @@ import $ from 'jquery';
 import _ from 'underscore';
 import axios from './lib/utils/axios_utils';
 import Flash from './flash';
+import { __ } from './locale';
 
 export default {
   init({ container, form, issues, prefixId } = {}) {
@@ -32,7 +33,7 @@ export default {
 
   onFormSubmitFailure() {
     this.form.find('[type="submit"]').enable();
-    return new Flash('Issue update failed');
+    return new Flash(__('Issue update failed'));
   },
 
   getSelectedIssues() {
diff --git a/app/assets/javascripts/issuable_index.js b/app/assets/javascripts/issuable_index.js
index ffcbd7cf28c..f51c7a2f990 100644
--- a/app/assets/javascripts/issuable_index.js
+++ b/app/assets/javascripts/issuable_index.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 import axios from './lib/utils/axios_utils';
 import flash from './flash';
-import { __ } from './locale';
+import { s__, __ } from './locale';
 import IssuableBulkUpdateSidebar from './issuable_bulk_update_sidebar';
 import IssuableBulkUpdateActions from './issuable_bulk_update_actions';
 
@@ -29,7 +29,7 @@ export default class IssuableIndex {
     $resetToken.on('click', e => {
       e.preventDefault();
 
-      $resetToken.text('resetting...');
+      $resetToken.text(s__('EmailToken|resetting...'));
 
       axios
         .put($resetToken.attr('href'))
@@ -38,12 +38,12 @@ export default class IssuableIndex {
             .val(data.new_address)
             .focus();
 
-          $resetToken.text('reset it');
+          $resetToken.text(s__('EmailToken|reset it'));
         })
         .catch(() => {
           flash(__('There was an error when reseting email token.'));
 
-          $resetToken.text('reset it');
+          $resetToken.text(s__('EmailToken|reset it'));
         });
     });
   }
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js
index cd1afb6ba83..db4607ca58d 100644
--- a/app/assets/javascripts/issue.js
+++ b/app/assets/javascripts/issue.js
@@ -7,6 +7,7 @@ import flash from './flash';
 import TaskList from './task_list';
 import CreateMergeRequestDropdown from './create_merge_request_dropdown';
 import IssuablesHelper from './helpers/issuables_helper';
+import { __ } from './locale';
 
 export default class Issue {
   constructor() {
@@ -44,7 +45,11 @@ export default class Issue {
    * @param {Array} data
    * @param {String} issueFailMessage
    */
-  updateTopState(isClosed, data, issueFailMessage = 'Unable to update this issue at this time.') {
+  updateTopState(
+    isClosed,
+    data,
+    issueFailMessage = __('Unable to update this issue at this time.'),
+  ) {
     if ('id' in data) {
       const isClosedBadge = $('div.status-box-issue-closed');
       const isOpenBadge = $('div.status-box-open');
@@ -81,7 +86,7 @@ export default class Issue {
   }
 
   initIssueBtnEventListeners() {
-    const issueFailMessage = 'Unable to update this issue at this time.';
+    const issueFailMessage = __('Unable to update this issue at this time.');
 
     return $(document).on(
       'click',
@@ -152,6 +157,6 @@ export default class Issue {
           $container.html(data.html);
         }
       })
-      .catch(() => flash('Failed to load related branches'));
+      .catch(() => flash(__('Failed to load related branches')));
   }
 }
diff --git a/app/assets/javascripts/issue_status_select.js b/app/assets/javascripts/issue_status_select.js
index c14803c80e7..75edff41a89 100644
--- a/app/assets/javascripts/issue_status_select.js
+++ b/app/assets/javascripts/issue_status_select.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { __ } from './locale';
 
 export default function issueStatusSelect() {
   $('.js-issue-status').each((i, el) => {
@@ -7,7 +8,7 @@ export default function issueStatusSelect() {
       selectable: true,
       fieldName,
       toggleLabel(selected, element, instance) {
-        let label = 'Author';
+        let label = __('Author');
         const $item = instance.dropdown.find('.is-active');
         if ($item.length) {
           label = $item.text();