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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
723c6ee6
Commit
723c6ee6
authored
Aug 12, 2019
by
Brett Walker
Committed by
Clement Ho
Aug 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Internationalize Issue and MR list metadata strings
parent
22f3142b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
5 deletions
+16
-5
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+3
-2
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+4
-3
locale/gitlab.pot
locale/gitlab.pot
+9
-0
No files found.
app/views/projects/issues/_issue.html.haml
View file @
723c6ee6
...
...
@@ -45,7 +45,7 @@
%ul
.controls
-
if
issue
.
closed?
%li
.issuable-status
CLOSED
=
_
(
'CLOSED'
)
-
if
issue
.
assignees
.
any?
%li
=
render
'shared/issuable/assignees'
,
project:
@project
,
issuable:
issue
...
...
@@ -53,4 +53,5 @@
=
render
'shared/issuable_meta_data'
,
issuable:
issue
.float-right.issuable-updated-at.d-none.d-sm-inline-block
%span
updated
#{
time_ago_with_tooltip
(
issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_update_ago'
)
}
%span
=
_
(
'updated %{time_ago}'
).
html_safe
%
{
time_ago:
time_ago_with_tooltip
(
issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_update_ago'
)
}
app/views/projects/merge_requests/_merge_request.html.haml
View file @
723c6ee6
...
...
@@ -41,11 +41,11 @@
%ul
.controls.d-flex.align-items-end
-
if
merge_request
.
merged?
%li
.issuable-status.d-none.d-sm-inline-block
MERGED
=
_
(
'MERGED'
)
-
elsif
merge_request
.
closed?
%li
.issuable-status.d-none.d-sm-inline-block
=
icon
(
'ban'
)
CLOSED
=
_
(
'CLOSED'
)
-
if
can?
(
current_user
,
:read_pipeline
,
merge_request
.
head_pipeline
)
%li
.issuable-pipeline-status.d-none.d-sm-flex
=
render
'ci/status/icon'
,
status:
merge_request
.
head_pipeline
.
detailed_status
(
current_user
),
option_css_classes:
'd-flex'
...
...
@@ -61,4 +61,5 @@
=
render
'shared/issuable_meta_data'
,
issuable:
merge_request
.float-right.issuable-updated-at.d-none.d-sm-inline-block
%span
updated
#{
time_ago_with_tooltip
(
merge_request
.
updated_at
,
placement:
'bottom'
,
html_class:
'merge_request_updated_ago'
)
}
%span
=
_
(
'updated %{time_ago}'
).
html_safe
%
{
time_ago:
time_ago_with_tooltip
(
merge_request
.
updated_at
,
placement:
'bottom'
,
html_class:
'merge_request_updated_ago'
)
}
locale/gitlab.pot
View file @
723c6ee6
...
...
@@ -1951,6 +1951,9 @@ msgstr ""
msgid "CICD|instance enabled"
msgstr ""
msgid "CLOSED"
msgstr ""
msgid "CONTRIBUTING"
msgstr ""
...
...
@@ -6574,6 +6577,9 @@ msgstr ""
msgid "Logs"
msgstr ""
msgid "MERGED"
msgstr ""
msgid "MRDiff|Show changes only"
msgstr ""
...
...
@@ -13942,6 +13948,9 @@ msgstr ""
msgid "updated"
msgstr ""
msgid "updated %{time_ago}"
msgstr ""
msgid "user avatar"
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