diff --git a/locales/en.json b/locales/en.json index 62c6603c1..d643f07fa 100644 --- a/locales/en.json +++ b/locales/en.json @@ -214,15 +214,15 @@ "group_already_allowed": "Group '{group:s}' already has permission '{permission:s}' enabled for app '{app:s}'", "group_already_disallowed": "Group '{group:s}' already has permissions '{permission:s}' disabled for app '{app:s}'", "group_name_already_exist": "Group {name:s} already exist", - "group_created": "Group creation success", - "group_creation_failed": "Group creation failed", - "group_deleted": "Group deleted", - "group_deletion_failed": "Group deletion failed", + "group_created": "Group '{group}' succesfully created", + "group_creation_failed": "Group creation failed for group '{group}'", + "group_deleted": "Group '{group}' deleted", + "group_deletion_failed": "Group '{group} 'deletion failed", "group_deletion_not_allowed": "You are not allowed to remove the main group of the user {user:s}", "group_info_failed": "Group info failed", "group_unknown": "Group {group:s} unknown", - "group_updated": "Group updated", - "group_update_failed": "Group update failed", + "group_updated": "Group '{group}' updated", + "group_update_failed": "Group update failed for group '{group}'", "hook_exec_failed": "Script execution failed: {path:s}", "hook_exec_not_terminated": "Script execution hasn\u2019t terminated: {path:s}", "hook_list_by_invalid": "Invalid property to list hook by", diff --git a/src/yunohost/user.py b/src/yunohost/user.py index 442f499d3..e1f706577 100644 --- a/src/yunohost/user.py +++ b/src/yunohost/user.py @@ -575,12 +575,12 @@ def user_group_add(operation_logger, auth, groupname,gid=None, sync_perm=True): } if auth.add('cn=%s,ou=groups' % groupname, attr_dict): - logger.success(m18n.n('group_created')) + logger.success(m18n.n('group_created', group=groupname)) if sync_perm: permission_sync_to_user(auth) return {'name': groupname} - raise YunohostError('group_creation_failed') + raise YunohostError('group_creation_failed', group=groupname) @is_unit_operation([('groupname', 'user')]) @@ -599,9 +599,9 @@ def user_group_delete(operation_logger, auth, groupname, force=False, sync_perm= operation_logger.start() if not auth.remove('cn=%s,ou=groups' % groupname): - raise YunohostError('group_deletion_failed') + raise YunohostError('group_deletion_failed', group=groupname) - logger.success(m18n.n('group_deleted')) + logger.success(m18n.n('group_deleted', group=groupname)) if sync_perm: permission_sync_to_user(auth) @@ -677,9 +677,9 @@ def user_group_update(operation_logger, auth, groupname, add_user=None, remove_u if new_group_list['member'] != set(group['member']): if not auth.update('cn=%s,ou=groups' % groupname, new_group_list): - raise YunohostError('group_update_failed') + raise YunohostError('group_update_failed', group=groupname) - logger.success(m18n.n('group_updated')) + logger.success(m18n.n('group_updated', group=groupname)) if sync_perm: permission_sync_to_user(auth) return user_group_info(auth, groupname)