From a2f72edc688556621564e8cda38c6be9c3de1051 Mon Sep 17 00:00:00 2001
From: Alya Abbott <alya@zulip.com>
Date: Tue, 12 Dec 2023 11:11:28 -0800
Subject: [PATCH] email: Update strings in remote_realm log in confirmation
 email.

---
 corporate/tests/test_remote_billing.py                    | 2 +-
 .../zerver/emails/remote_realm_billing_confirm_login.html | 8 ++------
 .../emails/remote_realm_billing_confirm_login.subject.txt | 2 +-
 .../zerver/emails/remote_realm_billing_confirm_login.txt  | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/corporate/tests/test_remote_billing.py b/corporate/tests/test_remote_billing.py
index d2c7397d88..da024a8ffb 100644
--- a/corporate/tests/test_remote_billing.py
+++ b/corporate/tests/test_remote_billing.py
@@ -89,7 +89,7 @@ class RemoteBillingAuthenticationTest(BouncerTestCase):
                     f"{settings.SELF_HOSTING_MANAGEMENT_SUBDOMAIN}.{settings.EXTERNAL_HOST}"
                     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:
                 return result
diff --git a/templates/zerver/emails/remote_realm_billing_confirm_login.html b/templates/zerver/emails/remote_realm_billing_confirm_login.html
index 55b1cdcfdc..4afe5aa71d 100644
--- a/templates/zerver/emails/remote_realm_billing_confirm_login.html
+++ b/templates/zerver/emails/remote_realm_billing_confirm_login.html
@@ -7,15 +7,11 @@
 {% block content %}
 <p>
     {% trans %}
-    Click the button below to log in to Zulip plan management for <b>{{ remote_realm_host }}</b>.
-    {% endtrans %}
-
-    {% trans %}
-    This link will expire in {{ validity_in_hours }} hours.
+    Click the button below to confirm your email and log in to Zulip plan management for <b>{{ remote_realm_host }}</b>.
     {% endtrans %}
 </p>
 <p>
-    <a class="button" href="{{ confirmation_url }}">{{ _("Log in") }}</a>
+    <a class="button" href="{{ confirmation_url }}">{{ _("Confirm and log in") }}</a>
 </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 %}
diff --git a/templates/zerver/emails/remote_realm_billing_confirm_login.subject.txt b/templates/zerver/emails/remote_realm_billing_confirm_login.subject.txt
index b808605b6d..2b48014057 100644
--- a/templates/zerver/emails/remote_realm_billing_confirm_login.subject.txt
+++ b/templates/zerver/emails/remote_realm_billing_confirm_login.subject.txt
@@ -1 +1 @@
-{% trans %}Log in to Zulip plan management{% endtrans %}
+{% trans %}Confirm email for Zulip plan management{% endtrans %}
diff --git a/templates/zerver/emails/remote_realm_billing_confirm_login.txt b/templates/zerver/emails/remote_realm_billing_confirm_login.txt
index 658472e590..af10dd0b3b 100644
--- a/templates/zerver/emails/remote_realm_billing_confirm_login.txt
+++ b/templates/zerver/emails/remote_realm_billing_confirm_login.txt
@@ -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 %}