Commit d0857d44 authored by Fatih Acet's avatar Fatih Acet

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

i18n of JS files starting with g

See merge request gitlab-org/gitlab-ce!28009
parents 409e3588 0b38e0a2
import $ from 'jquery'; import $ from 'jquery';
import { __ } from '~/locale';
/** /**
* This class overrides the browser's validation error bubbles, displaying custom * This class overrides the browser's validation error bubbles, displaying custom
...@@ -61,7 +62,7 @@ export default class GlFieldError { ...@@ -61,7 +62,7 @@ export default class GlFieldError {
this.inputElement = $(input); this.inputElement = $(input);
this.inputDomElement = this.inputElement.get(0); this.inputDomElement = this.inputElement.get(0);
this.form = formErrors; 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.fieldErrorElement = $(`<p class='${errorMessageClass} hidden'>${this.errorMessage}</p>`);
this.state = { this.state = {
......
...@@ -20,7 +20,7 @@ export default class GpgBadges { ...@@ -20,7 +20,7 @@ export default class GpgBadges {
const endpoint = tag.data('signaturesPath'); const endpoint = tag.data('signaturesPath');
if (!endpoint) { if (!endpoint) {
displayError(); displayError();
return Promise.reject(new Error('Missing commit signatures endpoint!')); return Promise.reject(new Error(__('Missing commit signatures endpoint!')));
} }
const params = parseQueryStringIntoObject(tag.serialize()); const params = parseQueryStringIntoObject(tag.serialize());
......
...@@ -2,6 +2,7 @@ import $ from 'jquery'; ...@@ -2,6 +2,7 @@ import $ from 'jquery';
import axios from './lib/utils/axios_utils'; import axios from './lib/utils/axios_utils';
import Api from './api'; import Api from './api';
import { normalizeHeaders } from './lib/utils/common_utils'; import { normalizeHeaders } from './lib/utils/common_utils';
import { __ } from '~/locale';
export default function groupsSelect() { export default function groupsSelect() {
import(/* webpackChunkName: 'select2' */ 'select2/select2') import(/* webpackChunkName: 'select2' */ 'select2/select2')
...@@ -18,7 +19,7 @@ export default function groupsSelect() { ...@@ -18,7 +19,7 @@ export default function groupsSelect() {
: Api.groupsPath; : Api.groupsPath;
$select.select2({ $select.select2({
placeholder: 'Search for a group', placeholder: __('Search for a group'),
allowClear: $select.hasClass('allowClear'), allowClear: $select.hasClass('allowClear'),
multiple: $select.hasClass('multiselect'), multiple: $select.hasClass('multiselect'),
minimumInputLength: 0, minimumInputLength: 0,
......
...@@ -6058,6 +6058,9 @@ msgstr "" ...@@ -6058,6 +6058,9 @@ msgstr ""
msgid "Mirroring settings were successfully updated." msgid "Mirroring settings were successfully updated."
msgstr "" msgstr ""
msgid "Missing commit signatures endpoint!"
msgstr ""
msgid "MissingSSHKeyWarningLink|add an SSH key" msgid "MissingSSHKeyWarningLink|add an SSH key"
msgstr "" msgstr ""
...@@ -8376,6 +8379,9 @@ msgstr "" ...@@ -8376,6 +8379,9 @@ msgstr ""
msgid "Search files" msgid "Search files"
msgstr "" msgstr ""
msgid "Search for a group"
msgstr ""
msgid "Search for projects, issues, etc." msgid "Search for projects, issues, etc."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment