From cc2288cc215e06ce38168d7669c513517af383a2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 21 Mar 2020 23:08:24 +0100 Subject: [PATCH] Rename http diagnoser to web, should feel slightly less technical --- data/hooks/diagnosis/{16-http.py => 21-web.py} | 4 ++-- data/hooks/diagnosis/{18-mail.py => 24-mail.py} | 0 locales/en.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename data/hooks/diagnosis/{16-http.py => 21-web.py} (96%) rename data/hooks/diagnosis/{18-mail.py => 24-mail.py} (100%) diff --git a/data/hooks/diagnosis/16-http.py b/data/hooks/diagnosis/21-web.py similarity index 96% rename from data/hooks/diagnosis/16-http.py rename to data/hooks/diagnosis/21-web.py index c7955c805..f7922fdd7 100644 --- a/data/hooks/diagnosis/16-http.py +++ b/data/hooks/diagnosis/21-web.py @@ -9,7 +9,7 @@ from yunohost.domain import domain_list from yunohost.utils.error import YunohostError -class HttpDiagnoser(Diagnoser): +class WebDiagnoser(Diagnoser): id_ = os.path.splitext(os.path.basename(__file__))[0].split("-")[1] cache_duration = 3600 @@ -56,4 +56,4 @@ class HttpDiagnoser(Diagnoser): def main(args, env, loggers): - return HttpDiagnoser(args, env, loggers).diagnose() + return WebDiagnoser(args, env, loggers).diagnose() diff --git a/data/hooks/diagnosis/18-mail.py b/data/hooks/diagnosis/24-mail.py similarity index 100% rename from data/hooks/diagnosis/18-mail.py rename to data/hooks/diagnosis/24-mail.py diff --git a/locales/en.json b/locales/en.json index c6dfb99af..d70f964d2 100644 --- a/locales/en.json +++ b/locales/en.json @@ -203,7 +203,7 @@ "diagnosis_description_services": "Services status check", "diagnosis_description_systemresources": "System resources", "diagnosis_description_ports": "Ports exposure", - "diagnosis_description_http": "HTTP exposure", + "diagnosis_description_web": "Web", "diagnosis_description_mail": "Email", "diagnosis_description_regenconf": "System configurations", "diagnosis_description_security": "Security checks", @@ -213,12 +213,12 @@ "diagnosis_ports_needed_by": "Exposing this port is needed for {1} features (service {0})", "diagnosis_ports_forwarding_tip": "To fix this issue, you most probably need to configure port forwarding on your internet router as described in https://yunohost.org/isp_box_config", "diagnosis_http_could_not_diagnose": "Could not diagnose if domain is reachable from outside. Error: {error}", - "diagnosis_http_ok": "Domain {domain} is reachable from outside.", + "diagnosis_http_ok": "Domain {domain} is reachable through HTTP from outside the local network.", "diagnosis_http_timeout": "Timed-out while trying to contact your server from outside. It appears to be unreachable. You should check that you're correctly forwarding port 80, that nginx is running, and that a firewall is not interfering.", "diagnosis_http_connection_error": "Connection error: could not connect to the requested domain, it's very likely unreachable.", "diagnosis_http_unknown_error": "An error happened while trying to reach your domain, it's very likely unreachable.", "diagnosis_http_bad_status_code": "The diagnosis system could not reach your server. It might be that another machine answered instead of your server. You should check that you're correctly forwarding port 80, that your nginx configuration is up to date, and that a reverse-proxy is not interfering.", - "diagnosis_http_unreachable": "Domain {domain} is unreachable through HTTP from outside.", + "diagnosis_http_unreachable": "Domain {domain} appears unreachable through HTTP from outside the local network.", "diagnosis_unknown_categories": "The following categories are unknown: {categories}", "diagnosis_never_ran_yet": "It looks like this server was setup recently and there's no diagnosis report to show yet. You should start by running a full diagnosis, either from the webadmin or using 'yunohost diagnosis run' from the command line.", "domain_cannot_remove_main": "You cannot remove '{domain:s}' since it's the main domain, you first need to set another domain as the main domain using 'yunohost domain main-domain -n '; here is the list of candidate domains: {other_domains:s}",