paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

email: Update strings in remote_realm log in confirmation email.

Browse Source
This commit is contained in:
Alya Abbott
2023-12-12 11:11:28 -08:00
committed by Tim Abbott
parent e515574b3e
commit a2f72edc68
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
corporate/tests/test_remote_billing.py
View File

@@ -89,7 +89,7 @@ class RemoteBillingAuthenticationTest(BouncerTestCase):
f"{settings.SELF_HOSTING_MANAGEMENT_SUBDOMAIN}.{settings.EXTERNAL_HOST}" f"{settings.SELF_HOSTING_MANAGEMENT_SUBDOMAIN}.{settings.EXTERNAL_HOST}"
r"(\S+)" r"(\S+)"
), ),
email_body_contains="This link will expire in 24 hours", email_body_contains="confirm your email and log in to Zulip plan management",
) )
if return_without_clicking_confirmation_link: if return_without_clicking_confirmation_link:
return result return result

8
templates/zerver/emails/remote_realm_billing_confirm_login.html
View File

@@ -7,15 +7,11 @@
{% block content %} {% block content %}
<p> <p>
{% trans %} {% trans %}
Click the button below to log in to Zulip plan management for <b>{{ remote_realm_host }}</b>. Click the button below to confirm your email and log in to Zulip plan management for <b>{{ remote_realm_host }}</b>.
{% endtrans %}
{% trans %}
This link will expire in {{ validity_in_hours }} hours.
{% endtrans %} {% endtrans %}
</p> </p>
<p> <p>
<a class="button" href="{{ confirmation_url }}">{{ _("Log in") }}</a> <a class="button" href="{{ confirmation_url }}">{{ _("Confirm and log in") }}</a>
</p> </p>
<p> <p>
{% trans billing_contact_email=macros.email_tag(billing_contact_email) %}Questions? <a href="{{ billing_help_link }}">Learn more</a> or contact {{ billing_contact_email }}.{% endtrans %} {% trans billing_contact_email=macros.email_tag(billing_contact_email) %}Questions? <a href="{{ billing_help_link }}">Learn more</a> or contact {{ billing_contact_email }}.{% endtrans %}

2
templates/zerver/emails/remote_realm_billing_confirm_login.subject.txt
View File

@@ -1 +1 @@
{% trans %}Log in to Zulip plan management{% endtrans %} {% trans %}Confirm email for Zulip plan management{% endtrans %}

4
templates/zerver/emails/remote_realm_billing_confirm_login.txt
View File

@@ -1,6 +1,6 @@
{% trans %}Click the link below to log in to Zulip plan management for {{remote_realm_host}}.{% endtrans %} {% trans %}This link will expire in {{ validity_in_hours }} hours.{% endtrans %} {% trans %}Click the link below to confirm your email and log in to Zulip plan management for {{remote_realm_host}}.{% endtrans %}
{{ _("Log in") }}: {{ confirmation_url }} {{ _("Confirm and log in") }}: {{ confirmation_url }}
{% trans %}Questions? Learn more at {{ billing_help_link }} or contact {{ billing_contact_email }}.{% endtrans %} {% trans %}Questions? Learn more at {{ billing_help_link }} or contact {{ billing_contact_email }}.{% endtrans %}