Archos/masto-fe-archos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-09-19 12:53:32 +02:00
parent 7ea5a2c82c 6eb6209d02
commit 1e87575b70
30 changed files with 406 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/admin/account_warnings/_account_warning.html.haml
+1 -1
View File
@@ -5,7 +5,7 @@
= fa_icon 'warning'
.log-entry__content
.log-entry__title
= t(account_warning.action, scope: 'admin.strikes.actions', name: content_tag(:span, account_warning.account.username, class: 'username'), target: content_tag(:span, account_warning.target_account.pretty_acct, class: 'target')).html_safe
= t(account_warning.action, scope: 'admin.strikes.actions', name: content_tag(:span, account_warning.account ? account_warning.account.username : I18n.t('admin.action_logs.deleted_account'), class: 'username'), target: content_tag(:span, account_warning.target_account.pretty_acct, class: 'target')).html_safe
.log-entry__timestamp
%time.formatted{ datetime: account_warning.created_at.iso8601 }
= l(account_warning.created_at)