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

[osqa.git] / forum / settings / email.py

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 5e8bddfbafe27285035595fae3536c7a6ec8f032..b83631e955235e3220a666c893bfaadc4f6b38bb 100644 (file)
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -2,20 +2,15 @@ from base import Setting, SettingSet
 from django.utils.translation import ugettext_lazy as _\r
 from django.forms.widgets import PasswordInput\r
 from django.forms.widgets import RadioSelect\r
 from django.utils.translation import ugettext_lazy as _\r
 from django.forms.widgets import PasswordInput\r
 from django.forms.widgets import RadioSelect\r

+from forms import TestEmailSettingsWidget\r

 \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
+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
+required=False,\r
+widget=TestEmailSettingsWidget))\r

 \r
 EMAIL_HOST = Setting('EMAIL_HOST', '', EMAIL_SET, dict(\r
 label = _("Email Server"),\r
 \r
 EMAIL_HOST = Setting('EMAIL_HOST', '', EMAIL_SET, dict(\r
 label = _("Email Server"),\r