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

Typo / wording

Browse source
This commit is contained in:
Alexandre Aubin 2019-01-19 21:07:06 +00:00
parent 022d3922c1
commit 3a6f7cbc97
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
locales/en.json
View file

@ -211,8 +211,8 @@
"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_alread_allowed": "Group '{group:s}' already allowed to access to permission '{permission:s}' for app '{app:s}'",
"group_alread_disallowed": "Group '{group:s}' already disallowed to access to permission '{permission:s}' for app '{app:s}'",
"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",
@ -220,9 +220,9 @@
"group_deletion_failed": "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": "Groupe {group:s} unknown",
"group_updated": "Groupe updated",
"group_update_failed": "groupe update failed",
"group_unknown": "Group {group:s} unknown",
"group_updated": "Group updated",
"group_update_failed": "Group update failed",
"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",
@ -274,7 +274,7 @@
"log_user_group_update": "Update '{}' group",
"log_user_update": "Update information of '{}' user",
"log_user_permission_add": "Update '{}' permission",
"log_user_permission_remove": "Update '{}' permisson",
"log_user_permission_remove": "Update '{}' permission",
"log_tools_maindomain": "Make '{}' as main domain",
"log_tools_migrations_migrate_forward": "Migrate forward",
"log_tools_migrations_migrate_backward": "Migrate backward",
@ -336,13 +336,13 @@
"migration_0008_warning": "If you understand those warnings and agree to let YunoHost override your current configuration, run the migration. Otherwise, you can also skip the migration - though it is not recommended.",
"migration_0008_no_warning": "No major risk has been indentified about overriding your SSH configuration - but we can't be absolutely sure ;)! If you agree to let YunoHost override your current configuration, run the migration. Otherwise, you can also skip the migration - though it is not recommended.",
"migration_0009_backup_before_migration": "Make a backup of LDAP and apps settings before the migration",
"migration_0009_can_not_backup_before_migration": "The backup of the system before the migration failled. Migration failed. Error : {error:s}",
"migration_0009_can_not_backup_before_migration": "The backup of the system before the migration failed. Migration failed. Error: {error:s}",
"migration_0009_create_group": "Create group for each user.",
"migration_0009_done": "Migration sucess. You are now able to use groups of user.",
"migration_0009_failled": "Migration failed.",
"migration_0009_LDAP_update_failled": "LDAP update failled. Error : {error:s}",
"migration_0009_failed": "Migration failed.",
"migration_0009_LDAP_update_failed": "LDAP update failed. Error: {error:s}",
"migration_0009_migrate_permission": "Migrate permission from apps settings to LDAP",
"migration_0009_migration_failled_try_rollback": "Migration failed. Try to restore the system. Error : {error:s}",
"migration_0009_migration_failed_try_rollback": "Migration failed. Try to restore the system. Error: {error:s}",
"migration_0009_rollback_success": "System restored.",
"migration_0009_update_LDAP_database": "Update LDAP database for groups and permission support",
"migration_0009_update_LDAP_schema": "Update LDAP schema",
@ -374,7 +374,7 @@
"mysql_db_creation_failed": "MySQL database creation failed",
"mysql_db_init_failed": "MySQL database init failed",
"mysql_db_initialized": "The MySQL database has been initialized",
"need_define_permission_before": "You need to redefine the permission by 'yunohost user permission add -u USER' before to remove an allowed group",
"need_define_permission_before": "You need to redefine the permission using 'yunohost user permission add -u USER' before removing an allowed group",
"network_check_mx_ko": "DNS MX record is not set",
"network_check_smtp_ko": "Outbound mail (SMTP port 25) seems to be blocked by your network",
"network_check_smtp_ok": "Outbound mail (SMTP port 25) is not blocked",
@ -411,7 +411,7 @@
"permission_already_clear": "Permission '{permission:s}' already clear for app {app:s}",
"permission_already_exist": "Permission '{permission:s}' for app {app:s} already exist",
"permission_created": "Permission '{permission:s}' for app {app:s} created",
"permission_creation_failled": "Permission creation failed",
"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}",
@ -419,7 +419,7 @@
"permission_update_failed": "Permission update failed",
"permission_generated": "Permission updated",
"permission_updated": "Permission '{permission:s}' for app {app:s} updated",
"permission_update_nothing_to_do": "Permission update nothing to do",
"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",
@ -527,7 +527,7 @@
"upnp_disabled": "UPnP has been disabled",
"upnp_enabled": "UPnP has been enabled",
"upnp_port_open_failed": "Unable to open UPnP ports",
"user_alread_in_group": "User {user:} already in group {group:s}",
"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",

6
src/yunohost/data_migrations/0009_setup_group_permission.py
View file

@ -42,7 +42,7 @@ def migrate_LDAP_db(auth):
for rdn, attr_dict in ldap_map['depends_children'].items():
auth.add(rdn, attr_dict)
except Exception as e:
raise YunohostError("migration_0009_LDAP_update_failled", error=e)
raise YunohostError("migration_0009_LDAP_update_failed", error=e)
logger.info(m18n.n("migration_0009_create_group"))
@ -126,7 +126,7 @@ class MyMigration(Migration):
permission_sync_to_user(auth)
except Exception as e:
logger.warn(m18n.n("migration_0009_migration_failled_try_rollback", error=e))
logger.warn(m18n.n("migration_0009_migration_failed_try_rollback", error=e))
os.system("systemctl stop slapd")
os.system("rm -r /etc/ldap/slapd.d") # To be sure that we don't keep some part of the old config
os.system("cp -r --preserve %s/ldap_config/. /etc/ldap/" % backup_folder)
@ -135,7 +135,7 @@ class MyMigration(Migration):
os.system("systemctl start slapd")
os.system("rm -r " + backup_folder)
logger.info(m18n.n("migration_0009_rollback_success"))
raise YunohostError("migration_0009_failled")
raise YunohostError("migration_0009_failed")
os.system("rm -r " + backup_folder)

8
src/yunohost/permission.py
View file

@ -204,7 +204,7 @@ def user_permission_update(operation_logger, auth, app=[], permission=None, add_
raise YunohostError('need_define_permission_before')
group_name = 'cn=' + g + ',ou=groups,dc=yunohost,dc=org'
if not group_name in new_per_dict[permission_name]:
logger.warning(m18n.n('group_alread_disallowed', permission=per, app=a, group=g))
logger.warning(m18n.n('group_already_disallowed', permission=per, app=a, group=g))
else:
new_per_dict[permission_name].remove(group_name)
@ -213,7 +213,7 @@ def user_permission_update(operation_logger, auth, app=[], permission=None, add_
for g in add_group:
group_name = 'cn=' + g + ',ou=groups,dc=yunohost,dc=org'
if group_name in new_per_dict[permission_name]:
logger.warning(m18n.n('group_alread_allowed', permission=per, app=a, group=g))
logger.warning(m18n.n('group_already_allowed', permission=per, app=a, group=g))
else:
new_per_dict[permission_name].add(group_name)
@ -363,7 +363,7 @@ def permission_add(operation_logger, auth, app, permission, urls=None, default_a
logger.success(m18n.n('permission_created', permission=permission, app=app))
return user_permission_list(auth, app, permission)
raise YunohostError('permission_creation_failled')
raise YunohostError('permission_creation_failed')
@is_unit_operation(['permission','app'])
@ -418,7 +418,7 @@ def permission_update(operation_logger, auth, app, permission, add_url=None, rem
logger.success(m18n.n('permission_updated', permission=permission, app=app))
return user_permission_list(auth, app, permission)
raise YunohostError('premission_update_failled')
raise YunohostError('premission_update_failed')
@is_unit_operation(['permission','app'])

2
src/yunohost/user.py
View file

@ -648,7 +648,7 @@ def user_group_update(operation_logger, auth, groupname, add_user=None, remove_u
raise YunohostError('user_unknown', user=user)
userDN = "uid=" + user + ",ou=users,dc=yunohost,dc=org"
if userDN in group['member']:
logger.warning(m18n.n('user_alread_in_group', user=user, group=groupname))
logger.warning(m18n.n('user_already_in_group', user=user, group=groupname))
new_group_list['member'].add(userDN)
if remove_user: