Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
a053e5db
Commit
a053e5db
authored
Aug 10, 2018
by
Constance Okoghenun
Committed by
Mike Greiling
Aug 10, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Add missing i18n strings to issue boards."
parent
a3c2b39d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
6 deletions
+19
-6
app/assets/javascripts/boards/components/board_sidebar.js
app/assets/javascripts/boards/components/board_sidebar.js
+5
-3
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+6
-3
changelogs/unreleased/50063-add-missing-i18n-strings-to-issue-boards.yml
...leased/50063-add-missing-i18n-strings-to-issue-boards.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/boards/components/board_sidebar.js
View file @
a053e5db
...
...
@@ -3,7 +3,7 @@
import
$
from
'
jquery
'
;
import
Vue
from
'
vue
'
;
import
Flash
from
'
../../flash
'
;
import
{
__
}
from
'
../../locale
'
;
import
{
sprintf
,
__
}
from
'
../../locale
'
;
import
Sidebar
from
'
../../right_sidebar
'
;
import
eventHub
from
'
../../sidebar/event_hub
'
;
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
;
},
labelDropdownTitle
()
{
return
this
.
hasLabels
?
`
${
this
.
issue
.
labels
[
0
].
title
}
${
this
.
issue
.
labels
.
length
-
1
}
+ more`
:
'
Label
'
;
return
this
.
hasLabels
?
sprintf
(
__
(
'
%{firstLabel} +%{labelCount} more
'
),
{
firstLabel
:
this
.
issue
.
labels
[
0
].
title
,
labelCount
:
this
.
issue
.
labels
.
length
-
1
})
:
__
(
'
Label
'
);
},
selectedLabels
()
{
return
this
.
hasLabels
?
this
.
issue
.
labels
.
map
(
l
=>
l
.
title
).
join
(
'
,
'
)
:
''
;
...
...
app/assets/javascripts/labels_select.js
View file @
a053e5db
...
...
@@ -4,7 +4,7 @@
import
$
from
'
jquery
'
;
import
_
from
'
underscore
'
;
import
{
__
}
from
'
./locale
'
;
import
{
sprintf
,
__
}
from
'
./locale
'
;
import
axios
from
'
./lib/utils/axios_utils
'
;
import
IssuableBulkUpdateActions
from
'
./issuable_bulk_update_actions
'
;
import
DropdownUtils
from
'
./filtered_search/dropdown_utils
'
;
...
...
@@ -39,7 +39,7 @@ export default class LabelsSelect {
showNo
=
$dropdown
.
data
(
'
showNo
'
);
showAny
=
$dropdown
.
data
(
'
showAny
'
);
showMenuAbove
=
$dropdown
.
data
(
'
showMenuAbove
'
);
defaultLabel
=
$dropdown
.
data
(
'
defaultLabel
'
)
||
'
Label
'
;
defaultLabel
=
$dropdown
.
data
(
'
defaultLabel
'
)
||
__
(
'
Label
'
)
;
abilityName
=
$dropdown
.
data
(
'
abilityName
'
);
$selectbox
=
$dropdown
.
closest
(
'
.selectbox
'
);
$block
=
$selectbox
.
closest
(
'
.block
'
);
...
...
@@ -267,7 +267,10 @@ export default class LabelsSelect {
return
selectedLabels
;
}
else
if
(
selectedLabels
.
length
)
{
return
selectedLabels
[
0
]
+
"
+
"
+
(
selectedLabels
.
length
-
1
)
+
"
more
"
;
return
sprintf
(
__
(
'
%{firstLabel} +%{labelCount} more
'
),
{
firstLabel
:
selectedLabels
[
0
],
labelCount
:
selectedLabels
.
length
-
1
});
}
else
{
return
defaultLabel
;
...
...
changelogs/unreleased/50063-add-missing-i18n-strings-to-issue-boards.yml
0 → 100644
View file @
a053e5db
---
title
:
Added missing i18n strings to issue boards lables dropdown
merge_request
:
21081
author
:
type
:
other
locale/gitlab.pot
View file @
a053e5db
...
...
@@ -101,6 +101,9 @@ msgstr[1] ""
msgid "%{filePath} deleted"
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."
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment