Commit 723c6ee6 authored by Brett Walker's avatar Brett Walker Committed by Clement Ho

Internationalize Issue and MR list metadata strings

parent 22f3142b
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
%ul.controls %ul.controls
- if issue.closed? - if issue.closed?
%li.issuable-status %li.issuable-status
CLOSED = _('CLOSED')
- if issue.assignees.any? - if issue.assignees.any?
%li %li
= render 'shared/issuable/assignees', project: @project, issuable: issue = render 'shared/issuable/assignees', project: @project, issuable: issue
...@@ -53,4 +53,5 @@ ...@@ -53,4 +53,5 @@
= render 'shared/issuable_meta_data', issuable: issue = render 'shared/issuable_meta_data', issuable: issue
.float-right.issuable-updated-at.d-none.d-sm-inline-block .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 @@ ...@@ -41,11 +41,11 @@
%ul.controls.d-flex.align-items-end %ul.controls.d-flex.align-items-end
- if merge_request.merged? - if merge_request.merged?
%li.issuable-status.d-none.d-sm-inline-block %li.issuable-status.d-none.d-sm-inline-block
MERGED = _('MERGED')
- elsif merge_request.closed? - elsif merge_request.closed?
%li.issuable-status.d-none.d-sm-inline-block %li.issuable-status.d-none.d-sm-inline-block
= icon('ban') = icon('ban')
CLOSED = _('CLOSED')
- if can?(current_user, :read_pipeline, merge_request.head_pipeline) - if can?(current_user, :read_pipeline, merge_request.head_pipeline)
%li.issuable-pipeline-status.d-none.d-sm-flex %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' = render 'ci/status/icon', status: merge_request.head_pipeline.detailed_status(current_user), option_css_classes: 'd-flex'
...@@ -61,4 +61,5 @@ ...@@ -61,4 +61,5 @@
= render 'shared/issuable_meta_data', issuable: merge_request = render 'shared/issuable_meta_data', issuable: merge_request
.float-right.issuable-updated-at.d-none.d-sm-inline-block .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 "" ...@@ -1951,6 +1951,9 @@ msgstr ""
msgid "CICD|instance enabled" msgid "CICD|instance enabled"
msgstr "" msgstr ""
msgid "CLOSED"
msgstr ""
msgid "CONTRIBUTING" msgid "CONTRIBUTING"
msgstr "" msgstr ""
...@@ -6574,6 +6577,9 @@ msgstr "" ...@@ -6574,6 +6577,9 @@ msgstr ""
msgid "Logs" msgid "Logs"
msgstr "" msgstr ""
msgid "MERGED"
msgstr ""
msgid "MRDiff|Show changes only" msgid "MRDiff|Show changes only"
msgstr "" msgstr ""
...@@ -13942,6 +13948,9 @@ msgstr "" ...@@ -13942,6 +13948,9 @@ msgstr ""
msgid "updated" msgid "updated"
msgstr "" msgstr ""
msgid "updated %{time_ago}"
msgstr ""
msgid "user avatar" msgid "user avatar"
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