From d3238e9a1b47ed605d8681a8c82850c0c6998784 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 5 Sep 2025 14:34:58 -0700 Subject: [PATCH] templates: Fix invalid lists inside

. Signed-off-by: Anders Kaseorg --- templates/corporate/zephyr.html | 9 +-- templates/zerver/development/dev_tools.html | 25 ++++----- .../zerver/emails/account_registered.html | 22 ++++---- .../zerver/emails/confirm_registration.html | 48 ++++++++-------- templates/zerver/emails/notify_new_login.html | 36 ++++++------ .../emails/onboarding_team_to_zulip.html | 14 ++--- templates/zerver/emails/password_reset.html | 32 ++++++----- .../confirm_deactivate_stream.hbs | 19 ++++--- .../confirm_deactivate_user.hbs | 18 +++--- .../confirm_delete_detached_attachments.hbs | 16 +++--- .../confirm_delete_profile_field_option.hbs | 26 ++++----- .../confirm_reactivate_stream.hbs | 12 ++-- web/templates/introduce_zulip_view_modal.hbs | 56 +++++++++---------- web/templates/try_zulip_modal.hbs | 40 ++++++------- 14 files changed, 188 insertions(+), 185 deletions(-) diff --git a/templates/corporate/zephyr.html b/templates/corporate/zephyr.html index cd72c303e1..62ab9910e6 100644 --- a/templates/corporate/zephyr.html +++ b/templates/corporate/zephyr.html @@ -65,11 +65,12 @@

You can get set up to participate on an encrypted Zephyr class using Zulip by either: -

    -

  1. E-mailing us at {{ support_email }} to get set up, or

    2. -

  2. Someone who is already set up to participate on that encrypted Zephyr class using Zulip can use Zulip to invite you

    3. -

+ +
    +

  1. E-mailing us at {{ support_email }} to get set up, or

    2. +

  2. Someone who is already set up to participate on that encrypted Zephyr class using Zulip can use Zulip to invite you

    3. +
diff --git a/templates/zerver/development/dev_tools.html b/templates/zerver/development/dev_tools.html index eadc9086b5..b5c64618c9 100644 --- a/templates/zerver/development/dev_tools.html +++ b/templates/zerver/development/dev_tools.html @@ -97,20 +97,19 @@

Useful management commands

-

Development-specific management commands live in zilencer/management/commands. Highlights include: -

We also have documentation on testing LDAP, Google & GitHub authentication in the development environment.

diff --git a/templates/zerver/emails/account_registered.html b/templates/zerver/emails/account_registered.html index 9c735d97e3..504c9f02bb 100644 --- a/templates/zerver/emails/account_registered.html +++ b/templates/zerver/emails/account_registered.html @@ -30,18 +30,20 @@

{% trans apps_page_link="https://zulip.com/apps/" %}You will use the following info to log into the Zulip web, mobile and desktop apps:{% endtrans %} -

+

{{ _('Go to organization') }}

diff --git a/templates/zerver/emails/confirm_registration.html b/templates/zerver/emails/confirm_registration.html index 15af7be041..c418a15126 100644 --- a/templates/zerver/emails/confirm_registration.html +++ b/templates/zerver/emails/confirm_registration.html @@ -5,30 +5,32 @@ {% endblock %} {% block content %} -

{% if create_realm %} - {{ _("You have requested a new Zulip organization:") }} -

+

+ {{ _("You have requested a new Zulip organization:") }} +

+ {% else %} - {{ _("You recently signed up for Zulip. Awesome!") }} +

+ {{ _("You recently signed up for Zulip. Awesome!") }} +

{% endif %} -

-

- {% if create_realm %} - {{ _("Click the button below to create the organization and register your account. You'll be able to update the information above if you like.") }} - {% else %} - {{ _("Click the button below to complete registration.") }} - {% endif %} - {{ _("Complete registration") }} -

-

- {% if corporate_enabled %} - {{macros.contact_us_zulip_cloud(support_email)}} - {% else %} - {{macros.contact_us_self_hosted(support_email)}} - {% endif %} -

+

+ {% if create_realm %} + {{ _("Click the button below to create the organization and register your account. You'll be able to update the information above if you like.") }} + {% else %} + {{ _("Click the button below to complete registration.") }} + {% endif %} + {{ _("Complete registration") }} +

+

+ {% if corporate_enabled %} + {{macros.contact_us_zulip_cloud(support_email)}} + {% else %} + {{macros.contact_us_self_hosted(support_email)}} + {% endif %} +

{% endblock %} diff --git a/templates/zerver/emails/notify_new_login.html b/templates/zerver/emails/notify_new_login.html index a8ad9df33f..b7cc516386 100644 --- a/templates/zerver/emails/notify_new_login.html +++ b/templates/zerver/emails/notify_new_login.html @@ -10,25 +10,23 @@ {% block content %}

{{ _("We noticed a recent login for the following Zulip account.") }}

-

-

-

+

{{ _("If this was you, great! There's nothing else you need to do.") }}

diff --git a/templates/zerver/emails/onboarding_team_to_zulip.html b/templates/zerver/emails/onboarding_team_to_zulip.html index ef75850dfd..b9aafa95b5 100644 --- a/templates/zerver/emails/onboarding_team_to_zulip.html +++ b/templates/zerver/emails/onboarding_team_to_zulip.html @@ -11,14 +11,14 @@

{% trans %}Otherwise, here is some advice we often hear from customers for evaluating any team chat product:{% endtrans %} -

    -
  1. {% trans %}Invite your teammates to explore with you and share their unique perspectives.{% endtrans %} - {% trans %}Use the app itself to chat about your impressions.{% endtrans %} -
    2. -
  2. {% trans %}Run a week-long trial with your team, without using any other chat tools. This is the only way to truly experience how a new chat app will help your team communicate.{% endtrans %} -
    3. -

+
    +
  1. {% trans %}Invite your teammates to explore with you and share their unique perspectives.{% endtrans %} + {% trans %}Use the app itself to chat about your impressions.{% endtrans %} +
    2. +
  2. {% trans %}Run a week-long trial with your team, without using any other chat tools. This is the only way to truly experience how a new chat app will help your team communicate.{% endtrans %} +
    3. +

{% trans %}Zulip is designed to enable efficient communication, and we hope these tips help your team experience it in action.{% endtrans %}

diff --git a/templates/zerver/emails/password_reset.html b/templates/zerver/emails/password_reset.html index 3409e938d4..9b89a833ca 100644 --- a/templates/zerver/emails/password_reset.html +++ b/templates/zerver/emails/password_reset.html @@ -9,29 +9,31 @@ {% trans email=macros.email_tag(email), realm_url=macros.link_tag(realm_url) %}Somebody (possibly you) requested a new password for the Zulip account {{ email }} on {{ realm_url }}.{% endtrans %}

{% if active_account_in_realm %} -

- {{ _('Click the button below to reset your password.') }} - {{ _("Reset password") }} -

+

+ {{ _('Click the button below to reset your password.') }} + {{ _("Reset password") }} +

{% else %} -

- {% if user_deactivated %} - {% trans organization_url=macros.link_tag(realm_url), help_link=realm_url + "/help/deactivate-or-reactivate-a-user" %}You previously had an account on {{ organization_url }}, but it has been deactivated. You can contact an organization administrator to reactivate your account.{% endtrans %} - {% else %} - {% trans %}You do not have an account in that Zulip organization.{% endtrans %} - {% endif %} -

-

+

+ {% if user_deactivated %} + {% trans organization_url=macros.link_tag(realm_url), help_link=realm_url + "/help/deactivate-or-reactivate-a-user" %}You previously had an account on {{ organization_url }}, but it has been deactivated. You can contact an organization administrator to reactivate your account.{% endtrans %} + {% else %} + {% trans %}You do not have an account in that Zulip organization.{% endtrans %} + {% endif %} +

{% if other_realm_urls %} - {{ _("You do have active accounts in the following organization(s).") }} +

+ {{ _("You do have active accounts in the following organization(s).") }} +

- {% trans %}You can try logging in or resetting your password in the organization(s) above.{% endtrans %} +

+ {% trans %}You can try logging in or resetting your password in the organization(s) above.{% endtrans %} +

{% endif %} -

{% endif %}

diff --git a/web/templates/confirm_dialog/confirm_deactivate_stream.hbs b/web/templates/confirm_dialog/confirm_deactivate_stream.hbs index 3c79747fb0..13425721ed 100644 --- a/web/templates/confirm_dialog/confirm_deactivate_stream.hbs +++ b/web/templates/confirm_dialog/confirm_deactivate_stream.hbs @@ -1,13 +1,12 @@

{{#tr}}Archiving this channel will:{{/tr}}

-

-

+

{{#tr}} Users can still search for messages in archived channels. You can always unarchive this channel. diff --git a/web/templates/confirm_dialog/confirm_deactivate_user.hbs b/web/templates/confirm_dialog/confirm_deactivate_user.hbs index 17765a60c1..c28ccf45ce 100644 --- a/web/templates/confirm_dialog/confirm_deactivate_user.hbs +++ b/web/templates/confirm_dialog/confirm_deactivate_user.hbs @@ -11,15 +11,17 @@ {username} has {number_of_invites_by_user, plural, one {# unexpired invitation} other {# unexpired invitations}}. {{/tr}} {{/if}} - {{#if bots_owned_by_user}} - {{t "They administer the following bots:"}} -

- {{/if}}

+{{#if bots_owned_by_user}} +

+ {{t "They administer the following bots:"}} +

+ +{{/if}}