Commit 3fc64f38 authored by Filipa Lacerda's avatar Filipa Lacerda

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

i18n JS files starting with s

See merge request gitlab-org/gitlab-ce!28169
parents 27f89b1e 29a47bfc
......@@ -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);
}
......
......@@ -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.')));
});
}
}
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();
......
......@@ -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 ""
......
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