zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Add "invite request content" display in user account admin page (#15265) 

* feat: display `invite_request_text` in admin's user account page

* fix: move invite_request to the bottom of accounts page

* fix: remove time display, remove formate, change code terminology

* fix: remove escape
This commit is contained in:
Mashiro 2020-12-15 13:28:14 +08:00 committed by GitHub
parent 1390cc194b
commit 75d2762fdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/admin/accounts/show.html.haml
View File

@ -242,3 +242,13 @@
.actions .actions
= f.button :button, t('admin.account_moderation_notes.create'), type: :submit = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
%hr.spacer/
- if @account.user&.invite_request&.text&.present?
%div.speech-bubble
%div.speech-bubble__bubble
= @account.user&.invite_request&.text
%div.speech-bubble__owner
= admin_account_link_to @account
= t('admin.accounts.invite_request_text')

1
config/locales/en.yml
View File

@ -131,6 +131,7 @@ en:
follows: Follows follows: Follows
header: Header header: Header
inbox_url: Inbox URL inbox_url: Inbox URL
invite_request_text: Reasons for joining
invited_by: Invited by invited_by: Invited by
ip: IP ip: IP
joined: Joined joined: Joined