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

i18n JS files starting with s

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

4 files changed, 11 insertions, 4 deletions

diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js
index 0a4583b5861..e5c3cebfb9a 100644
--- a/app/assets/javascripts/search_autocomplete.js
+++ b/app/assets/javascripts/search_autocomplete.js
@@ -2,7 +2,7 @@
 
 import $ from 'jquery';
 import { escape, throttle } from 'underscore';
-import { s__, sprintf } from '~/locale';
+import { s__, __, sprintf } from '~/locale';
 import { getIdenticonBackgroundClass, getIdenticonTitle } from '~/helpers/avatar_helper';
 import axios from './lib/utils/axios_utils';
 import DropdownUtils from './filtered_search/dropdown_utils';
@@ -439,7 +439,7 @@ export class SearchAutocomplete {
 
   restoreMenu() {
     var html;
-    html = '<ul><li class="dropdown-menu-empty-item"><a>Loading...</a></li></ul>';
+    html = `<ul><li class="dropdown-menu-empty-item"><a>${__('Loading...')}</a></li></ul>`;
     return this.dropdownContent.html(html);
   }
 
diff --git a/app/assets/javascripts/star.js b/app/assets/javascripts/star.js
index 7404dfbf22a..70f89152f70 100644
--- a/app/assets/javascripts/star.js
+++ b/app/assets/javascripts/star.js
@@ -31,7 +31,7 @@ export default class Star {
             $this.prepend(spriteIcon('star', iconClasses));
           }
         })
-        .catch(() => Flash('Star toggle failed. Try again later.'));
+        .catch(() => Flash(__('Star toggle failed. Try again later.')));
     });
   }
 }
diff --git a/app/assets/javascripts/subscription_select.js b/app/assets/javascripts/subscription_select.js
index ebe1c6dd02d..7206bbd7109 100644
--- a/app/assets/javascripts/subscription_select.js
+++ b/app/assets/javascripts/subscription_select.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { __ } from './locale';
 
 export default function subscriptionSelect() {
   $('.js-subscription-event').each((i, element) => {
@@ -8,7 +9,7 @@ export default function subscriptionSelect() {
       selectable: true,
       fieldName,
       toggleLabel(selected, el, instance) {
-        let label = 'Subscription';
+        let label = __('Subscription');
         const $item = instance.dropdown.find('.is-active');
         if ($item.length) {
           label = $item.text();
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 64d70f235b7..6209530deab 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -9100,6 +9100,9 @@ msgstr ""
 msgid "Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging."
 msgstr ""
 
+msgid "Star toggle failed. Try again later."
+msgstr ""
+
 msgid "StarProject|Star"
 msgstr ""
 
@@ -9232,6 +9235,9 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
+msgid "Subscription"
+msgstr ""
+
 msgid "Subtracts"
 msgstr ""