@@ -91,7 +91,9 @@ export default function QualityGatePermissionsRenderer(props: QualityGatePermiss | |||
{permissionToDelete && ( | |||
<ConfirmModal | |||
header={ | |||
isUser(permissionToDelete) ? translate('users.remove') : translate('groups.remove') | |||
isUser(permissionToDelete) | |||
? translate('quality_gates.permissions.remove.user') | |||
: translate('quality_gates.permissions.remove.group') | |||
} | |||
confirmButtonText={translate('remove')} | |||
isDestructive={true} | |||
@@ -101,8 +103,8 @@ export default function QualityGatePermissionsRenderer(props: QualityGatePermiss | |||
<FormattedMessage | |||
defaultMessage={ | |||
isUser(permissionToDelete) | |||
? translate('users.remove.confirmation') | |||
: translate('groups.remove.confirmation') | |||
? translate('quality_gates.permissions.remove.user.confirmation') | |||
: translate('quality_gates.permissions.remove.group.confirmation') | |||
} | |||
id="remove.confirmation" | |||
values={{ |
@@ -131,13 +131,13 @@ exports[`should render correctly: show remove modal for group 1`] = ` | |||
"name": "deletable group", | |||
} | |||
} | |||
header="groups.remove" | |||
header="quality_gates.permissions.remove.group" | |||
isDestructive={true} | |||
onClose={[MockFunction]} | |||
onConfirm={[MockFunction]} | |||
> | |||
<FormattedMessage | |||
defaultMessage="groups.remove.confirmation" | |||
defaultMessage="quality_gates.permissions.remove.group.confirmation" | |||
id="remove.confirmation" | |||
values={ | |||
Object { | |||
@@ -213,13 +213,13 @@ exports[`should render correctly: show remove modal for user 1`] = ` | |||
"login": "userlogin", | |||
} | |||
} | |||
header="users.remove" | |||
header="quality_gates.permissions.remove.user" | |||
isDestructive={true} | |||
onClose={[MockFunction]} | |||
onConfirm={[MockFunction]} | |||
> | |||
<FormattedMessage | |||
defaultMessage="users.remove.confirmation" | |||
defaultMessage="quality_gates.permissions.remove.user.confirmation" | |||
id="remove.confirmation" | |||
values={ | |||
Object { |
@@ -74,13 +74,13 @@ export default class ProfilePermissionsGroup extends React.PureComponent<Props, | |||
renderDeleteModal = (props: ChildrenProps) => ( | |||
<div> | |||
<header className="modal-head"> | |||
<h2>{translate('groups.remove')}</h2> | |||
<h2>{translate('quality_profiles.permissions.remove.group')}</h2> | |||
</header> | |||
<div className="modal-body"> | |||
<FormattedMessage | |||
defaultMessage={translate('groups.remove.confirmation')} | |||
id="groups.remove.confirmation" | |||
defaultMessage={translate('quality_profiles.permissions.remove.group.confirmation')} | |||
id="quality_profiles.permissions.remove.group.confirmation" | |||
values={{ | |||
user: <strong>{this.props.group.name}</strong> | |||
}} | |||
@@ -113,7 +113,7 @@ export default class ProfilePermissionsGroup extends React.PureComponent<Props, | |||
{this.state.deleteModal && ( | |||
<SimpleModal | |||
header={translate('group.remove')} | |||
header={translate('quality_profiles.permissions.remove.group')} | |||
onClose={this.handleDeleteModalClose} | |||
onSubmit={this.handleDelete}> | |||
{this.renderDeleteModal} |
@@ -73,13 +73,13 @@ export default class ProfilePermissionsUser extends React.PureComponent<Props, S | |||
renderDeleteModal = (props: ChildrenProps) => ( | |||
<div> | |||
<header className="modal-head"> | |||
<h2>{translate('users.remove')}</h2> | |||
<h2>{translate('quality_profiles.permissions.remove.user')}</h2> | |||
</header> | |||
<div className="modal-body"> | |||
<FormattedMessage | |||
defaultMessage={translate('users.remove.confirmation')} | |||
id="users.remove.confirmation" | |||
defaultMessage={translate('quality_profiles.permissions.remove.user.confirmation')} | |||
id="quality_profiles.permissions.remove.user.confirmation" | |||
values={{ | |||
user: <strong>{this.props.user.name}</strong> | |||
}} | |||
@@ -116,7 +116,7 @@ export default class ProfilePermissionsUser extends React.PureComponent<Props, S | |||
{this.state.deleteModal && ( | |||
<SimpleModal | |||
header={translate('users.remove')} | |||
header={translate('quality_profiles.permissions.remove.user')} | |||
onClose={this.handleDeleteModalClose} | |||
onSubmit={this.handleDelete}> | |||
{this.renderDeleteModal} |
@@ -1661,7 +1661,10 @@ quality_profiles.grant_permissions_to_more_users=Grant permissions to more users | |||
quality_profiles.grant_permissions_to_user_or_group=Grant permissions to a user or a group | |||
quality_profiles.additional_user_groups=Additional users / groups: | |||
quality_profiles.search_description=Search users by login or name, and groups by name: | |||
quality_profiles.permissions.remove.user=Remove permission from user | |||
quality_profiles.permissions.remove.user.confirmation=Are you sure you want to remove permission on this quality profile from user {user}? | |||
quality_profiles.permissions.remove.group=Remove permission from group | |||
quality_profiles.permissions.remove.group.confirmation=Are you sure you want to remove permission on this quality profile from group {user}? | |||
@@ -1738,6 +1741,10 @@ quality_gates.permissions=Permissions | |||
quality_gates.permissions.help=Users with the global "Administer Quality Gates" permission and those listed below can manage this Quality Gate. | |||
quality_gates.permissions.grant=Grant permissions to a user or a group | |||
quality_gates.permissions.search=Search users by login or name, and groups by name: | |||
quality_gates.permissions.remove.user=Remove permission from user | |||
quality_gates.permissions.remove.user.confirmation=Are you sure you want to remove permission on this quality gate from user {user}? | |||
quality_gates.permissions.remove.group=Remove permission from group | |||
quality_gates.permissions.remove.group.confirmation=Are you sure you want to remove permission on this quality gate from group {user}? | |||
#------------------------------------------------------------------------------ | |||
# | |||
@@ -1960,16 +1967,9 @@ unauthorized.reason=Reason: | |||
# USERS & GROUPS PAGE | |||
# | |||
#------------------------------------------------------------------------------ | |||
users.add=Add user | |||
users.remove=Remove user | |||
users.remove.confirmation=Are you sure you want to remove user "{user}"? | |||
users.search_description=Search users by login or name | |||
users.update=Update users | |||
users.update_details=Update details | |||
groups.users.edit=Change group members | |||
groups.remove=Remove group | |||
groups.remove.confirmation=Are you sure you want to remove group "{user}"? | |||
#------------------------------------------------------------------------------ | |||
# |