From 9b139d4ef9105d31292566e8c210759a2da5e0f7 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 15 Mar 2022 19:07:25 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=9Cedited=20at=E2=80=9D=20in=20publ?= =?UTF-8?q?ic=20pages=20not=20being=20properly=20localized=20(#17806)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #17804 --- app/views/admin/reports/_status.html.haml | 2 +- app/views/statuses/_detailed_status.html.haml | 2 +- app/views/statuses/_simple_status.html.haml | 2 +- config/locales/en.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml index 1c033c4c342..7538cfd54c1 100644 --- a/app/views/admin/reports/_status.html.haml +++ b/app/views/admin/reports/_status.html.haml @@ -29,7 +29,7 @@ %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) - if status.edited? · - = t('statuses.edited_at', date: l(status.edited_at)) + = t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')) - if status.discarded? · %span.negative-hint= t('admin.statuses.deleted') diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml index 6ccf3725a6f..fd7e034b168 100644 --- a/app/views/statuses/_detailed_status.html.haml +++ b/app/views/statuses/_detailed_status.html.haml @@ -44,7 +44,7 @@ %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) · - if status.edited? - = t('statuses.edited_at', date: l(status.edited_at)) + = t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')) · %span.detailed-status__visibility-icon = visibility_icon status diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index 5dd265b59ea..8ffd3cb746c 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -8,7 +8,7 @@ = visibility_icon status %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) - if status.edited? - %abbr{ title: t('statuses.edited_at', date: l(status.edited_at.to_date)) } + %abbr{ title: t('statuses.edited_at_html', date: l(status.edited_at.to_date)) } * %data.dt-published{ value: status.created_at.to_time.iso8601 } diff --git a/config/locales/en.yml b/config/locales/en.yml index cdc66bd68a9..d4a42e86759 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1438,7 +1438,7 @@ en: disallowed_hashtags: one: 'contained a disallowed hashtag: %{tags}' other: 'contained the disallowed hashtags: %{tags}' - edited_at: Edited %{date} + edited_at_html: Edited %{date} errors: in_reply_not_found: The post you are trying to reply to does not appear to exist. open_in_web: Open in web