E-mail template whitespace improvements (#4551)

Author: frjo

hypha/apply/activity/templates/messages/email/base.html

@@ -5,10 +5,10 @@
 
 {% block more_info %}{% endblock %}
 
-{% blocktrans %}Kind Regards,
-    The {{ ORG_SHORT_NAME }} Team{% endblocktrans %}
+{# fmt:off #}{% blocktrans %}Kind Regards,
+The {{ org_short_name }} Team{% endblocktrans %}
 
 --
-{{ ORG_LONG_NAME }}
+{{ org_long_name }}
 {% if ORG_URL %}{{ ORG_URL }}{% endif %}
-{% block post_signature_content %}{% endblock %}
+{% block post_signature_content %}{% endblock %}{# fmt:on #}

hypha/apply/activity/templates/messages/email/invite_co_applicant.html

@@ -1,13 +1,7 @@
 {% extends "messages/email/base.html" %}
 {% load i18n activity_tags %}
 
-{% block salutation %}
-    {% if invited_user %}
-        {% blocktrans with name=invited_user.get_display_name %}Dear {{ name }},{% endblocktrans %}
-    {% else %}
-        {% blocktrans with name=related.invited_user_email|email_name %}Dear {{ name }},{% endblocktrans %}
-    {% endif %}
-{% endblock %}
+{% block salutation %}{% if invited_user %}{% blocktrans with name=invited_user.get_display_name %}Dear {{ name }},{% endblocktrans %}{% else %}{% blocktrans with name=related.invited_user_email|email_name %}Dear {{ name }},{% endblocktrans %}{% endif %}{% endblock %}
 
 {% block content %}{# fmt:off #}
 {% blocktrans %}You have been invited as a co-applicant to an application on {{ ORG_SHORT_NAME }} by {{ user }}.{% endblocktrans %}

hypha/apply/users/templates/users/email_change/update_info_email.html

@@ -4,9 +4,9 @@
 {% blocktrans %}There has been an attempt to change email of your account on the {{ org_long_name }} web site. If this action wasn't made by you, please contact support at {{ org_email }} {% endblocktrans %}
 
 
-{% blocktrans %}Kind Regards,
-    The {{ org_short_name }} Team{% endblocktrans %}
+{# fmt:off #}{% blocktrans %}Kind Regards,
+The {{ org_short_name }} Team{% endblocktrans %}
 
 --
 {{ org_long_name }}
-{% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}
+{% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}{# fmt:on #}