From: hernani Date: Tue, 1 Jun 2010 23:45:04 +0000 (+0000) Subject: Changes the name of the email footer variable. X-Git-Tag: live~777 X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/3be2d7d8c9405cac6abdee1ec44f53d2bcdecac8 Changes the name of the email footer variable. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@355 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- diff --git a/forum/settings/email.py b/forum/settings/email.py index a4e18ed..5e8a4a2 100644 --- a/forum/settings/email.py +++ b/forum/settings/email.py @@ -40,8 +40,9 @@ label = _("Email subject prefix"), help_text = _("Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easilly set up a filter on theyr email clients."), required=False)) -EMAIL_CAN_SPAM = Setting(u'EMAIL_CAN_SPAM', '', EMAIL_SET, dict( -label = _("Email Can Spam"), -help_text = "Email Can Spam, usually the phisical address of the organization running the website. See http://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003 for more info.")) +EMAIL_FOOTER_TEXT = Setting(u'EMAIL_FOOTER_TEXT', '', EMAIL_SET, dict( +label = _("Email Footer Text"), +help_text = _("Email footer text, usually the Can Spam compliance, or the phisical address of the organization running the website. See http://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003 for more info."), +required=False)) EMAIL_DIGEST_CONTROL = Setting('EMAIL_DIGEST_CONTROL', None) diff --git a/forum/skins/default/templates/notifications/base.html b/forum/skins/default/templates/notifications/base.html index 2b0cc05..997904c 100644 --- a/forum/skins/default/templates/notifications/base.html +++ b/forum/skins/default/templates/notifications/base.html @@ -24,7 +24,7 @@ here.


-

{{ settings.EMAIL_CAN_SPAM }}

+

{{ settings.EMAIL_FOOTER_TEXT }}