From c3aa799192aadf891bb39b48e94f1c734a25d9a8 Mon Sep 17 00:00:00 2001
From: Rishi Gupta <rishig@zulipchat.com>
Date: Sat, 10 Jun 2017 01:03:58 -0700
Subject: [PATCH] emails: Remove verbose_support_offers conditional where
 unneccesary.

For almost all of these, the verbose support offer clause is almost the same
as the non-verbose version. The distinction carries extra carrying cost when
coming up with new copy, testing new email designs, etc.
---
 templates/zerver/emails/confirm_new_email.html    | 6 ------
 templates/zerver/emails/confirm_new_email.txt     | 5 -----
 templates/zerver/emails/confirm_registration.html | 6 +-----
 templates/zerver/emails/confirm_registration.txt  | 4 ----
 templates/zerver/emails/find_team.html            | 2 --
 templates/zerver/emails/find_team.txt             | 2 --
 templates/zerver/emails/invitation.html           | 6 +-----
 templates/zerver/emails/invitation.txt            | 5 +----
 templates/zerver/emails/invitation_mit.txt        | 5 +----
 templates/zerver/emails/invitation_reminder.html  | 6 +-----
 templates/zerver/emails/invitation_reminder.txt   | 4 ----
 11 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/templates/zerver/emails/confirm_new_email.html b/templates/zerver/emails/confirm_new_email.html
index 589b1d5874..94fcdcac59 100644
--- a/templates/zerver/emails/confirm_new_email.html
+++ b/templates/zerver/emails/confirm_new_email.html
@@ -13,15 +13,9 @@ If you would like to confirm this change, please click this link:
 </p>
 
 <p>
-{% if verbose_support_offers %}
 Feel free to give us a shout at
 <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>
 if you have any questions or you did not request this change.
-{% else %}
-If you did not request this change, please contact the administrator
-of this Zulip server at
-<a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>.
-{% endif %}
 </p>
 
 <p>
diff --git a/templates/zerver/emails/confirm_new_email.txt b/templates/zerver/emails/confirm_new_email.txt
index 28a609e275..fcfea96e54 100644
--- a/templates/zerver/emails/confirm_new_email.txt
+++ b/templates/zerver/emails/confirm_new_email.txt
@@ -6,13 +6,8 @@ to confirm this change, please click this link:
 
 {{ activate_url }}
 
-{% if verbose_support_offers %}
 Feel free to give us a shout at <{{ support_email }}> if you have any
 questions or you did not request this change.
-{% else %}
-If you did not request this change, please contact the administrator
-of this Zulip server at <{{ support_email }}>.
-{% endif %}
 
 Cheers,
 
diff --git a/templates/zerver/emails/confirm_registration.html b/templates/zerver/emails/confirm_registration.html
index 58121708c8..bfb72fe86e 100644
--- a/templates/zerver/emails/confirm_registration.html
+++ b/templates/zerver/emails/confirm_registration.html
@@ -12,11 +12,7 @@
     <a href="{{ activate_url }}" style="color:#08c">{{ activate_url }}</a>
 </p>
 <p>
-{% if verbose_support_offers %}
-    Feel free to give us a shout at <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>, if you have any questions.
-{% else %}
-    If you are having issues, please contact your Zulip administrator at <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>.
-{% endif %}
+Feel free to give us a shout at <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>, if you have any questions.
 </p>
 <p>
     Cheers,<br />
diff --git a/templates/zerver/emails/confirm_registration.txt b/templates/zerver/emails/confirm_registration.txt
index 67b725f379..06597ae9de 100644
--- a/templates/zerver/emails/confirm_registration.txt
+++ b/templates/zerver/emails/confirm_registration.txt
@@ -5,11 +5,7 @@ You recently signed up for Zulip. Awesome!
 To complete signup, visit this link below:
     <{{ activate_url }}>
 
-{% if verbose_support_offers %}
 Feel free to give us a shout at <{{ support_email }}> if you have any questions.
-{% else %}
-If you are having issues, please contact your Zulip administrator at <{{ support_email }}>.
-{% endif %}
 
 Cheers,
 
diff --git a/templates/zerver/emails/find_team.html b/templates/zerver/emails/find_team.html
index 58e57f9c4f..4abd96802a 100644
--- a/templates/zerver/emails/find_team.html
+++ b/templates/zerver/emails/find_team.html
@@ -16,10 +16,8 @@ at the following link:</p>
 
 <p>The email address associated with your account is <b>{{ user_profile.email }}</b>.</p>
 
-{% if verbose_support_offers %}
 <p>If you have trouble signing in, please contact Zulip support by replying to
   this email.</p>
 
-{% endif %}
 <p>Thanks for using Zulip!</p>
 {% endblock %}
diff --git a/templates/zerver/emails/find_team.txt b/templates/zerver/emails/find_team.txt
index c796d1e0d2..43bbb68a2b 100644
--- a/templates/zerver/emails/find_team.txt
+++ b/templates/zerver/emails/find_team.txt
@@ -6,9 +6,7 @@ at the following link:
 
 The email address associated with your account is {{ user_profile.email }}.
 
-{% if verbose_support_offers %}
 If you have trouble signing in, please contact Zulip support by replying to
 this email.
-{% endif %}
 
 Thanks for using Zulip!
diff --git a/templates/zerver/emails/invitation.html b/templates/zerver/emails/invitation.html
index 9536639c75..e44498d6fe 100644
--- a/templates/zerver/emails/invitation.html
+++ b/templates/zerver/emails/invitation.html
@@ -15,11 +15,7 @@
     <a href="{{ activate_url }}" style="color:#08c">{{ activate_url }}</a>
 </p>
 <p>
-{% if verbose_support_offers %}
-    Feel free to give us a shout at <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>, if you have any questions.
-{% else %}
-    If you are having issues, please contact your Zulip administrator at <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>.
-{% endif %}
+Feel free to give us a shout at <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>, if you have any questions.
 </p>
 <p>
     Cheers,<br />
diff --git a/templates/zerver/emails/invitation.txt b/templates/zerver/emails/invitation.txt
index 96ea237bee..cf9b5fe4b5 100644
--- a/templates/zerver/emails/invitation.txt
+++ b/templates/zerver/emails/invitation.txt
@@ -6,11 +6,8 @@ Message from {{ referrer.full_name }}: {{ custom_body }}
 {% endif %}
 To get started, visit the link below:
     <{{ activate_url }}>
-{% if verbose_support_offers %}
+
 Feel free to give us a shout at <{{ support_email }}> if you have any questions.
-{% else %}
-If you are having issues, please contact your Zulip administrator at <{{ support_email }}>.
-{% endif %}
 
 Cheers,
 
diff --git a/templates/zerver/emails/invitation_mit.txt b/templates/zerver/emails/invitation_mit.txt
index 71de226f6c..daa53cdf62 100644
--- a/templates/zerver/emails/invitation_mit.txt
+++ b/templates/zerver/emails/invitation_mit.txt
@@ -6,11 +6,8 @@ Hi there,
 {% endif %}
 To get started, visit the link below:
     <{{ activate_url }}>
-{% if verbose_support_offers %}
+
 Feel free to give us a shout at <{{ support_email }}> if you have any questions.
-{% else %}
-If you are having issues, please contact your Zulip administrator at <{{ support_email }}>.
-{% endif %}
 
 Cheers,
 
diff --git a/templates/zerver/emails/invitation_reminder.html b/templates/zerver/emails/invitation_reminder.html
index cfbc1cf141..3d75b5ce75 100644
--- a/templates/zerver/emails/invitation_reminder.html
+++ b/templates/zerver/emails/invitation_reminder.html
@@ -12,11 +12,7 @@
     <a href="{{ activate_url }}" style="color:#08c">{{ activate_url }}</a>
 </p>
 <p>
-{% if verbose_support_offers %}
-    We're here for you at <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>, if you have any questions.
-{% else %}
-    If you are having issues, please contact your Zulip administrator at <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>.
-{% endif %}
+We're here for you at <a href="mailto:{{ support_email }}" style="color:#08c">{{ support_email }}</a>, if you have any questions.
 </p>
 <p>
     Cheers,<br />
diff --git a/templates/zerver/emails/invitation_reminder.txt b/templates/zerver/emails/invitation_reminder.txt
index cec3aed1c6..7552d85476 100644
--- a/templates/zerver/emails/invitation_reminder.txt
+++ b/templates/zerver/emails/invitation_reminder.txt
@@ -5,11 +5,7 @@ This is a friendly reminder that {{ referrer_name }} ({{ referrer_email }}) want
 To get started, visit the link below:
     <{{ activate_url }}>
 
-{% if verbose_support_offers %}
 We're here for you at <{{ support_email }}>, if you have any questions.
-{% else %}
-If you are having issues, please contact your Zulip administrator at <{{ support_email }}>.
-{% endif %}
 
 Cheers,
 The Zulip Team