From b8ad446f77479010997a4a3c52fa7b47fb403eed Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 5 Jan 2023 13:35:28 +0100
Subject: [PATCH] Fix incorrectly formatted datetime in account moderation note
timestamp (#22555)
* Fix incorrectly formatted datetime in account moderation note timestamp
Fix oversight from #21878
* Fix use of non-existent translation string
---
app/views/admin/report_notes/_report_note.html.haml | 4 ++--
app/views/admin/reports/show.html.haml | 2 +-
app/views/disputes/strikes/show.html.haml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/views/admin/report_notes/_report_note.html.haml b/app/views/admin/report_notes/_report_note.html.haml
index 14df2f60900..54c252ee89e 100644
--- a/app/views/admin/report_notes/_report_note.html.haml
+++ b/app/views/admin/report_notes/_report_note.html.haml
@@ -4,8 +4,8 @@
.report-notes__item__header
%span.username
= link_to report_note.account.username, admin_account_path(report_note.account_id)
- %time.relative-formatted{ datetime: report_note.created_at }
- = t('admin.report_notes.created_at')
+ %time.relative-formatted{ datetime: report_note.created_at.iso8601 }
+ = l report_note.created_at.to_date
.report-notes__item__content
= simple_format(h(report_note.content))
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 50ec64b0656..5a45b9b7817 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -145,7 +145,7 @@
- else
= link_to @report.account.domain, admin_instance_path(@report.account.domain)
%time.relative-formatted{ datetime: @report.created_at.iso8601 }
- = t('admin.report_notes.created_at')
+ = l @report.created_at.to_date
.report-notes__item__content
= simple_format(h(@report.comment))
diff --git a/app/views/disputes/strikes/show.html.haml b/app/views/disputes/strikes/show.html.haml
index cab0a17eb1e..7797348dd72 100644
--- a/app/views/disputes/strikes/show.html.haml
+++ b/app/views/disputes/strikes/show.html.haml
@@ -111,7 +111,7 @@
%span.username
= link_to @appeal.account.username, can?(:show, @appeal.account) ? admin_account_path(@appeal.account_id) : short_account_url(@appeal.account)
%time.relative-formatted{ datetime: @appeal.created_at.iso8601 }
- = t('admin.report_notes.created_at')
+ = l @appeal.created_at.to_date
.report-notes__item__content
= simple_format(h(@appeal.text))