Merging jambazov --> trunk.

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

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 5e8bddfbafe27285035595fae3536c7a6ec8f032..ec271019efce6816aef2acb198e0036790d2e5f1 100644 (file)
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -2,6 +2,7 @@ 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 forms import TestEmailSettingsWidget\r
 \r
 EMAIL_SET = SettingSet('email', _('Email settings'), _("Email server and other email related settings."), 50)\r
 \r
@@ -17,6 +18,12 @@ choices=EMAIL_SUBSCRIBE_CHOICES,
 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
+required=False,\r
+widget=TestEmailSettingsWidget))\r
+\r
 EMAIL_HOST = Setting('EMAIL_HOST', '', EMAIL_SET, dict(\r
 label = _("Email Server"),\r
 help_text = _("The SMTP server through which your application will be sending emails."),\r