Commit 71ec7932 authored by Clement Ho's avatar Clement Ho

Merge branch 'add-metadata-to-epic-list-view-ce' into 'master'

Internationalize Issue and MR list metadata strings

See merge request gitlab-org/gitlab-ce!31677
parents 22f3142b 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') }
......@@ -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') }
......@@ -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 ""
......
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