From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 16 Mar 2011 00:24:29 +0000 (+0000)
Subject: merge notification-config -> trunk, previous commits 695, 751 (email debugging inform... 
X-Git-Tag: live~416
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/65779f741add23006d878bf17340ce230463ef6f

merge notification-config -> trunk, previous commits 695, 751 (email debugging information)

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@851 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/settings/email.py b/forum/settings/email.py
index ec27101..b83631e 100644
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -6,18 +6,6 @@ from forms import TestEmailSettingsWidget
 
 EMAIL_SET = SettingSet('email', _('Email settings'), _("Email server and other email related settings."), 50)
 
-EMAIL_SUBSCRIBE_CHOICES = (
-    ('y', _('Users are subscribed by default')),
-    ('n', _('Users are not subscribed by default')),
-)
-
-INITIAL_EMAIL_SUBSCRIBE_OPTION = Setting('INITIAL_EMAIL_SUBSCRIBE_OPTION', 'y', EMAIL_SET, dict(
-label = _("Default email subscription"),
-widget=RadioSelect,
-choices=EMAIL_SUBSCRIBE_CHOICES,
-help_text = _("Choose what should be the default email subscription status while registering."),
-required=False))
-
 TEST_EMAIL_SETTINGS = Setting('TEST_EMAIL_SETTINGS', '', EMAIL_SET, dict(
 label = _("E-Mail settings test"),
 help_text = _("Test the current E-Mail configuration."),