diff --git a/templates/500.html b/templates/500.html index c8507fd5ea..b6d65baeaf 100644 --- a/templates/500.html +++ b/templates/500.html @@ -14,27 +14,35 @@
- {% trans %} - Your Zulip chat cannot be loaded because the server is experiencing technical difficulties. - {% endtrans %} -
-- {% trans %} - This page will reload automatically when service is restored. - {% endtrans %} - {% if corporate_enabled %} + {% if corporate_enabled %} + +
{% trans %} - In the meantime, you can contact Zulip support. + Something went wrong. Sorry about that! We're aware of + the problem and are working to fix it. + Zulip will load automatically once it is working again. {% endtrans %} - {% else %} +
++ {% trans status_url="https://status.zulip.com/" %} + Please check Zulip Cloud status for + more information, and contact + Zulip support with any questions. + {% endtrans %} +
+ {% else %} + +{% trans %} - In the meantime, you can contact - this server's administrators for support. + Something went wrong. Sorry about that! + Zulip will load automatically once it is working again. {% endtrans %} - {% endif %} -
- {% if not corporate_enabled %} + ++ {% trans %} + Contact this server's administrators for support. + {% endtrans %} +
{% trans troubleshooting_url="https://zulip.readthedocs.io/en/latest/production/troubleshooting.html" %}
If you administer this server, you may want to check out the
diff --git a/web/html/5xx-cloud.html b/web/html/5xx-cloud.html
index 921e08e9d9..8929364f7e 100644
--- a/web/html/5xx-cloud.html
+++ b/web/html/5xx-cloud.html
@@ -22,10 +22,19 @@
Zulip Cloud is currently experiencing some technical difficulties. Sorry about that!
-You can check our status page for more information.
-The page will reload automatically soon after service is restored.
++ Something went wrong. Sorry about that! We're + aware of the problem and are working to fix + it. Zulip will load automatically once it is + working again. +
++ Please check Zulip Cloud status for + more information, and contact + Zulip support with any questions. +
This Zulip server is currently experiencing some technical difficulties. Sorry about that!
-The page will reload automatically soon after service is restored.
++ Something went wrong. Sorry about that! + Zulip will load automatically once it is working again. +
+If you administer this server, you may want to check out the + Zulip server troubleshooting guide. +