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

3 files changed, 16 insertions, 5 deletions

diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 4759991449e..de0c21e7cf6 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -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') }
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index dee3931ff04..36f19ee6175 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -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') }
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 6cafa9c3947..bcbe515288c 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -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 ""