tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2022-03-02 18:02:48 +01:00
parent 0b8fe020b5 462a6f7d72
commit 425a6c90c4
189 changed files with 2586 additions and 1444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/auth/registrations/_status.html.haml
View File

@@ -12,6 +12,22 @@
%h3= t('auth.status.account_status')
%p.hint
- if @user.account.suspended?
%span.negative-hint= t('user_mailer.warning.explanation.suspend')
- elsif @user.disabled?
%span.negative-hint= t('user_mailer.warning.explanation.disable')
- elsif @user.account.silenced?
%span.warning-hint= t('user_mailer.warning.explanation.silence')
- else
%span.positive-hint= t('auth.status.functional')
= render partial: 'account_warning', collection: @strikes
- if @user.account.strikes.exists?
%hr.spacer/
%p.muted-hint
= link_to t('auth.status.view_strikes'), disputes_strikes_path
%hr.spacer/