Merge branch 'js-i18n-g-files' into 'master'

i18n of JS files starting with g

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

4 files changed, 11 insertions, 3 deletions

diff --git a/app/assets/javascripts/gl_field_error.js b/app/assets/javascripts/gl_field_error.js
index a5b8c357e8a..04301c9ce12 100644
--- a/app/assets/javascripts/gl_field_error.js
+++ b/app/assets/javascripts/gl_field_error.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { __ } from '~/locale';
 
 /**
  * This class overrides the browser's validation error bubbles, displaying custom
@@ -61,7 +62,7 @@ export default class GlFieldError {
     this.inputElement = $(input);
     this.inputDomElement = this.inputElement.get(0);
     this.form = formErrors;
-    this.errorMessage = this.inputElement.attr('title') || 'This field is required.';
+    this.errorMessage = this.inputElement.attr('title') || __('This field is required.');
     this.fieldErrorElement = $(`<p class='${errorMessageClass} hidden'>${this.errorMessage}</p>`);
 
     this.state = {
diff --git a/app/assets/javascripts/gpg_badges.js b/app/assets/javascripts/gpg_badges.js
index efba6fc1aff..96051b612b5 100644
--- a/app/assets/javascripts/gpg_badges.js
+++ b/app/assets/javascripts/gpg_badges.js
@@ -20,7 +20,7 @@ export default class GpgBadges {
     const endpoint = tag.data('signaturesPath');
     if (!endpoint) {
       displayError();
-      return Promise.reject(new Error('Missing commit signatures endpoint!'));
+      return Promise.reject(new Error(__('Missing commit signatures endpoint!')));
     }
 
     const params = parseQueryStringIntoObject(tag.serialize());
diff --git a/app/assets/javascripts/groups_select.js b/app/assets/javascripts/groups_select.js
index bdadbb1bb2a..a1263d1cdab 100644
--- a/app/assets/javascripts/groups_select.js
+++ b/app/assets/javascripts/groups_select.js
@@ -2,6 +2,7 @@ import $ from 'jquery';
 import axios from './lib/utils/axios_utils';
 import Api from './api';
 import { normalizeHeaders } from './lib/utils/common_utils';
+import { __ } from '~/locale';
 
 export default function groupsSelect() {
   import(/* webpackChunkName: 'select2' */ 'select2/select2')
@@ -18,7 +19,7 @@ export default function groupsSelect() {
           : Api.groupsPath;
 
         $select.select2({
-          placeholder: 'Search for a group',
+          placeholder: __('Search for a group'),
           allowClear: $select.hasClass('allowClear'),
           multiple: $select.hasClass('multiselect'),
           minimumInputLength: 0,
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5800aa9604b..b7aea0254a9 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6058,6 +6058,9 @@ msgstr ""
 msgid "Mirroring settings were successfully updated."
 msgstr ""
 
+msgid "Missing commit signatures endpoint!"
+msgstr ""
+
 msgid "MissingSSHKeyWarningLink|add an SSH key"
 msgstr ""
 
@@ -8376,6 +8379,9 @@ msgstr ""
 msgid "Search files"
 msgstr ""
 
+msgid "Search for a group"
+msgstr ""
+
 msgid "Search for projects, issues, etc."
 msgstr ""