gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Fix ambiguous wording on appeal actions (#18328) 

Fixes #18322
gh/stable
Claire 2022-05-06 21:41:34 +02:00 committed by GitHub
parent 5a448d0d71
commit 991353682d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/disputes/strikes/show.html.haml
View File

@ -3,8 +3,8 @@
- content_for :heading_actions do - content_for :heading_actions do
- if @appeal.persisted? - if @appeal.persisted?
= link_to t('admin.accounts.approve'), approve_admin_disputes_appeal_path(@appeal), method: :post, class: 'button' if can?(:approve, @appeal) = link_to t('disputes.strikes.approve_appeal'), approve_admin_disputes_appeal_path(@appeal), method: :post, class: 'button' if can?(:approve, @appeal)
= link_to t('admin.accounts.reject'), reject_admin_disputes_appeal_path(@appeal), method: :post, class: 'button button--destructive' if can?(:reject, @appeal) = link_to t('disputes.strikes.reject_appeal'), reject_admin_disputes_appeal_path(@appeal), method: :post, class: 'button button--destructive' if can?(:reject, @appeal)
- if @strike.overruled? - if @strike.overruled?
%p.hint %p.hint

2
config/locales/en.yml
View File

@ -1036,10 +1036,12 @@ en:
appealed_msg: Your appeal has been submitted. If it is approved, you will be notified. appealed_msg: Your appeal has been submitted. If it is approved, you will be notified.
appeals: appeals:
submit: Submit appeal submit: Submit appeal
approve_appeal: Approve appeal
associated_report: Associated report associated_report: Associated report
created_at: Dated created_at: Dated
description_html: These are actions taken against your account and warnings that have been sent to you by the staff of %{instance}. description_html: These are actions taken against your account and warnings that have been sent to you by the staff of %{instance}.
recipient: Addressed to recipient: Addressed to
reject_appeal: Reject appeal
status: 'Post #%{id}' status: 'Post #%{id}'
status_removed: Post already removed from system status_removed: Post already removed from system
title: "%{action} from %{date}" title: "%{action} from %{date}"