merge notification-config -> trunk, previous commits 695, 751 (email debugging inform...

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 ec271019efce6816aef2acb198e0036790d2e5f1..b83631e955235e3220a666c893bfaadc4f6b38bb 100644 (file)
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -6,18 +6,6 @@ from forms import TestEmailSettingsWidget
 \r
 EMAIL_SET = SettingSet('email', _('Email settings'), _("Email server and other email related settings."), 50)\r
 \r
 \r
 EMAIL_SET = SettingSet('email', _('Email settings'), _("Email server and other email related settings."), 50)\r
 \r

-EMAIL_SUBSCRIBE_CHOICES = (\r
-    ('y', _('Users are subscribed by default')),\r
-    ('n', _('Users are not subscribed by default')),\r
-)\r
-\r
-INITIAL_EMAIL_SUBSCRIBE_OPTION = Setting('INITIAL_EMAIL_SUBSCRIBE_OPTION', 'y', EMAIL_SET, dict(\r
-label = _("Default email subscription"),\r
-widget=RadioSelect,\r
-choices=EMAIL_SUBSCRIBE_CHOICES,\r
-help_text = _("Choose what should be the default email subscription status while registering."),\r
-required=False))\r
-\r

 TEST_EMAIL_SETTINGS = Setting('TEST_EMAIL_SETTINGS', '', EMAIL_SET, dict(\r
 label = _("E-Mail settings test"),\r
 help_text = _("Test the current E-Mail configuration."),\r
 TEST_EMAIL_SETTINGS = Setting('TEST_EMAIL_SETTINGS', '', EMAIL_SET, dict(\r
 label = _("E-Mail settings test"),\r
 help_text = _("Test the current E-Mail configuration."),\r