treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix “edited at” in public pages not being properly localized (#17806) 

Fixes #17804
lolsob-rspec
Claire 2022-03-15 19:07:25 +01:00 committed by GitHub
parent a5b3e455af
commit 981cd24311
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/reports/_status.html.haml
View File

@ -29,7 +29,7 @@
%time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
- if status.edited? - 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? - if status.discarded?
· ·
%span.negative-hint= t('admin.statuses.deleted') %span.negative-hint= t('admin.statuses.deleted')

2
app/views/statuses/_detailed_status.html.haml
View File

@ -44,7 +44,7 @@
%time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
· ·
- if status.edited? - 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 %span.detailed-status__visibility-icon
= visibility_icon status = visibility_icon status

2
app/views/statuses/_simple_status.html.haml
View File

@ -8,7 +8,7 @@
= visibility_icon status = visibility_icon status
%time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
- if status.edited? - 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 } %data.dt-published{ value: status.created_at.to_time.iso8601 }

2
config/locales/en.yml
View File

@ -1438,7 +1438,7 @@ en:
disallowed_hashtags: disallowed_hashtags:
one: 'contained a disallowed hashtag: %{tags}' one: 'contained a disallowed hashtag: %{tags}'
other: 'contained the disallowed hashtags: %{tags}' other: 'contained the disallowed hashtags: %{tags}'
edited_at: Edited %{date} edited_at_html: Edited %{date}
errors: errors:
in_reply_not_found: The post you are trying to reply to does not appear to exist. in_reply_not_found: The post you are trying to reply to does not appear to exist.
open_in_web: Open in web open_in_web: Open in web