kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '50063-add-missing-i18n-strings-to-issue-boards' into 'master'

Browse source 
Resolve "Add missing i18n strings to issue boards."

Closes #50063

See merge request gitlab-org/gitlab-ce!21081
This commit is contained in:
Mike Greiling 2018-08-10 19:53:57 +00:00
commit 3cd61fea03
4 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/boards/components/board_sidebar.js
View file

@ -3,7 +3,7 @@
import $ from 'jquery'; import $ from 'jquery';
import Vue from 'vue'; import Vue from 'vue';
import Flash from '../../flash'; import Flash from '../../flash';
import { __ } from '../../locale'; import { sprintf, __ } from '../../locale';
import Sidebar from '../../right_sidebar'; import Sidebar from '../../right_sidebar';
import eventHub from '../../sidebar/event_hub'; import eventHub from '../../sidebar/event_hub';
import AssigneeTitle from '../../sidebar/components/assignees/assignee_title.vue'; import AssigneeTitle from '../../sidebar/components/assignees/assignee_title.vue';
@ -55,8 +55,10 @@ gl.issueBoards.BoardSidebar = Vue.extend({
return this.issue.labels && this.issue.labels.length; return this.issue.labels && this.issue.labels.length;
}, },
labelDropdownTitle() { labelDropdownTitle() {
return this.hasLabels ? return this.hasLabels ? sprintf(__('%{firstLabel} +%{labelCount} more'), {
`${this.issue.labels[0].title} ${this.issue.labels.length - 1}+ more` : 'Label'; firstLabel: this.issue.labels[0].title,
labelCount: this.issue.labels.length - 1
}) : __('Label');
}, },
selectedLabels() { selectedLabels() {
return this.hasLabels ? this.issue.labels.map(l => l.title).join(',') : ''; return this.hasLabels ? this.issue.labels.map(l => l.title).join(',') : '';

9
app/assets/javascripts/labels_select.js
View file

@ -4,7 +4,7 @@
import $ from 'jquery'; import $ from 'jquery';
import _ from 'underscore'; import _ from 'underscore';
import { __ } from './locale'; import { sprintf, __ } 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 DropdownUtils from './filtered_search/dropdown_utils'; import DropdownUtils from './filtered_search/dropdown_utils';
@ -39,7 +39,7 @@ export default class LabelsSelect {
showNo = $dropdown.data('showNo'); showNo = $dropdown.data('showNo');
showAny = $dropdown.data('showAny'); showAny = $dropdown.data('showAny');
showMenuAbove = $dropdown.data('showMenuAbove'); showMenuAbove = $dropdown.data('showMenuAbove');
defaultLabel = $dropdown.data('defaultLabel') || 'Label'; defaultLabel = $dropdown.data('defaultLabel') || __('Label');
abilityName = $dropdown.data('abilityName'); abilityName = $dropdown.data('abilityName');
$selectbox = $dropdown.closest('.selectbox'); $selectbox = $dropdown.closest('.selectbox');
$block = $selectbox.closest('.block'); $block = $selectbox.closest('.block');
@ -267,7 +267,10 @@ export default class LabelsSelect {
return selectedLabels; return selectedLabels;
} }
else if (selectedLabels.length) { else if (selectedLabels.length) {
return selectedLabels[0] + " +" + (selectedLabels.length - 1) + " more"; return sprintf(__('%{firstLabel} +%{labelCount} more'), {
firstLabel: selectedLabels[0],
labelCount: selectedLabels.length - 1
});
} }
else { else {
return defaultLabel; return defaultLabel;

5
changelogs/unreleased/50063-add-missing-i18n-strings-to-issue-boards.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Added missing i18n strings to issue boards lables dropdown
merge_request: 21081
author:
type: other

3
locale/gitlab.pot
View file

@ -101,6 +101,9 @@ msgstr[1] ""
msgid "%{filePath} deleted" msgid "%{filePath} deleted"
msgstr "" msgstr ""
msgid "%{firstLabel} +%{labelCount} more"
msgstr ""
msgid "%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects." msgid "%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects."
msgstr "" msgstr ""