Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-09-13 21:37:34 +02:00
parent 065abf2918 5ba3405be4
commit 117ac13d12
118 changed files with 393 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/account_actions/new.html.haml
View File

@@ -1,7 +1,7 @@
- content_for :page_title do
= t('admin.account_actions.title', acct: @account.pretty_acct)
- if @account.suspended?
- if @account.suspended_locally?
.flash-message.alert
= t('admin.account_actions.already_suspended')
- elsif @account.silenced?

6
app/views/admin/reports/_actions.html.haml
View File

@@ -27,7 +27,7 @@
= form.button t('admin.accounts.silence'),
name: :silence,
class: 'button button--destructive',
disabled: report.target_account.silenced? || report.target_account.suspended?,
disabled: report.target_account.silenced? || report.target_account.suspended_locally?,
title: report.target_account.silenced? ? t('admin.account_actions.already_silenced') : ''
.report-actions__item__description
= t('admin.reports.actions.silence_description_html')
@@ -36,8 +36,8 @@
= form.button t('admin.accounts.suspend'),
name: :suspend,
class: 'button button--destructive',
disabled: report.target_account.suspended?,
title: report.target_account.suspended? ? t('admin.account_actions.already_suspended') : ''
disabled: report.target_account.suspended_locally?,
title: report.target_account.suspended_locally? ? t('admin.account_actions.already_suspended') : ''
.report-actions__item__description
= t('admin.reports.actions.suspend_description_html')
.report-actions__item