Commit ff61f92c authored by Kushal Pandya's avatar Kushal Pandya

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

i18n JS files starting with l

See merge request gitlab-org/gitlab-ce!28065
parents e63b65cd 5066a484
...@@ -5,13 +5,14 @@ import Sortable from 'sortablejs'; ...@@ -5,13 +5,14 @@ import Sortable from 'sortablejs';
import flash from './flash'; import flash from './flash';
import axios from './lib/utils/axios_utils'; import axios from './lib/utils/axios_utils';
import { __ } from './locale';
export default class LabelManager { export default class LabelManager {
constructor({ togglePriorityButton, prioritizedLabels, otherLabels } = {}) { constructor({ togglePriorityButton, prioritizedLabels, otherLabels } = {}) {
this.togglePriorityButton = togglePriorityButton || $('.js-toggle-priority'); this.togglePriorityButton = togglePriorityButton || $('.js-toggle-priority');
this.prioritizedLabels = prioritizedLabels || $('.js-prioritized-labels'); this.prioritizedLabels = prioritizedLabels || $('.js-prioritized-labels');
this.otherLabels = otherLabels || $('.js-other-labels'); this.otherLabels = otherLabels || $('.js-other-labels');
this.errorMessage = 'Unable to update label prioritization at this time'; this.errorMessage = __('Unable to update label prioritization at this time');
this.emptyState = document.querySelector('#js-priority-labels-empty-state'); this.emptyState = document.querySelector('#js-priority-labels-empty-state');
this.$badgeItemTemplate = $('#js-badge-item-template'); this.$badgeItemTemplate = $('#js-badge-item-template');
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import $ from 'jquery'; import $ from 'jquery';
import _ from 'underscore'; import _ from 'underscore';
import { sprintf, __ } from './locale'; import { sprintf, s__, __ } from './locale';
import axios from './lib/utils/axios_utils'; import axios from './lib/utils/axios_utils';
import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; import IssuableBulkUpdateActions from './issuable_bulk_update_actions';
import CreateLabelDropdown from './create_label'; import CreateLabelDropdown from './create_label';
...@@ -178,7 +178,7 @@ export default class LabelsSelect { ...@@ -178,7 +178,7 @@ export default class LabelsSelect {
}); });
} }
} else { } else {
template = '<span class="no-value">None</span>'; template = `<span class="no-value">${__('None')}</span>`;
} }
$value.removeAttr('style').html(template); $value.removeAttr('style').html(template);
$sidebarCollapsedValue.text(labelCount); $sidebarCollapsedValue.text(labelCount);
...@@ -190,7 +190,9 @@ export default class LabelsSelect { ...@@ -190,7 +190,9 @@ export default class LabelsSelect {
if (labelTitles.length > 5) { if (labelTitles.length > 5) {
labelTitles = labelTitles.slice(0, 5); labelTitles = labelTitles.slice(0, 5);
labelTitles.push('and ' + (data.labels.length - 5) + ' more'); labelTitles.push(
sprintf(s__('Labels|and %{count} more'), { count: data.labels.length - 5 }),
);
} }
labelTooltipTitle = labelTitles.join(', '); labelTooltipTitle = labelTitles.join(', ');
...@@ -219,13 +221,13 @@ export default class LabelsSelect { ...@@ -219,13 +221,13 @@ export default class LabelsSelect {
if (showNo) { if (showNo) {
extraData.unshift({ extraData.unshift({
id: 0, id: 0,
title: 'No Label', title: __('No Label'),
}); });
} }
if (showAny) { if (showAny) {
extraData.unshift({ extraData.unshift({
isAny: true, isAny: true,
title: 'Any Label', title: __('Any Label'),
}); });
} }
if (extraData.length) { if (extraData.length) {
...@@ -341,7 +343,7 @@ export default class LabelsSelect { ...@@ -341,7 +343,7 @@ export default class LabelsSelect {
if (selected && selected.id === 0) { if (selected && selected.id === 0) {
this.selected = []; this.selected = [];
return 'No Label'; return __('No Label');
} else if (isSelected) { } else if (isSelected) {
this.selected.push(title); this.selected.push(title);
} else if (!isSelected && title) { } else if (!isSelected && title) {
...@@ -579,7 +581,7 @@ export default class LabelsSelect { ...@@ -579,7 +581,7 @@ export default class LabelsSelect {
if ($('.selected-issuable:checked').length) { if ($('.selected-issuable:checked').length) {
return; return;
} }
return $('.issues-bulk-update .labels-filter .dropdown-toggle-text').text('Label'); return $('.issues-bulk-update .labels-filter .dropdown-toggle-text').text(__('Label'));
} }
// eslint-disable-next-line class-methods-use-this // eslint-disable-next-line class-methods-use-this
enableBulkLabelDropdown() { enableBulkLabelDropdown() {
......
...@@ -976,6 +976,9 @@ msgstr "" ...@@ -976,6 +976,9 @@ msgstr ""
msgid "Any" msgid "Any"
msgstr "" msgstr ""
msgid "Any Label"
msgstr ""
msgid "Any Milestone" msgid "Any Milestone"
msgstr "" msgstr ""
...@@ -5543,6 +5546,9 @@ msgstr "" ...@@ -5543,6 +5546,9 @@ msgstr ""
msgid "Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}. Existing project labels with the same title will be merged. This action cannot be reversed." msgid "Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}. Existing project labels with the same title will be merged. This action cannot be reversed."
msgstr "" msgstr ""
msgid "Labels|and %{count} more"
msgstr ""
msgid "Language" msgid "Language"
msgstr "" msgstr ""
...@@ -6314,6 +6320,9 @@ msgstr "" ...@@ -6314,6 +6320,9 @@ msgstr ""
msgid "No %{providerTitle} repositories available to import" msgid "No %{providerTitle} repositories available to import"
msgstr "" msgstr ""
msgid "No Label"
msgstr ""
msgid "No Milestone" msgid "No Milestone"
msgstr "" msgstr ""
...@@ -10399,6 +10408,9 @@ msgstr "" ...@@ -10399,6 +10408,9 @@ msgstr ""
msgid "Unable to schedule a pipeline to run immediately" msgid "Unable to schedule a pipeline to run immediately"
msgstr "" msgstr ""
msgid "Unable to update label prioritization at this time"
msgstr ""
msgid "Unable to update this issue at this time." msgid "Unable to update this issue at this time."
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