OpenSource/mastodon
OpenSource/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-03 13:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

Include time portion in formatted datetimes when provided

Browse source
This commit is contained in:
Emelia Smith 2024-12-05 18:53:17 +01:00
parent d29eddc401
commit ee30f64764
No known key found for this signature in database
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/entrypoints/public.tsx
View file

@ -119,7 +119,11 @@ function loaded() {
formattedContent = dateFormat.format(datetime); formattedContent = dateFormat.format(datetime);
} }
content.title = formattedContent; const timeGiven = content.dateTime.includes('T');
content.title = timeGiven
? dateTimeFormat.format(datetime)
: dateFormat.format(datetime);
content.textContent = formattedContent; content.textContent = formattedContent;
}); });

2
app/views/admin/report_notes/_report_note.html.haml
View file

@ -4,7 +4,7 @@
.report-notes__item__header .report-notes__item__header
%span.username %span.username
= link_to report_note.account.username, admin_account_path(report_note.account_id) = link_to report_note.account.username, admin_account_path(report_note.account_id)
%time.relative-formatted{ datetime: report_note.created_at.iso8601 } %time.relative-formatted{ datetime: report_note.created_at.iso8601, title: report_note.created_at }
= l report_note.created_at.to_date = l report_note.created_at.to_date
.report-notes__item__content .report-notes__item__content

2
app/views/admin/reports/_comment.html.haml
View file

@ -18,7 +18,7 @@
= link_to report.account.username, admin_account_path(report.account_id) = link_to report.account.username, admin_account_path(report.account_id)
- else - else
= link_to report.account.domain, admin_instance_path(report.account.domain) = link_to report.account.domain, admin_instance_path(report.account.domain)
%time.relative-formatted{ datetime: report.created_at.iso8601 } %time.relative-formatted{ datetime: report.created_at.iso8601, title: report.created_at }
= l report.created_at.to_date = l report.created_at.to_date
.report-notes__item__content .report-notes__item__content
= simple_format(h(report.comment)) = simple_format(h(report.comment))

2
app/views/disputes/strikes/show.html.haml
View file

@ -66,7 +66,7 @@
.report-notes__item__header .report-notes__item__header
%span.username %span.username
= link_to @appeal.account.username, can?(:show, @appeal.account) ? admin_account_path(@appeal.account_id) : short_account_url(@appeal.account) = 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 } %time.relative-formatted{ datetime: @appeal.created_at.iso8601, title: @appeal.created_at }
= l @appeal.created_at.to_date = l @appeal.created_at.to_date
.report-notes__item__content .report-notes__item__content