gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-07 10:22:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add link to /admin/roles in moderation interface when changing someone's role (#31791)
Some checks failed
Bundler Audit / security (push) Has been cancelled
Details
Check i18n / check-i18n (push) Has been cancelled
Details
CodeQL / Analyze (javascript) (push) Has been cancelled
Details
CodeQL / Analyze (ruby) (push) Has been cancelled
Details
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Details
Check formatting / lint (push) Has been cancelled
Details
Haml Linting / lint (push) Has been cancelled
Details
Ruby Linting / lint (push) Has been cancelled
Details
Historical data migration test / test (14-alpine) (push) Has been cancelled
Details
Historical data migration test / test (15-alpine) (push) Has been cancelled
Details
Ruby Testing / build (production) (push) Has been cancelled
Details
Ruby Testing / build (test) (push) Has been cancelled
Details
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / test (3.1) (push) Has been cancelled
Details
Ruby Testing / test (3.2) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Details
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Claire 2024-09-06 19:21:49 +02:00 committed by GitHub
parent 7335a43b6d
commit b716248fc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/admin/users/roles/show.html.haml
View File

@ -7,7 +7,8 @@
collection: UserRole.assignable, collection: UserRole.assignable,
include_blank: I18n.t('admin.accounts.change_role.no_role'), include_blank: I18n.t('admin.accounts.change_role.no_role'),
label_method: :name, label_method: :name,
wrapper: :with_block_label wrapper: :with_block_label,
hint: safe_join([I18n.t('simple_form.hints.user.role'), ' ', link_to(I18n.t('admin.accounts.change_role.edit_roles'), admin_roles_path)])
.actions .actions
= f.button :button, = f.button :button,

1
config/locales/en.yml
View File

@ -48,6 +48,7 @@ en:
title: Change email for %{username} title: Change email for %{username}
change_role: change_role:
changed_msg: Role successfully changed! changed_msg: Role successfully changed!
edit_roles: Manage user roles
label: Change role label: Change role
no_role: No role no_role: No role
title: Change role for %{username} title: Change role for %{username}

2
config/locales/simple_form.en.yml
View File

@ -130,7 +130,7 @@ en:
name: You can only change the casing of the letters, for example, to make it more readable name: You can only change the casing of the letters, for example, to make it more readable
user: user:
chosen_languages: When checked, only posts in selected languages will be displayed in public timelines chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
role: The role controls which permissions the user has role: The role controls which permissions the user has.
user_role: user_role:
color: Color to be used for the role throughout the UI, as RGB in hex format color: Color to be used for the role throughout the UI, as RGB in hex format
highlighted: This makes the role publicly visible highlighted: This makes the role publicly visible