From 133d8b60c1955a0da54efd8fd9353bf9f8931519 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 6 Aug 2022 13:03:28 +0200 Subject: [PATCH] global settings: misc naming/ui/ux/i18n improvements --- hooks/conf_regen/15-nginx | 2 +- locales/en.json | 10 +++++----- locales/fr.json | 5 +++-- share/config_global.toml | 11 ++++++----- src/utils/legacy.py | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/hooks/conf_regen/15-nginx b/hooks/conf_regen/15-nginx index 482784d8d..fe5154cb9 100755 --- a/hooks/conf_regen/15-nginx +++ b/hooks/conf_regen/15-nginx @@ -56,7 +56,7 @@ do_pre_regen() { # install / update plain conf files cp plain/* "$nginx_conf_dir" # remove the panel overlay if this is specified in settings - panel_overlay=$(yunohost settings get 'misc.ssowat.ssowat_panel_overlay_enabled') + panel_overlay=$(yunohost settings get 'misc.portal.ssowat_panel_overlay_enabled') if [ "$panel_overlay" == "false" ] || [ "$panel_overlay" == "False" ]; then echo "#" >"${nginx_conf_dir}/yunohost_panel.conf.inc" fi diff --git a/locales/en.json b/locales/en.json index 6cfab9109..1180415ad 100644 --- a/locales/en.json +++ b/locales/en.json @@ -386,10 +386,10 @@ "global_settings_setting_smtp_allow_ipv6_help": "Allow the use of IPv6 to receive and send mail", "global_settings_setting_smtp_relay_enabled": "Enable SMTP relay", "global_settings_setting_smtp_relay_enabled_help": "Enable the SMTP relay to use in order to send mail instead of this yunohost instance. Useful if you are in one of this situation: your 25 port is blocked by your ISP or VPS provider, you have a residential IP listed on DUHL, you are not able to configure reverse DNS or this server is not directly exposed on the internet and you want use an other one to send mails.", - "global_settings_setting_smtp_relay_host": "Relay host", - "global_settings_setting_smtp_relay_password": "Relay password", - "global_settings_setting_smtp_relay_port": "Relay port", - "global_settings_setting_smtp_relay_user": "Relay user", + "global_settings_setting_smtp_relay_host": "SMTP relay host", + "global_settings_setting_smtp_relay_password": "SMTP relay password", + "global_settings_setting_smtp_relay_port": "SMTP relay port", + "global_settings_setting_smtp_relay_user": "SMTP relay user", "global_settings_setting_ssh_allow_deprecated_dsa_hostkey": "Allow DSA hostkey", "global_settings_setting_ssh_allow_deprecated_dsa_hostkey_help": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration", "global_settings_setting_ssh_compatibility": "SSH Compatibility", @@ -397,7 +397,7 @@ "global_settings_setting_ssh_password_authentication": "Password authentication", "global_settings_setting_ssh_password_authentication_help": "Allow password authentication for SSH", "global_settings_setting_ssh_port": "SSH port", - "global_settings_setting_ssowat_panel_overlay_enabled": "SSOwat panel overlay", + "global_settings_setting_ssowat_panel_overlay_enabled": "Enable the small 'YunoHost' portal shortcut square on apps", "global_settings_setting_user_strength": "User password strength", "global_settings_setting_user_strength_help": "These requirements are only enforced when defining the password", "global_settings_setting_webadmin_allowlist": "Webadmin IP allowlist", diff --git a/locales/fr.json b/locales/fr.json index a5ee23720..fd807c8a5 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -535,12 +535,13 @@ "app_manifest_install_ask_password": "Choisissez un mot de passe administrateur pour cette application", "app_manifest_install_ask_path": "Choisissez le chemin d'URL (après le domaine) où cette application doit être installée", "app_manifest_install_ask_domain": "Choisissez le domaine sur lequel vous souhaitez installer cette application", + "global_settings_setting_smtp_relay_host": "Adresse du relais SMTP", "global_settings_setting_smtp_relay_user": "Compte utilisateur du relais SMTP", "global_settings_setting_smtp_relay_port": "Port du relais SMTP", "diagnosis_package_installed_from_sury_details": "Certains paquets ont été installés par inadvertance à partir d'un dépôt tiers appelé Sury. L'équipe YunoHost a amélioré la stratégie de gestion de ces paquets, mais on s'attend à ce que certaines configurations qui ont installé des applications PHP7.3 tout en étant toujours sur Stretch présentent des incohérences. Pour résoudre cette situation, vous devez essayer d'exécuter la commande suivante : {cmd_to_fix}", "app_argument_password_no_default": "Erreur lors de l'analyse de l'argument de mot de passe '{name}' : l'argument de mot de passe ne peut pas avoir de valeur par défaut pour des raisons de sécurité", "pattern_email_forward": "L'adresse électronique doit être valide, le symbole '+' étant accepté (par exemple : johndoe+yunohost@exemple.com)", - "global_settings_setting_smtp_relay_password": "Mot de passe du relais de l'hôte SMTP", + "global_settings_setting_smtp_relay_password": "Mot de passe du relais SMTP", "diagnosis_package_installed_from_sury": "Des paquets du système devraient être rétrogradé de version", "additional_urls_already_added": "URL supplémentaire '{url}' déjà ajoutée pour la permission '{permission}'", "unknown_main_domain_path": "Domaine ou chemin inconnu pour '{app}'. Vous devez spécifier un domaine et un chemin pour pouvoir spécifier une URL pour l'autorisation.", @@ -562,7 +563,7 @@ "app_restore_script_failed": "Une erreur s'est produite dans le script de restauration de l'application", "restore_backup_too_old": "Cette sauvegarde ne peut pas être restaurée car elle provient d'une version de YunoHost trop ancienne.", "log_backup_create": "Création d'une archive de sauvegarde", - "global_settings_setting_ssowat_panel_overlay_enabled": "Activer la superposition de la vignette SSOwat", + "global_settings_setting_ssowat_panel_overlay_enabled": "Activer la vignette 'YunoHost' (raccourci vers le portail) sur les apps", "migration_ldap_rollback_success": "Système rétabli dans son état initial.", "permission_cant_add_to_all_users": "L'autorisation {permission} ne peut pas être ajoutée à tous les utilisateurs.", "migration_ldap_migration_failed_trying_to_rollback": "Impossible de migrer... tentative de restauration du système.", diff --git a/share/config_global.toml b/share/config_global.toml index 775f02cdf..49a674627 100644 --- a/share/config_global.toml +++ b/share/config_global.toml @@ -43,7 +43,7 @@ name = "Security" default = false [security.nginx] - name = "NGINX" + name = "NGINX (web server)" [security.nginx.nginx_redirect_to_https] type = "boolean" default = true @@ -55,7 +55,7 @@ name = "Security" default = "intermediate" [security.postfix] - name = "Postfix" + name = "Postfix (SMTP email server)" [security.postfix.postfix_compatibility] type = "select" choices.intermediate = "Intermediate (allows TLS 1.2)" @@ -121,12 +121,13 @@ name = "Email" default = "" optional = true visible="smtp_relay_enabled" + help = "" # This is empty string on purpose, otherwise the core automatically set the 'good_practice_admin_password' string here which is not relevant, because the admin is not actually "choosing" the password ... [misc] name = "Other" - [misc.ssowat] - name = "SSOwat" - [misc.ssowat.ssowat_panel_overlay_enabled] + [misc.portal] + name = "User portal" + [misc.portal.ssowat_panel_overlay_enabled] type = "boolean" default = true diff --git a/src/utils/legacy.py b/src/utils/legacy.py index 4742318cb..1ef3c1023 100644 --- a/src/utils/legacy.py +++ b/src/utils/legacy.py @@ -79,7 +79,7 @@ LEGACY_SETTINGS = { "smtp.relay.user": "email.smtp.smtp_relay_user", "smtp.relay.password": "email.smtp.smtp_relay_password", "backup.compress_tar_archives": "misc.backup.backup_compress_tar_archives", - "ssowat.panel_overlay.enabled": "misc.ssowat.ssowat_panel_overlay_enabled", + "ssowat.panel_overlay.enabled": "misc.portal.ssowat_panel_overlay_enabled", "security.webadmin.allowlist.enabled": "security.webadmin.webadmin_allowlist_enabled", "security.webadmin.allowlist": "security.webadmin.webadmin_allowlist", "security.experimental.enabled": "security.experimental.security_experimental_enabled"