From 6eea3f8f9c41114002782d7a44993004bdd64832 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 20 Jan 2022 13:37:31 +0100
Subject: [PATCH] Add post edited notice in admin and public UIs (#17335)
* Add edited toot flag on public pages
* Add toot edit flag to admin pages
---
app/views/admin/reports/_status.html.haml | 3 +++
app/views/statuses/_detailed_status.html.haml | 5 +++++
app/views/statuses/_simple_status.html.haml | 3 +++
config/locales/en.yml | 1 +
4 files changed, 12 insertions(+)
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index 924b0e9c255..4e06d4bbf0c 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -27,6 +27,9 @@
·
= link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener noreferrer' do
%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))
- 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 6b3b8130672..cd5ed52af4a 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -37,10 +37,15 @@
.detailed-status__meta
%data.dt-published{ value: status.created_at.to_time.iso8601 }
+ - if status.edited?
+ %data.dt-updated{ value: status.edited_at.to_time.iso8601 }
= link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: stream_link_target, rel: 'noopener noreferrer' do
%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))
+ ·
%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 728e6b9b096..0139d2016c3 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -7,6 +7,9 @@
%span.status__visibility-icon><
= 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)) }
+ *
%data.dt-published{ value: status.created_at.to_time.iso8601 }
.p-author.h-card
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 36ac896643f..13a252a47b2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1309,6 +1309,7 @@ en:
disallowed_hashtags:
one: 'contained a disallowed hashtag: %{tags}'
other: 'contained the disallowed hashtags: %{tags}'
+ edited_at: Edited %{date}
errors:
in_reply_not_found: The post you are trying to reply to does not appear to exist.
language_detection: Automatically detect language