Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
4f195049
Unverified
Commit
4f195049
authored
4 years ago
by
Claire
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add inline description of moderation actions in moderation interface (#15792)
parent
5f4c0b79
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/admin/account_actions/new.html.haml
+1
-1
1 addition, 1 deletion
app/views/admin/account_actions/new.html.haml
config/locales/simple_form.en.yml
+6
-0
6 additions, 0 deletions
config/locales/simple_form.en.yml
with
7 additions
and
1 deletion
app/views/admin/account_actions/new.html.haml
+
1
−
1
View file @
4f195049
...
...
@@ -5,7 +5,7 @@
=
f
.
input
:report_id
,
as: :hidden
.fields-group
=
f
.
input
:type
,
collection:
Admin
::
AccountAction
.
types_for_account
(
@account
),
include_blank:
false
,
wrapper: :with_block_label
,
label_method:
->
(
type
)
{
I18n
.
t
(
"simple_form.labels.admin_account_action.types.
#{
type
}
"
)},
hint:
t
(
'simple_form.hints.admin_account_action.type_html'
,
acct:
@account
.
acct
)
=
f
.
input
:type
,
as: :radio_buttons
,
collection:
Admin
::
AccountAction
.
types_for_account
(
@account
),
include_blank:
false
,
wrapper: :with_block_label
,
label_method:
->
(
type
)
{
safe_join
([
I18n
.
t
(
"simple_form.labels.admin_account_action.types.
#{
type
}
"
)
,
content_tag
(
:span
,
I18n
.
t
(
"simple_form.hints.admin_account_action.types.
#{
type
}
"
),
class:
'hint'
)])
},
hint:
t
(
'simple_form.hints.admin_account_action.type_html'
,
acct:
@account
.
acct
)
-
if
@account
.
local?
%hr
.spacer
/
...
...
This diff is collapsed.
Click to expand it.
config/locales/simple_form.en.yml
+
6
−
0
View file @
4f195049
...
...
@@ -14,6 +14,12 @@ en:
send_email_notification
:
The user will receive an explanation of what happened with their account
text_html
:
Optional. You can use toot syntax. You can <a href="%{path}">add warning presets</a> to save time
type_html
:
Choose what to do with <strong>%{acct}</strong>
types
:
disable
:
Prevent the user from using their account, but do not delete or hide their contents.
none
:
Use this to send a warning to the user, without triggering any other action.
sensitive
:
Force all this user's media attachments to be flagged as sensitive.
silence
:
Prevent the user from being able to post with public visibility, hide their posts and notifications from people not following them.
suspend
:
Prevent any interaction from or to this account and delete its contents. Revertible within 30 days.
warning_preset_id
:
Optional. You can still add custom text to end of the preset
announcement
:
all_day
:
When checked, only the dates of the time range will be displayed
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment