Move "generated by Tendenci" email footer to a template include.

Currently this email footer is defined in a number of places in both Python code and Django templates. This change centralizes the footer into a single location that can be overridden with templates.
tendenci · Jun 5, 2017 · 2b2e6f8 · 2b2e6f8
1 parent a7faacc
commit 2b2e6f8
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 90 deletions.
diff --git a/tendenci/apps/corporate_memberships/management/commands/send_corp_membership_notices.py b/tendenci/apps/corporate_memberships/management/commands/send_corp_membership_notices.py
@@ -265,7 +265,7 @@ def email_member(notice, membership, global_context):
 
                 body = fieldify(body)
 
-                body = '%s <br /><br />%s' % (body, get_footer())
+                body = body + ' <br /><br />{% include "email_footer.html" %}'
 
                 context = Context(context)
                 template = Template(body)
@@ -295,14 +295,6 @@ def email_member(notice, membership, global_context):
                     print 'To ', email_recipient, subject
             return sent
 
-        def get_footer():
-            return """
-                    This e-mail was generated by Tendenci&reg; Software -
-                    a web based membership management software solution
-                    www.tendenci.com developed by Schipul - The Web
-                    Marketing Company
-                    """
-
         exception_str = ""
 
         notices = Notice.objects.filter(status=True, status_detail='active'

diff --git a/tendenci/apps/corporate_memberships/models.py b/tendenci/apps/corporate_memberships/models.py
@@ -1726,14 +1726,6 @@ class Meta:
     def __unicode__(self):
         return self.notice_name
 
-    @property
-    def footer(self):
-        return """
-        This e-mail was generated by Tendenci&reg; Software - a
-        web based membership management software solution
-        www.tendenci.com developed by Schipul - The Web Marketing Company
-        """
-
     def get_default_context(self, corporate_membership=None,
                             recipient=None, **kwargs):
         """
@@ -1831,10 +1823,10 @@ def get_subject(self, corporate_membership=None, recipient=None):
 
     def get_content(self, corporate_membership=None, recipient=None, **kwargs):
         """
-        Return self.email_content with self.footer appended
-        and replace shortcode (context) variables
+        Return self.email_content with footer appended and replace shortcode
+        (context) variables
         """
-        content = "%s\n<br /><br />\n%s" % (self.email_content, self.footer)
+        content = self.email_content + '\n<br /><br />\n{% include "email_footer.html" %}'
         context = self.get_default_context(corporate_membership, recipient, **kwargs)
 
         return self.build_notice(content, context=context, **kwargs)

diff --git a/tendenci/apps/corporate_memberships/templates/corporate_memberships/notices/email_recap.html b/tendenci/apps/corporate_memberships/templates/corporate_memberships/notices/email_recap.html
@@ -37,10 +37,4 @@
 
 <P>{% trans "Time submitted:" %} {% now "D d M Y P" %}</P>
 
-<p align="center">
-{% blocktrans %}
-This e-mail was generated by Tendenci&reg; Software - a web based membership management software solution
-<a href="http://www.tendenci.com">www.tendenci.com</a> developed by <a href="http://schipul.com">Schipul - The Web Marketing Company</a>
-{% endblocktrans %}
-</p>
-
+{% include email_footer.html %}
diff --git a/tendenci/apps/memberships/management/commands/send_membership_notices.py b/tendenci/apps/memberships/management/commands/send_membership_notices.py
@@ -257,7 +257,7 @@ def email_member(notice, membership, global_context):
 
             body = fieldify(body)
 
-            body = '%s <br /><br />%s' % (body, get_footer())
+            body = body + ' <br /><br />{% include "email_footer.html" %}'
 
             context = Context(context)
             template = Template(body)
@@ -284,14 +284,6 @@ def email_member(notice, membership, global_context):
             if verbosity > 1:
                 print 'To ', email_recipient, subject
 
-        def get_footer():
-            return """
-                    This e-mail was generated by Tendenci&reg; Software -
-                    a web based membership management software solution
-                    www.tendenci.com developed by Schipul - The Web
-                    Marketing Company
-                    """
-
         exception_str = ""
 
         notices = Notice.objects.filter(status=True, status_detail='active'

diff --git a/tendenci/apps/memberships/models.py b/tendenci/apps/memberships/models.py
@@ -2093,14 +2093,6 @@ class Meta:
     def __unicode__(self):
         return self.notice_name
 
-    @property
-    def footer(self):
-        return """
-        This e-mail was generated by Tendenci&reg; Software - a
-        web based membership management software solution
-        www.tendenci.com developed by Schipul - The Web Marketing Company
-        """
-
     def get_default_context(self, membership=None):
         """
         Returns a dictionary with default context items.
@@ -2169,10 +2161,10 @@ def get_subject(self, membership=None):
 
     def get_content(self, membership=None):
         """
-        Return self.email_content with self.footer appended
-        and replace shortcode (context) variables
+        Return self.email_content with footer appended and replace shortcode
+        (context) variables
         """
-        content = "%s\n<br /><br />\n%s" % (self.email_content, self.footer)
+        content = self.email_content + '\n<br /><br />\n{% include "email_footer.html" %}'
         context = self.get_default_context(membership)
 
         return self.build_notice(content, context=context)

diff --git a/tendenci/apps/memberships/templates/memberships/notices/email_recap.html b/tendenci/apps/memberships/templates/memberships/notices/email_recap.html
@@ -37,10 +37,4 @@
 
 <P>{% trans "Time submitted:" %} {% now "D d M Y P" %}</P>
 
-<p align="center">
-{% blocktrans %}
-This e-mail was generated by Tendenci&reg; Software - a web based membership management software solution
-<a href="http://www.tendenci.com">www.tendenci.com</a> developed by <a href="http://schipul.com">Schipul - The Web Marketing Company</a>
-{% endblocktrans %}
-</p>
-
+{% include email_footer.html %}
diff --git a/tendenci/apps/notifications/templates/notification/newsletter_recap/full.html b/tendenci/apps/notifications/templates/notification/newsletter_recap/full.html
@@ -15,9 +15,6 @@
 {{ SITE_GLOBAL_SITECONTACTNAME }} <br />
 {{ SITE_GLOBAL_SITECONTACTEMAIL }} <br />
 {{ SITE_GLOBAL_SITEDISPLAYNAME }} <br />
-{% trans "Time Submitted:" %} {% now "D d M Y P" %} <br />
-<br />
-{% blocktrans %}
-This e-mail was generated by Tendenci&reg; Software - a web based membership management software solution
-<a href="http://www.tendenci.com">www.tendenci.com</a> developed by <a href="http://schipul.com">Schipul - The Web Marketing Company</a>
-{% endblocktrans %}
+<p>{% trans "Time Submitted:" %} {% now "D d M Y P" %}</p>
+
+{% include email_footer.html %}
diff --git a/...i/apps/recurring_payments/templates/recurring_payments/email_admins_account_disabled.html b/...i/apps/recurring_payments/templates/recurring_payments/email_admins_account_disabled.html
@@ -24,8 +24,4 @@
 
 <P>{% trans "Time submitted:" %} {% now "D d M Y P" %}</P>
 
-<p align="center">
- {% trans "This e-mail was generated by Tendenci&reg; Software - a" %}
- {% trans "web based membership management software solution" %}
- {% trans "www.tendenci.com developed by Schipul - The Web Marketing Company" %}
-</p>
+{% include email_footer.html %}
diff --git a/...apps/recurring_payments/templates/recurring_payments/email_admins_no_payment_profile.html b/...apps/recurring_payments/templates/recurring_payments/email_admins_no_payment_profile.html
@@ -23,8 +23,4 @@
 
 <P>{% trans "Time submitted:" %} {% now "D d M Y P" %}</P>
 
-<p align="center">
- {% trans "This e-mail was generated by Tendenci&reg; Software - a" %}
- {% trans "web based membership management software solution" %}
- {% trans "www.tendenci.com developed by Schipul - The Web Marketing Company" %}
-</p>
+{% include email_footer.html %}
diff --git a/tendenci/apps/recurring_payments/templates/recurring_payments/email_admins_transaction.html b/tendenci/apps/recurring_payments/templates/recurring_payments/email_admins_transaction.html
@@ -67,8 +67,4 @@
 
 <P>{% trans "Time submitted:" %} {% now "D d M Y P" %}</P>
 
-<p align="center">
- {% trans "This e-mail was generated by Tendenci&reg; Software - a" %}
- {% trans "web based membership management software solution" %}
- {% trans "www.tendenci.com developed by Schipul - The Web Marketing Company" %}
-</p>
+{% include email_footer.html %}
diff --git a/...ps/recurring_payments/templates/recurring_payments/email_customer_no_payment_profile.html b/...ps/recurring_payments/templates/recurring_payments/email_customer_no_payment_profile.html
@@ -22,8 +22,4 @@
 
 <P>{{ site_display_name }}</P>
 
-<p align="center">
- {% trans "This e-mail was generated by Tendenci&reg; Software - a" %}
- {% trans "web based membership management software solution" %}
- {% trans "www.tendenci.com developed by Schipul - The Web Marketing Company" %}
-</p>
+{% include email_footer.html %}
diff --git a/...enci/apps/recurring_payments/templates/recurring_payments/email_customer_transaction.html b/...enci/apps/recurring_payments/templates/recurring_payments/email_customer_transaction.html
@@ -61,8 +61,4 @@
 
 <P>{{ site_display_name }}</P>
 
-<p align="center">
- {% trans "This e-mail was generated by Tendenci&reg; Software - a" %}
- {% trans "web based membership management software solution" %}
- {% trans "tendenci.com developed by Schipul - The Web Marketing Company" %}
-</p>
+{% include email_footer.html %}
diff --git a/...pps/recurring_payments/templates/recurring_payments/email_script_support_transaction.html b/...pps/recurring_payments/templates/recurring_payments/email_script_support_transaction.html
@@ -63,8 +63,4 @@
 
 <P>{% trans "Time submitted:" %} {% now "D d M Y P" %}</P>
 
-<p align="center">
- {% trans "This e-mail was generated by Tendenci&reg; Software - a" %}
- {% trans "web based membership management software solution" %}
- {% trans "www.tendenci.com developed by Schipul - The Web Marketing Company" %}
-</p>
+{% include email_footer.html %}
diff --git a/tendenci/templates/email_footer.html b/tendenci/templates/email_footer.html
@@ -0,0 +1,7 @@
+{% load i18n %}
+<p align="center">
+{% blocktrans %}
+This e-mail was generated by Tendenci&reg; Software - a web based membership management software solution
+<a href="http://www.tendenci.com">www.tendenci.com</a> developed by <a href="http://schipul.com">Schipul - The Web Marketing Company</a>
+{% endblocktrans %}
+</p>