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

Misc fixes/improvements for i18n strings

Browse source
This commit is contained in:
Alexandre Aubin 2019-09-11 23:18:23 +02:00
parent 38c43f4b9a
commit d5b2fb7a71
3 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
locales/en.json
View file

@ -228,19 +228,19 @@
"global_settings_unknown_type": "Unexpected situation, the setting {setting:s} appears to have the type {unknown_type:s} but it's not a type supported by the system.",
"good_practices_about_admin_password": "You are now about to define a new administration password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).",
"good_practices_about_user_password": "You are now about to define a new user password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).",
"group_already_allowed": "Group '{group:s}' already has permission '{permission:s}' enabled'",
"group_already_disallowed": "Group '{group:s}' already has permission '{permission:s}' disabled'",
"group_name_already_exist": "Group {name:s} already exist",
"group_already_exist": "Group {group} already exist",
"group_already_exist_on_system": "Group {group} already exists in the system group",
"group_created": "Group '{group}' successfully created",
"group_creation_failed": "Group creation failed for group '{group}'",
"group_cannot_be_edited": "The group {group:s} cannot be edited manually.",
"group_cannot_be_deleted": "The group {group:s} cannot be deleted manually.",
"group_cannot_be_edited": "The group {group} cannot be edited manually.",
"group_cannot_be_deleted": "The group {group} cannot be deleted manually.",
"group_deleted": "Group '{group}' deleted",
"group_deletion_failed": "Group '{group} 'deletion failed",
"group_info_failed": "Group info failed",
"group_unknown": "Group {group:s} unknown",
"group_unknown": "Group {group} unknown",
"group_updated": "Group '{group}' updated",
"group_update_failed": "Group update failed for group '{group}'",
"group_user_already_in_group": "User {user} is already in group {group}",
"group_user_not_in_group": "User {user} is not in group {group}",
"hook_exec_failed": "Script execution failed: {path:s}",
"hook_exec_not_terminated": "Script execution did not finish properly: {path:s}",
"hook_json_return_error": "Failed to read return from hook {path:s}. Error: {msg:s}. Raw content: {raw_content}",
@ -426,22 +426,23 @@
"pattern_positive_number": "Must be a positive number",
"pattern_username": "Must be lower-case alphanumeric and underscore characters only",
"pattern_password_app": "Sorry, passwords should not contain the following characters: {forbidden_chars}",
"permission_already_exist": "Permission '{permission:s}' for app {app:s} already exist",
"permission_created": "Permission '{permission:s}' for app {app:s} created",
"permission_creation_failed": "Permission creation failed",
"permission_deleted": "Permission '{permission:s}' for app {app:s} deleted",
"permission_deletion_failed": "Permission '{permission:s}' for app {app:s} deletion failed",
"permission_not_found": "Permission '{permission:s}' not found for application {app:s}",
"permission_update_failed": "Permission update failed",
"permission_generated": "The permission database has been updated",
"permission_updated": "Permission '{permission:s}' for app {app:s} updated",
"permission_already_allowed": "Group '{group}' already has permission '{permission}' enabled'",
"permission_already_disallowed": "Group '{group}' already has permission '{permission}' disabled'",
"permission_already_exist": "Permission '{permission}' already exists",
"permission_cannot_remove_main": "Removing a main permission is not allowed",
"permission_created": "Permission '{permission}' created",
"permission_creation_failed": "Failed to create permission '{permission}'",
"permission_deleted": "Permission '{permission}' deleted",
"permission_deletion_failed": "Failed to delete permission '{permission}'",
"permission_not_found": "Permission '{permission}' does not seem to exist ?",
"permission_update_failed": "Failed to update permission '{permission}'",
"permission_updated": "Permission '{permission}' updated",
"permission_update_nothing_to_do": "No permissions to update",
"port_already_closed": "Port {port:d} is already closed for {ip_version:s} connections",
"port_already_opened": "Port {port:d} is already opened for {ip_version:s} connections",
"port_available": "Port {port:d} is available",
"port_unavailable": "Port {port:d} is not available",
"recommend_to_add_first_user": "The post-install is finished but YunoHost needs at least one user to work correctly, you should add one using 'yunohost user create <username>' or the admin interface.",
"remove_main_permission_not_allowed": "Removing the main permission is not allowed",
"regenconf_file_backed_up": "The configuration file '{conf}' has been backed up to '{backup}'",
"regenconf_file_copy_failed": "Unable to copy the new configuration file '{new}' to '{conf}'",
"regenconf_file_kept_back": "The configuration file '{conf}' is expected to be deleted by regen-conf (category {category}) but has been kept back.",
@ -527,7 +528,6 @@
"ssowat_conf_updated": "The SSOwat configuration has been updated",
"ssowat_persistent_conf_read_error": "Error while reading SSOwat persistent configuration: {error:s}. Edit /etc/ssowat/conf.json.persistent file to fix the JSON syntax",
"ssowat_persistent_conf_write_error": "Error while saving SSOwat persistent configuration: {error:s}. Edit /etc/ssowat/conf.json.persistent file to fix the JSON syntax",
"system_groupname_exists": "Groupname already exists in the system group",
"system_upgraded": "The system has been upgraded",
"system_username_exists": "Username already exists in the system users",
"this_action_broke_dpkg": "This action broke dpkg/apt (the system package managers)... You can try to solve this issue by connecting through SSH and running `sudo dpkg --configure -a`.",
@ -556,14 +556,12 @@
"upnp_disabled": "UPnP has been disabled",
"upnp_enabled": "UPnP has been enabled",
"upnp_port_open_failed": "Unable to open UPnP ports",
"user_already_in_group": "User {user:} already in group {group:s}",
"user_created": "The user has been created",
"user_creation_failed": "Unable to create user",
"user_deleted": "The user has been deleted",
"user_deletion_failed": "Unable to delete user",
"user_home_creation_failed": "Unable to create user home folder",
"user_info_failed": "Unable to retrieve user information",
"user_not_in_group": "User {user:s} not in group {group:s}",
"user_unknown": "Unknown user: {user:s}",
"user_update_failed": "Unable to update user",
"user_updated": "The user has been updated",

16
src/yunohost/permission.py
View file

@ -111,7 +111,7 @@ def user_permission_update(operation_logger, permission, add=None, remove=None,
if group not in all_existing_groups:
raise YunohostError('group_unknown', group=group)
if group in current_allowed_groups:
logger.warning(m18n.n('group_already_allowed', permission=permission, group=group))
logger.warning(m18n.n('permission_already_allowed', permission=permission, group=group))
else:
operation_logger.related_to.append(('group', group))
@ -123,7 +123,7 @@ def user_permission_update(operation_logger, permission, add=None, remove=None,
if group not in all_existing_groups:
raise YunohostError('group_unknown', group=group)
if group not in current_allowed_groups:
logger.warning(m18n.n('group_already_disallowed', permission=permission, group=group))
logger.warning(m18n.n('permission_already_disallowed', permission=permission, group=group))
else:
operation_logger.related_to.append(('group', group))
@ -177,7 +177,7 @@ def user_permission_update(operation_logger, permission, add=None, remove=None,
return new_permission
else:
raise YunohostError('permission_update_failed')
raise YunohostError('permission_update_failed', permission=permission)
@is_unit_operation()
@ -207,7 +207,7 @@ def user_permission_reset(operation_logger, permission, sync_perm=True):
if ldap.update('cn=%s,ou=permission' % permission, default_permission):
logger.debug(m18n.n('permission_updated', permission=permission))
else:
raise YunohostError('permission_update_failed')
raise YunohostError('permission_update_failed', permission=permission)
if sync_perm:
permission_sync_to_user()
@ -337,7 +337,7 @@ def permission_urls(operation_logger, permission, add=None, remove=None, sync_pe
logger.debug(m18n.n('permission_updated', permission=permission))
return user_permission_list(full=True)["permissions"][permission]
else:
raise YunohostError('premission_update_failed')
raise YunohostError('permission_update_failed', permission=permission)
@is_unit_operation()
@ -350,7 +350,7 @@ def permission_delete(operation_logger, permission, force=False, sync_perm=True)
"""
if permission.endswith("main") and not force:
raise YunohostError('remove_main_permission_not_allowed')
raise YunohostError('permission_cannot_remove_main')
from yunohost.utils.ldap import _get_ldap_interface
ldap = _get_ldap_interface()
@ -406,9 +406,9 @@ def permission_sync_to_user():
# Commit the change with the new inherited stuff
if not ldap.update('cn=%s,ou=permission' % permission_name, new_inherited_perms):
raise YunohostError('permission_update_failed')
raise YunohostError('permission_update_failed', permission=permission_name)
logger.debug(m18n.n('permission_generated'))
logger.debug("The permission database has been resynchronized")
app_ssowatconf()

8
src/yunohost/user.py
View file

@ -544,12 +544,12 @@ def user_group_create(operation_logger, groupname, gid=None, primary_group=False
'cn': groupname
}, base_dn='ou=groups,dc=yunohost,dc=org')
if conflict:
raise YunohostError('group_name_already_exist', name=groupname)
raise YunohostError('group_already_exist', group=groupname)
# Validate uniqueness of groupname in system group
all_existing_groupnames = {x.gr_name for x in grp.getgrall()}
if groupname in all_existing_groupnames:
raise YunohostError('system_groupname_exists')
raise YunohostError('group_already_exist_on_system', group=groupname)
if not gid:
# Get random GID
@ -648,7 +648,7 @@ def user_group_update(operation_logger, groupname, add=None, remove=None, force=
raise YunohostError('user_unknown', user=user)
if user in current_group:
logger.warning(m18n.n('user_already_in_group', user=user, group=groupname))
logger.warning(m18n.n('group_user_already_in_group', user=user, group=groupname))
else:
operation_logger.related_to.append(('user', user))
@ -659,7 +659,7 @@ def user_group_update(operation_logger, groupname, add=None, remove=None, force=
for user in users_to_remove:
if user not in current_group:
logger.warning(m18n.n('user_not_in_group', user=user, group=groupname))
logger.warning(m18n.n('group_user_not_in_group', user=user, group=groupname))
else:
operation_logger.related_to.append(('user', user))