diff --git a/static/html/5xx.html b/static/html/5xx.html index 164fd73e26..77db2c22b1 100644 --- a/static/html/5xx.html +++ b/static/html/5xx.html @@ -2,7 +2,7 @@ - Zulip - 500 internal server error + 500 internal server error | Zulip diff --git a/templates/404.html b/templates/404.html index 7b0b07a1c4..657069a569 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,5 +1,9 @@ {% extends "zerver/portico.html" %} +{% block title %} +{{ _("Error") }} | Zulip +{% endblock %} + {% block portico_class_name %}error{% endblock %} {% block portico_content %} @@ -10,13 +14,15 @@
{% if status_code == 405 %} -

Method not allowed (405)

+

{{ _("Method not allowed (405)") }}

{% else %} -

Page not found (404)

+

{{ _("Page not found (404)") }}

{% endif %}

+ {% trans %} If this error is unexpected, you can contact support. + {% endtrans %}

diff --git a/templates/500.html b/templates/500.html index c4e889c347..03eb8ba1de 100644 --- a/templates/500.html +++ b/templates/500.html @@ -1,5 +1,9 @@ {% extends "zerver/portico.html" %} +{% block title %} +{{ _("Internal server error") }} | Zulip +{% endblock %} + {% block customhead %} {{ super() }} @@ -14,10 +18,12 @@
-

Internal server error

+

{{ _("Internal server error") }}

+ {% trans %}

This Zulip server is currently experiencing some technical difficulties. Sorry about that!

The page will reload automatically soon after service is restored.

If you'd like, you can drop us a line to let us know what happened.

+ {% endtrans %}
diff --git a/templates/analytics/activity.html b/templates/analytics/activity.html index 56c75e6656..afa4e0d7ec 100644 --- a/templates/analytics/activity.html +++ b/templates/analytics/activity.html @@ -4,7 +4,7 @@ {# User activity. #} {% block title %} -{{ title }} +{{ title }} | Zulip analytics {% endblock %} diff --git a/templates/analytics/stats.html b/templates/analytics/stats.html index d0efe9235c..2b95f00912 100644 --- a/templates/analytics/stats.html +++ b/templates/analytics/stats.html @@ -1,6 +1,14 @@ {% extends "zerver/base.html" %} {% set entrypoint = "stats" %} +{% block title %} + + {% trans %} + Analytics for {{ target_name }} | Zulip + {% endtrans %} + +{% endblock %} + {% block content %}
diff --git a/templates/analytics/support.html b/templates/analytics/support.html index ed3e9b036e..a30cf9e10d 100644 --- a/templates/analytics/support.html +++ b/templates/analytics/support.html @@ -4,7 +4,7 @@ {# User activity. #} {% block title %} -Info +Support panel | Zulip {% endblock %} {% block content %} diff --git a/templates/confirmation/confirm_email_change.html b/templates/confirmation/confirm_email_change.html index 79578da446..8b8e2e4748 100644 --- a/templates/confirmation/confirm_email_change.html +++ b/templates/confirmation/confirm_email_change.html @@ -1,5 +1,9 @@ {% extends "zerver/portico.html" %} +{% block title %} +{{ _("Email changed") }} | Zulip +{% endblock %} + {% block portico_content %}
diff --git a/templates/confirmation/confirm_preregistrationuser.html b/templates/confirmation/confirm_preregistrationuser.html index 3b812d78a6..fba8331e38 100644 --- a/templates/confirmation/confirm_preregistrationuser.html +++ b/templates/confirmation/confirm_preregistrationuser.html @@ -1,6 +1,10 @@ {% extends "zerver/base.html" %} {% set entrypoint = "confirm-preregistrationuser" %} +{% block title %} +{{ _("Confirming your email address") }} | Zulip +{% endblock %} + {% block content %} {# diff --git a/templates/confirmation/link_does_not_exist.html b/templates/confirmation/link_does_not_exist.html index bdfad5d304..d12d8ec231 100644 --- a/templates/confirmation/link_does_not_exist.html +++ b/templates/confirmation/link_does_not_exist.html @@ -1,5 +1,9 @@ {% extends "zerver/portico.html" %} +{% block title %} +{{ _("Confirmation link does not exist") }} | Zulip +{% endblock %} + {% block portico_content %}
diff --git a/templates/confirmation/link_expired.html b/templates/confirmation/link_expired.html index 892441e5ca..d16d2eb75e 100644 --- a/templates/confirmation/link_expired.html +++ b/templates/confirmation/link_expired.html @@ -1,5 +1,9 @@ {% extends "zerver/portico.html" %} +{% block title %} +{{ _("Confirmation link expired or deactivated") }} | Zulip +{% endblock %} + {% block portico_content %}
diff --git a/templates/confirmation/link_malformed.html b/templates/confirmation/link_malformed.html index 6b98c34056..911dea11a5 100644 --- a/templates/confirmation/link_malformed.html +++ b/templates/confirmation/link_malformed.html @@ -1,5 +1,9 @@ {% extends "zerver/portico.html" %} +{% block title %} +{{ _("Confirmation link malformed") }} | Zulip +{% endblock %} + {% block portico_content %}
diff --git a/templates/corporate/billing.html b/templates/corporate/billing.html index a323eb57b7..6ef160507c 100644 --- a/templates/corporate/billing.html +++ b/templates/corporate/billing.html @@ -1,6 +1,10 @@ {% extends "zerver/portico.html" %} {% set entrypoint = "billing" %} +{% block title %} +{{ _("Billing") }} | Zulip +{% endblock %} + {% block customhead %} {% endblock %} diff --git a/templates/corporate/event_status.html b/templates/corporate/event_status.html index 3135b5c91d..1993ec3b21 100644 --- a/templates/corporate/event_status.html +++ b/templates/corporate/event_status.html @@ -1,6 +1,10 @@ {% extends "zerver/portico.html" %} {% set entrypoint = "billing-event-status" %} +{% block title %} +{{ _("Billing status") }} | Zulip +{% endblock %} + {% block customhead %} {% endblock %} diff --git a/templates/corporate/support_request_thanks.html b/templates/corporate/support_request_thanks.html index a3b4f61380..1afbc931be 100644 --- a/templates/corporate/support_request_thanks.html +++ b/templates/corporate/support_request_thanks.html @@ -1,13 +1,19 @@ {% extends "zerver/portico.html" %} +{% block title %} +{{ _("Thanks for contacting us") }} | Zulip +{% endblock %} + {% block portico_content %}
-

Thanks for contacting us!

-

We will be in touch with you soon.

+

{{ _("Thanks for contacting us!") }}

+

{{ _("We will be in touch with you soon.") }}

+ {% trans %} You can find answers to frequently asked questions in the Zulip help center. + {% endtrans %}

diff --git a/templates/corporate/upgrade.html b/templates/corporate/upgrade.html index e7131ca29c..2358e3e670 100644 --- a/templates/corporate/upgrade.html +++ b/templates/corporate/upgrade.html @@ -1,6 +1,10 @@ {% extends "zerver/portico.html" %} {% set entrypoint = "upgrade" %} +{% block title %} +{{ _("Upgrade") }} | Zulip +{% endblock %} + {% block customhead %} {% endblock %} diff --git a/templates/corporate/zephyr-mirror.html b/templates/corporate/zephyr-mirror.html index 2458850373..6223bcf3aa 100644 --- a/templates/corporate/zephyr-mirror.html +++ b/templates/corporate/zephyr-mirror.html @@ -1,5 +1,9 @@ {% extends "zerver/portico.html" %} +{% block title %} +Zephyr mirroring information | Zulip +{% endblock %} + {# Zephyr mirroring information page #} {% block portico_content %} diff --git a/templates/corporate/zephyr.html b/templates/corporate/zephyr.html index 79006f1223..e6cac0ea68 100644 --- a/templates/corporate/zephyr.html +++ b/templates/corporate/zephyr.html @@ -2,7 +2,7 @@ {% set entrypoint = "landing-page" %} {% block title %} -Zulip zephyr +Zephyr for MIT | Zulip {% endblock %} {% block customhead %} diff --git a/templates/zerver/accounts_accept_terms.html b/templates/zerver/accounts_accept_terms.html index 39405a28cd..fc886c95f1 100644 --- a/templates/zerver/accounts_accept_terms.html +++ b/templates/zerver/accounts_accept_terms.html @@ -1,4 +1,9 @@ {% extends "zerver/portico_signup.html" %} + +{% block title %} +{{ _("Accept the Terms of Service") }} | Zulip +{% endblock %} + {# Allow the user to accept a TOS, creating an email record of that fact. Users only hit this page if they are coming from a migration or other update of the TOS; diff --git a/templates/zerver/accounts_home.html b/templates/zerver/accounts_home.html index fae7e38840..226f12c81f 100644 --- a/templates/zerver/accounts_home.html +++ b/templates/zerver/accounts_home.html @@ -1,6 +1,10 @@ {% extends "zerver/portico_signup.html" %} {# Home page for not logged-in users. #} +{% block title %} +{{ _("Sign up") }} | Zulip +{% endblock %} + {# This is where we pitch the app and solicit signups. #} {% block portico_content %} diff --git a/templates/zerver/accounts_send_confirm.html b/templates/zerver/accounts_send_confirm.html index 81fdfde2c1..76ba494880 100644 --- a/templates/zerver/accounts_send_confirm.html +++ b/templates/zerver/accounts_send_confirm.html @@ -1,6 +1,10 @@ {% extends "zerver/portico_signup.html" %} {# Displayed after a user attempts to sign up. #} +{% block title %} +{{ _("Confirm your email address") }} | Zulip +{% endblock %} + {% block portico_content %} diff --git a/templates/zerver/auth_subdomain.html b/templates/zerver/auth_subdomain.html index 1d526eee35..5f0344f1fc 100644 --- a/templates/zerver/auth_subdomain.html +++ b/templates/zerver/auth_subdomain.html @@ -1,5 +1,9 @@ {% extends "zerver/portico.html" %} +{% block title %} +{{ _("Authentication subdomain error") }} | Zulip +{% endblock %} + {% block portico_content %}
@@ -8,13 +12,15 @@
-

Authentication subdomain

+

{{ _("Authentication subdomain") }}

+ {% trans %} It appears you ended up here by accident. This site is meant to be an intermediate step in the authentication process and shouldn't be accessed manually. If you came here directly, you probably got the address wrong. If you got stuck here while trying to log in, this is most likely a server bug or misconfiguration. + {% endtrans %}

diff --git a/templates/zerver/close_window.html b/templates/zerver/close_window.html index e2aec753ec..f1a2c8e2ec 100644 --- a/templates/zerver/close_window.html +++ b/templates/zerver/close_window.html @@ -2,7 +2,7 @@ - Callback complete + {{ _("Video call ended") }} | Zulip -

You may now close this window.

+

{{ _("You may now close this window.") }}

diff --git a/templates/zerver/config_error.html b/templates/zerver/config_error.html index a2378bd31e..7cd6686f55 100644 --- a/templates/zerver/config_error.html +++ b/templates/zerver/config_error.html @@ -1,5 +1,9 @@ {% extends "zerver/portico.html" %} +{% block title %} +{{ _("Configuration error") }} | Zulip +{% endblock %} + {% block portico_content %}
@@ -8,7 +12,7 @@
-

Configuration error

+

{{ _("Configuration error") }}


{% if error_name == "ldap_error_realm_is_none" %} {% trans %} diff --git a/templates/zerver/confirm_continue_registration.html b/templates/zerver/confirm_continue_registration.html index 6b60fb01cc..d484f4c2ff 100644 --- a/templates/zerver/confirm_continue_registration.html +++ b/templates/zerver/confirm_continue_registration.html @@ -1,5 +1,9 @@ {% extends "zerver/portico_signup.html" %} +{% block title %} +{{ _("Account not found") }} | Zulip +{% endblock %} + {% block portico_content %}
diff --git a/templates/zerver/create_realm.html b/templates/zerver/create_realm.html index 202d946009..9ec2519379 100644 --- a/templates/zerver/create_realm.html +++ b/templates/zerver/create_realm.html @@ -1,6 +1,10 @@ {% extends "zerver/portico_signup.html" %} {# Home page for not logged-in users. #} +{% block title %} +{{ _("Create a new organization") }} | Zulip +{% endblock %} + {# This is where we pitch the app and solicit signups. #} {% block portico_content %} diff --git a/templates/zerver/deactivated.html b/templates/zerver/deactivated.html index 92a1897354..4354715dd9 100644 --- a/templates/zerver/deactivated.html +++ b/templates/zerver/deactivated.html @@ -1,5 +1,9 @@ {% extends "zerver/portico_signup.html" %} +{% block title %} +{{ _("Deactivated organization") }} | Zulip +{% endblock %} + {% block customhead %} {{ super() }} diff --git a/templates/zerver/desktop_login.html b/templates/zerver/desktop_login.html index edef72c48f..6064033583 100644 --- a/templates/zerver/desktop_login.html +++ b/templates/zerver/desktop_login.html @@ -1,6 +1,10 @@ {% extends "zerver/portico.html" %} {% set entrypoint = "desktop-login" %} +{% block title %} +{{ _("Finish desktop app login") }} | Zulip +{% endblock %} + {% block portico_content %}
diff --git a/templates/zerver/desktop_redirect.html b/templates/zerver/desktop_redirect.html index 2d5efa4e39..7a543d4a74 100644 --- a/templates/zerver/desktop_redirect.html +++ b/templates/zerver/desktop_redirect.html @@ -1,6 +1,10 @@ {% extends "zerver/portico.html" %} {% set entrypoint = "desktop-redirect" %} +{% block title %} +{{ _("Log in to desktop app") }} | Zulip +{% endblock %} + {% block content %}
diff --git a/templates/zerver/development/dev_login.html b/templates/zerver/development/dev_login.html index c76ff2330b..da479cac7f 100644 --- a/templates/zerver/development/dev_login.html +++ b/templates/zerver/development/dev_login.html @@ -1,6 +1,10 @@ {% extends "zerver/portico.html" %} {% set entrypoint = "dev-login" %} +{% block title %} +Log in | Zulip Dev +{% endblock %} + {# Login page. #} {% block portico_content %}