diff --git a/ee/app/assets/javascripts/roles_and_permissions/constants.js b/ee/app/assets/javascripts/roles_and_permissions/constants.js index 8ba8347260e597741fa5b75069a582e0846d288c..fa86f15cb61d83a6fb3026fd636cdbf580b74f3d 100644 --- a/ee/app/assets/javascripts/roles_and_permissions/constants.js +++ b/ee/app/assets/javascripts/roles_and_permissions/constants.js @@ -35,7 +35,7 @@ export const PERMISSIONS = Object.freeze({ }, [ADMIN_VULNERABILITY]: { help: s__( - "MemberRoles|Allows admin access to the vulnerability reports. 'Read vulnerability' must be selected in order to take effect.", + "MemberRoles|Allows admin access to the vulnerability reports. Select 'Read vulnerability' for this to take effect.", ), text: s__('MemberRoles|Admin vulnerability'), value: ADMIN_VULNERABILITY, @@ -85,10 +85,11 @@ export const I18N_EMPTY_TEXT_SELF_MANAGED = s__( ); export const I18N_FETCH_ERROR = s__('MemberRoles|Failed to fetch roles.'); export const I18N_FIELD_FORM_ERROR = __('This field is required.'); -export const I18N_LICENSE_ERROR = s__('MemberRoles|Make sure the group has an Ultimate license.'); +export const I18N_LICENSE_ERROR = s__('MemberRoles|Make sure the group is in the Ultimate tier.'); export const I18N_MODAL_TITLE = s__('MemberRoles|Are you sure you want to delete this role?'); -export const I18N_MODAL_WARNING = s__(`MemberRoles|Removing a custom role also removes all members with this custom role from the group. -If you decide to delete a custom role, you must re-add these users to the group.`); +export const I18N_MODAL_WARNING = s__( + `MemberRoles|To delete the custom role make sure no group member has this custom role`, +); export const I18N_NEW_ROLE_BASE_ROLE_LABEL = s__('MemberRoles|Base role to use as template'); export const I18N_NEW_ROLE_BASE_ROLE_DESCRIPTION = s__( 'MemberRoles|Select a standard role to add permissions.', diff --git a/ee/spec/frontend/roles_and_permissions/components/create_member_role_spec.js b/ee/spec/frontend/roles_and_permissions/components/create_member_role_spec.js index 9ef938365c789644c44054d97233d13fcc3fc295..d9182d54bf1c87b3322691d571141129742d7ef4 100644 --- a/ee/spec/frontend/roles_and_permissions/components/create_member_role_spec.js +++ b/ee/spec/frontend/roles_and_permissions/components/create_member_role_spec.js @@ -76,7 +76,7 @@ describe('CreateMemberRole', () => { expect(checkboxThreeText).toContain('Admin vulnerability'); expect(checkboxThreeText).toContain( - "Allows admin access to the vulnerability reports. 'Read vulnerability' must be selected in order to take effect.", + "Allows admin access to the vulnerability reports. Select 'Read vulnerability' for this to take effect.", ); }); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 4c486d8be4f2983099cce162bc109e022b501f8b..f513d2982b9374b638fd97615966cdd0c8aad62f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -29050,7 +29050,7 @@ msgstr "" msgid "MemberRoles|Admin vulnerability" msgstr "" -msgid "MemberRoles|Allows admin access to the vulnerability reports. 'Read vulnerability' must be selected in order to take effect." +msgid "MemberRoles|Allows admin access to the vulnerability reports. Select 'Read vulnerability' for this to take effect." msgstr "" msgid "MemberRoles|Allows read-only access to the source code." @@ -29098,7 +29098,7 @@ msgstr "" msgid "MemberRoles|Incident manager" msgstr "" -msgid "MemberRoles|Make sure the group has an Ultimate license." +msgid "MemberRoles|Make sure the group is in the Ultimate tier." msgstr "" msgid "MemberRoles|Name" @@ -29116,9 +29116,6 @@ msgstr "" msgid "MemberRoles|Read vulnerability" msgstr "" -msgid "MemberRoles|Removing a custom role also removes all members with this custom role from the group. If you decide to delete a custom role, you must re-add these users to the group." -msgstr "" - msgid "MemberRoles|Role name" msgstr "" @@ -29137,6 +29134,9 @@ msgstr "" msgid "MemberRoles|To add a new role select a group and then 'Add new role'." msgstr "" +msgid "MemberRoles|To delete the custom role make sure no group member has this custom role" +msgstr "" + msgid "MemberRole|%{requirement} has to be enabled in order to enable %{permission}." msgstr ""