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 a4e18ed6749f5c0bd06716feff93aee2b486f06f..5e8a4a28bcd62636a4c61be3f0ef81029ff0c988 100644 (file)
--- 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."),\r
 required=False))\r
 \r
-EMAIL_CAN_SPAM = Setting(u'EMAIL_CAN_SPAM', '', EMAIL_SET, dict(\r
-label = _("Email Can Spam"),\r
-help_text = "Email Can Spam, usually the phisical address of the organization running the website. See <a href=\"http://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003\">http://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003</a> for more info."))\r
+EMAIL_FOOTER_TEXT = Setting(u'EMAIL_FOOTER_TEXT', '', EMAIL_SET, dict(\r
+label = _("Email Footer Text"),\r
+help_text = _("Email footer text, usually the Can Spam compliance, or the phisical address of the organization running the website. See <a href=\"http://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003\">http://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003</a> for more info."),\r
+required=False))\r
 \r
 EMAIL_DIGEST_CONTROL = Setting('EMAIL_DIGEST_CONTROL', None)\r

diff --git a/forum/skins/default/templates/notifications/base.html b/forum/skins/default/templates/notifications/base.html
index 2b0cc05cfe5d40499fedbe1d195e0d98f9e0d2df..997904ca7dae50eebb47d9014afb6527fcd1a9a5 100644 (file)
--- a/forum/skins/default/templates/notifications/base.html
+++ b/forum/skins/default/templates/notifications/base.html
@@ -24,7 +24,7 @@
 <a href="{{ settings.APP_URL }}{% url user_subscriptions id=recipient.id %}" style="{{ a_style }}">here</a>.
 </p>
 <hr style="{{ hr_style }}" />
-<p style="{{ p_style }}"><small style="{{ small_style }}">{{ settings.EMAIL_CAN_SPAM }}</small></p>
+<p style="{{ p_style }}"><small style="{{ small_style }}">{{ settings.EMAIL_FOOTER_TEXT }}</small></p>
 </td></tr></tbody></table>
 </center>
 </body>