From b716248fc5bde4dc47b8104d092d092d87c50f1a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 6 Sep 2024 19:21:49 +0200
Subject: [PATCH] Add link to `/admin/roles` in moderation interface when
changing someone's role (#31791)
---
app/views/admin/users/roles/show.html.haml | 3 ++-
config/locales/en.yml | 1 +
config/locales/simple_form.en.yml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/views/admin/users/roles/show.html.haml b/app/views/admin/users/roles/show.html.haml
index f26640f2a..01b3830f4 100644
--- a/app/views/admin/users/roles/show.html.haml
+++ b/app/views/admin/users/roles/show.html.haml
@@ -7,7 +7,8 @@
collection: UserRole.assignable,
include_blank: I18n.t('admin.accounts.change_role.no_role'),
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
= f.button :button,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 217b1537f..e8c901048 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -48,6 +48,7 @@ en:
title: Change email for %{username}
change_role:
changed_msg: Role successfully changed!
+ edit_roles: Manage user roles
label: Change role
no_role: No role
title: Change role for %{username}
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index fee3a6151..c1fae7e83 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -130,7 +130,7 @@ en:
name: You can only change the casing of the letters, for example, to make it more readable
user:
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:
color: Color to be used for the role throughout the UI, as RGB in hex format
highlighted: This makes the role publicly visible