From 4cd56b34a6bb874a879d425299d52284ae32010f Mon Sep 17 00:00:00 2001 From: Sarath Nair Date: Thu, 19 Sep 2024 16:23:16 +0200 Subject: [PATCH] SONAR-22825 Fix info message on Gitlab Roles mapping modal --- .../components/authentication/DevopsRolesMappingModal.tsx | 7 ++++--- .../src/main/resources/org/sonar/l10n/core.properties | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/settings/components/authentication/DevopsRolesMappingModal.tsx b/server/sonar-web/src/main/js/apps/settings/components/authentication/DevopsRolesMappingModal.tsx index 4b70d1140d5..0fd95177fe5 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/authentication/DevopsRolesMappingModal.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/authentication/DevopsRolesMappingModal.tsx @@ -230,9 +230,10 @@ export function DevopsRolesMappingModal(props: Readonly) { ))} - {translateWithParameters( - 'settings.authentication.configuration.roles_mapping.dialog.custom_roles_description', - translate('alm', mappingFor), + {translate( + 'settings.authentication', + mappingFor, + 'configuration.roles_mapping.dialog.custom_roles_description', )} diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 7604ab16d9f..658ea951606 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -1670,6 +1670,7 @@ settings.authentication.github.configuration.validation.details.invalid_label=In settings.authentication.github.configuration.validation.details.org_not_found={0} (not found or app not installed) settings.authentication.github.configuration.roles_mapping.description=When synchronizing users and groups, SonarQube assigns permissions based on GitHub user and team roles. You can customize the mapping of permissions. The new mapping will take effect at the next synchronization. settings.authentication.github.configuration.roles_mapping.save_success=GitHub roles mapping saved successfully. +settings.authentication.github.configuration.roles_mapping.dialog.custom_roles_description=When a custom role name added here matches an existing GitHub custom role in any of your organizations, the mapping applies to all users with this custom role. If an existing GitHub custom role has no exact match in this list, the permissions of its inherited base role are mapped. settings.authentication.github.configuration.unsaved_changes=You have unsaved changes. # GITLAB @@ -1714,6 +1715,7 @@ settings.authentication.gitlab.configuration.valid.JIT=Configuration is valid fo settings.authentication.gitlab.configuration.valid.AUTO_PROVISIONING=Configuration is valid for Automatic provisioning. settings.authentication.gitlab.configuration.roles_mapping.description=When synchronizing users and groups, SonarQube assigns permissions based on Gitlab user roles. You can customize the mapping of permissions. The new mapping will take effect at the next synchronization. settings.authentication.gitlab.configuration.roles_mapping.save_success=GitLab roles mapping saved successfully. +settings.authentication.gitlab.configuration.roles_mapping.dialog.custom_roles_description=When a custom role name added here matches an existing GitLab custom role in any of your groups or projects, the mapping applies to all users with this custom role. If an existing GitLab custom role has no exact match in this list, the permissions of its inherited base role are mapped. # BITBUCKET settings.authentication.gitlab.configuration.insecure=BitBucket Authentication allows users to sign up, but no list of allowed workspaces was provided. This is potentially insecure. We recommend entering a list of allowed workspaces. {documentation} @@ -1736,7 +1738,6 @@ settings.authentication.configuration.roles_mapping.dialog.delete_custom_role=De settings.authentication.configuration.roles_mapping.dialog.add_custom_role=Add custom role: settings.authentication.configuration.roles_mapping.role_exists=Role already exists. settings.authentication.configuration.roles_mapping.empty_custom_role=Custom roles should have some permissions. -settings.authentication.configuration.roles_mapping.dialog.custom_roles_description=When a custom role name added here matches an existing {0} custom role in any of your organizations, the mapping applies to all users with this custom role. If an existing {0} custom role has no exact match in this list, the permissions of its inherited base role are mapped. # SAML settings.authentication.form.create.saml=New SAML configuration -- 2.39.5