From af4b32aece7003d08fd6e78d2e09e30277bf7e4f Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Mon, 15 Jul 2024 03:57:56 +0000 Subject: [PATCH] ui(admin): improve names of user settings and add descriptions Changes * checkbox titles are no longer strong. * added descriptions to all options. Mostly from memory, but there are a few sources: - https://docs.gitea.com/help/faq#active-user-vs-login-prohibited-user - https://docs.gitea.com/help/faq#restricted-users * for git hooks, I just moved tooltip into description. * renamed titles. The only important one is: "Disable sign-in" -> "Suspended account" as it has a change of terminology. We don't seem to have anything about this option in our docs though. This is what the option really does. In fact, it does not invalidate current sessions of the user, but shows them the same "Sign-in prohibited" screen for all actions. Preview: https://codeberg.org/attachments/e5649045-dfe8-4327-869f-cb2530ca6b17 (the text of the last one is slightly outdated after review) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4499 Reviewed-by: Earl Warren --- options/locale/locale_en-US.ini | 14 ++++++++++---- templates/admin/user/edit.tmpl | 23 +++++++++++++++-------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2a19b1c0fe..997920c9e7 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3019,14 +3019,20 @@ users.update_profile_success = The user account has been updated. users.edit_account = Edit user account users.max_repo_creation = Maximum number of repositories users.max_repo_creation_desc = (Enter -1 to use the global default limit.) -users.is_activated = User Account Is Activated -users.prohibit_login = Disable sign-in -users.is_admin = Is administrator -users.is_restricted = Is restricted +users.is_activated = Activated account +users.activated.description = Completion of email verification. The owner of an unactivated account will not be able to log in until email verification is completed. +users.prohibit_login = Suspended account +users.block.description = Block this user from interacting with this service through their account and prohibit signing in. +users.is_admin = Administrator account +users.admin.description = Grant this user full access to all administrative features available through the web UI and the API. +users.is_restricted = Restricted account +users.restricted.description = Only allow interaction with the repositories and organizations where this user is added as a collaborator. This prevents access to public repositories on this instance. users.allow_git_hook = Can create Git hooks users.allow_git_hook_tooltip = Git hooks are executed as the OS user running Forgejo and will have the same level of host access. As a result, users with this special Git hook privilege can access and modify all Forgejo repositories as well as the database used by Forgejo. Consequently they are also able to gain Forgejo administrator privileges. users.allow_import_local = Can import local repositories +users.local_import.description = Allow importing repositories from the server's local file system. This can be a security issue. users.allow_create_organization = Can create organizations +users.organization_creation.description = Allow creation of new organizations. users.update_profile = Update user account users.delete_account = Delete user account users.cannot_delete_self = You cannot delete yourself diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 8203a2a076..f5c85e9290 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -110,46 +110,53 @@
- +
+ {{ctx.Locale.Tr "admin.users.activated.description"}}
- +
+ {{ctx.Locale.Tr "admin.users.block.description"}}
- +
+ {{ctx.Locale.Tr "admin.users.admin.description"}}
- +
+ {{ctx.Locale.Tr "admin.users.restricted.description"}}
-
- +
+
+ {{ctx.Locale.Tr "admin.users.allow_git_hook_tooltip"}}
- +
+ {{ctx.Locale.Tr "admin.users.local_import.description"}}
{{if not .DisableRegularOrgCreation}}
- +
+ {{ctx.Locale.Tr "admin.users.organization_creation.description"}}
{{end}}