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

@@ -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>

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,
 

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.
-    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 %}
 </p>
 <p>
     Cheers,<br />

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,
 

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 %}

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!

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.
-    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 %}
 </p>
 <p>
     Cheers,<br />

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,
 

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,
 

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.
-    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 %}
 </p>
 <p>
     Cheers,<br />

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