From ee71255296904b9ac8c411d036b5c7a74b81eac1 Mon Sep 17 00:00:00 2001
From: Joelute <josephho678@gmail.com>
Date: Thu, 20 Apr 2023 14:11:50 -0400
Subject: [PATCH] emails: Fix "contact us" line in plain-text versions of
 emails.

This is a continuation of #24260 where we have redrafted the "contact us"
line in various emails, but the plain-text versions of those emails remains
untouched. We want to also update those versions and ensure that they match
with our emails.

Fixes: #25198.
---
 templates/zerver/emails/confirm_registration.txt | 6 +++++-
 templates/zerver/emails/followup_day1.txt        | 7 +++++++
 templates/zerver/emails/invitation.txt           | 6 +++++-
 templates/zerver/emails/realm_reactivation.txt   | 6 +++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/templates/zerver/emails/confirm_registration.txt b/templates/zerver/emails/confirm_registration.txt
index 8820b3b729..a771825bb0 100644
--- a/templates/zerver/emails/confirm_registration.txt
+++ b/templates/zerver/emails/confirm_registration.txt
@@ -11,4 +11,8 @@
 {% endif %}
     <{{ activate_url }}>
 
-{% trans %}Contact us any time at {{ support_email }} if you run into trouble,have any feedback, or just want to chat!{% endtrans %}
+{% if corporate_enabled %}
+    {% trans %}Do you have questions or feedback to share? Contact us at {{ support_email }} — we'd love to help!{% endtrans %}
+{% else %}
+    {% trans %}If you have any questions, please contact this Zulip server's administrators at {{ support_email }}.{% endtrans %}
+{% endif %}
diff --git a/templates/zerver/emails/followup_day1.txt b/templates/zerver/emails/followup_day1.txt
index 769a866832..2153c8dcc1 100644
--- a/templates/zerver/emails/followup_day1.txt
+++ b/templates/zerver/emails/followup_day1.txt
@@ -30,3 +30,10 @@
 {% if is_realm_admin %}
 {% trans %} We also have a guide for Setting up your organization ({{ getting_organization_started_link }}).{% endtrans %}
 {% endif %}
+
+
+{% if corporate_enabled %}
+    {% trans %}Questions? Contact us at {{ support_email }} — we'd love to help!{% endtrans %}
+{% else %}
+    {% trans %}If you have any questions, please contact this Zulip server's administrators at {{ support_email }}.{% endtrans %}
+{% endif %}
diff --git a/templates/zerver/emails/invitation.txt b/templates/zerver/emails/invitation.txt
index 71bbf153b6..2fd4799764 100644
--- a/templates/zerver/emails/invitation.txt
+++ b/templates/zerver/emails/invitation.txt
@@ -5,4 +5,8 @@
 {{ _("To get started, click the link below.") }}
     <{{ activate_url }}>
 
-{% trans %}Contact us any time at {{ support_email }} if you run into trouble,have any feedback, or just want to chat!{% endtrans %}
+{% if corporate_enabled %}
+    {% trans %}Do you have questions or feedback to share? Contact us at {{ support_email }} — we'd love to help!{% endtrans %}
+{% else %}
+    {% trans %}If you have any questions, please contact this Zulip server's administrators at {{ support_email }}.{% endtrans %}
+{% endif %}
diff --git a/templates/zerver/emails/realm_reactivation.txt b/templates/zerver/emails/realm_reactivation.txt
index 973c7b03ec..8684bf1f76 100644
--- a/templates/zerver/emails/realm_reactivation.txt
+++ b/templates/zerver/emails/realm_reactivation.txt
@@ -10,4 +10,8 @@
 {% trans %}If the request was in error, you can take no action and this link will expire in 24 hours.{% endtrans %}
 
 
-{% trans %}Contact us any time at {{ support_email }} if you run into trouble, have any feedback, or just want to chat!{% endtrans %}
+{% if corporate_enabled %}
+    {% trans %}Do you have questions or feedback to share? Contact us at {{ support_email }} — we'd love to help!{% endtrans %}
+{% else %}
+    {% trans %}If you have any questions, please contact this Zulip server's administrators at {{ support_email }}.{% endtrans %}
+{% endif %}