diff --git a/locales/en.json b/locales/en.json index 82a26a418..560ad30b5 100644 --- a/locales/en.json +++ b/locales/en.json @@ -4,10 +4,9 @@ "additional_urls_already_added": "Additionnal URL '{url}' already added in the additional URL for permission '{permission}'", "additional_urls_already_removed": "Additionnal URL '{url}' already removed in the additional URL for permission '{permission}'", "admin_password": "Administration password", - "admin_password_change_failed": "Unable to change password", - "admin_password_changed": "The administration password was changed", "already_up_to_date": "Nothing to do. Everything is already up-to-date.", "app_action_broke_system": "This action seems to have broken these important services: {services}", + "app_action_failed": "Failed to run action {action} for app {app}", "app_action_cannot_be_ran_because_required_services_down": "These required services should be running to run this action: {services}. Try restarting them to continue (and possibly investigate why they are down).", "app_already_installed": "{app} is already installed", "app_already_installed_cant_change_url": "This app is already installed. The URL cannot be changed just by this function. Check in `app changeurl` if it's available.", @@ -64,6 +63,7 @@ "apps_catalog_obsolete_cache": "The app catalog cache is empty or obsolete.", "apps_catalog_update_success": "The application catalog has been updated!", "apps_catalog_updating": "Updating application catalog...", + "ask_username": "Username", "ask_firstname": "First name", "ask_lastname": "Last name", "ask_main_domain": "Main domain", @@ -446,7 +446,6 @@ "invalid_number": "Must be a number", "invalid_number_max": "Must be lesser than {max}", "invalid_number_min": "Must be greater than {min}", - "invalid_password": "Invalid password", "invalid_regex": "Invalid regex:'{regex}'", "invalid_credentials": "Invalid password or username", "ip6tables_unavailable": "You cannot play with ip6tables here. You are either in a container or your kernel does not support it", @@ -541,6 +540,7 @@ "migration_description_0023_postgresql_11_to_13": "Migrate databases from PostgreSQL 11 to 13", "migration_description_0024_rebuild_python_venv": "Repair Python app after bullseye migration", "migration_description_0025_global_settings_to_configpanel": "Migrate legacy global settings nomenclature to the new, modern nomenclature", + "migration_description_0026_new_admins_group": "Migrate to the new 'multiple admins' system", "migration_ldap_backup_before_migration": "Creating a backup of LDAP database and apps settings prior to the actual migration.", "migration_ldap_can_not_backup_before_migration": "The backup of the system could not be completed before the migration failed. Error: {error}", "migration_ldap_migration_failed_trying_to_rollback": "Could not migrate... trying to roll back the system.", @@ -636,7 +636,6 @@ "restore_running_hooks": "Running restoration hooks...", "restore_system_part_failed": "Could not restore the '{part}' system part", "root_password_desynchronized": "The admin password was changed, but YunoHost could not propagate this to the root password!", - "root_password_replaced_by_admin_password": "Your root password have been replaced by your admin password.", "server_reboot": "The server will reboot", "server_reboot_confirm": "The server will reboot immediatly, are you sure? [{answers}]", "server_shutdown": "The server will shut down", diff --git a/share/actionsmap.yml b/share/actionsmap.yml index 78271b4cc..7417bb98d 100644 --- a/share/actionsmap.yml +++ b/share/actionsmap.yml @@ -1514,12 +1514,14 @@ tools: required: True -f: full: --firstname + help: Firstname for the first (admin) user extra: ask: ask_firstname required: True pattern: *pattern_firstname -l: full: --lastname + help: Lastname for the first (admin) user extra: ask: ask_lastname required: True diff --git a/src/app.py b/src/app.py index 9af21df7f..a90584157 100644 --- a/src/app.py +++ b/src/app.py @@ -1664,7 +1664,7 @@ ynh_app_config_run $1 elif action == "apply": raise YunohostError("app_config_unable_to_apply") else: - raise YunohostError("app_action_failed", action=action) + raise YunohostError("app_action_failed", action=action, app=app) return values diff --git a/src/domain.py b/src/domain.py index 14b28940a..2e82ab199 100644 --- a/src/domain.py +++ b/src/domain.py @@ -513,6 +513,9 @@ class DomainConfigPanel(ConfigPanel): # i18n: domain_config_cert_summary_letsencrypt toml["cert"]["status"]["cert_summary"]["ask"] = m18n.n(f"domain_config_cert_summary_{status['summary']}") + # Other specific strings used in config panels + # i18n: domain_config_cert_renew_help + # FIXME: Ugly hack to save the cert status and reinject it in _load_current_values ... self.cert_status = status diff --git a/src/utils/password.py b/src/utils/password.py index 42ed45ddd..f55acf5c0 100644 --- a/src/utils/password.py +++ b/src/utils/password.py @@ -61,7 +61,7 @@ def assert_password_is_compatible(password): # as well as modules available in python's path. from yunohost.utils.error import YunohostValidationError - raise YunohostValidationError("admin_password_too_long") + raise YunohostValidationError("password_too_long") def assert_password_is_strong_enough(profile, password):