YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Specify group name in group-related messages

Browse source
This commit is contained in:
Alexandre Aubin 2019-03-05 00:44:16 +01:00
parent f845187230
commit d49b098e67
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
locales/en.json
View file

@ -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",

12
src/yunohost/user.py
View file

@ -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)