diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-05 18:44:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 18:44:15 +0100 |
| commit | ad17e1944aa4c01c5637199b464c9d78b7e54af2 (patch) | |
| tree | dee9d23334a0d23fbc3737e3c17033727805a141 /app/views | |
| parent | 7e9d5bdbb9125197afb5b3df69ce49a79451d697 (diff) | |
| parent | c4649ae9d4ef34cc0bad9d5df0da8e8b6c729522 (diff) | |
Merge pull request #2071 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/report_notes/_report_note.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/disputes/strikes/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/modal.html.haml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/admin/report_notes/_report_note.html.haml b/app/views/admin/report_notes/_report_note.html.haml index 14df2f609..54c252ee8 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 1535e5003..181067802 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -141,7 +141,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 cab0a17eb..7797348dd 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)) diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml index dee7c63d9..cf608766b 100644 --- a/app/views/layouts/modal.html.haml +++ b/app/views/layouts/modal.html.haml @@ -5,7 +5,7 @@ .name = t 'users.signed_in_as' %span.username @#{current_account.local_username_and_domain} - = link_to destroy_user_session_path(continue: true), method: :delete, class: 'logout-link icon-button' do + = link_to destroy_user_session_path(continue: true), method: :delete, class: 'logout-link icon-button', title: t('applications.logout'), 'aria-label': t('applications.logout') do = fa_icon 'sign-out' .container-alt= yield |