OSQA-828, Support fullname to real_name mapping from OpenID providers

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

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 5e8bddfbafe27285035595fae3536c7a6ec8f032..71a7136df5b280daaedee55237043dccf0fcc762 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 forms import TestEmailSettingsWidget\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
@@ -36,7 +31,7 @@ EMAIL_HOST_PASSWORD = Setting('EMAIL_HOST_PASSWORD', '', EMAIL_SET, dict(
 label = _("Email Password"),\r
 help_text = _("The password for your SMTP connection."),\r
 required=False,\r
-widget=PasswordInput))\r
+widget=PasswordInput(render_value=True)))\r
 \r
 EMAIL_USE_TLS = Setting('EMAIL_USE_TLS', False, EMAIL_SET, dict(\r
 label = _("Use TLS"),\r
@@ -48,9 +43,14 @@ label = _("Site 'from' Email Address"),
 help_text = _("The address that will show up on the 'from' field on emails sent by your website."),\r
 required=False))\r
 \r
+DEFAULT_REPLY_TO_EMAIL = Setting('DEFAULT_REPLY_TO_EMAIL', '', EMAIL_SET, dict(\r
+label = _("Site 'reply-to' Email Address"),\r
+help_text = _("The address that will show up on the 'reply-to' field on emails sent by your website."),\r
+required=False))\r
+\r
 EMAIL_SUBJECT_PREFIX = Setting('EMAIL_SUBJECT_PREFIX', '', EMAIL_SET, dict(\r
 label = _("Email Subject Prefix"),\r
-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 easily set up a filter on theyr email clients."),\r
+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 easily set up a filter on their email clients."),\r
 required=False))\r
 \r
 EMAIL_FOOTER_TEXT = Setting(u'EMAIL_FOOTER_TEXT', '', EMAIL_SET, dict(\r
@@ -73,6 +73,14 @@ label = _("Email Link Style"),
 help_text = _("A valid css string to be used to style email links (the A tag)."),\r
 required=False))\r
 \r
+SEND_DIGEST_ONLY_TO_ACTIVE_USERS = Setting('SEND_DIGEST_ONLY_TO_ACTIVE_USERS', True, EMAIL_SET, dict(\r
+label = _("Send digest only to active users"),\r
+help_text = _("If checked the daily digest won't be sent to users that have been suspended."),\r
+required=False))\r
 \r
+SEND_DIGEST_ONLY_TO_VALIDATED_USERS = Setting('SEND_DIGEST_ONLY_TO_VALIDATED_USERS', True, EMAIL_SET, dict(\r
+label = _("Send digest only to validated users"),\r
+help_text = _("If checked the daily digest won't be sent to users that haven't validated their emails."),\r
+required=False))\r
 \r
 EMAIL_DIGEST_FLAG = Setting('EMAIL_DIGEST_FLAG', None)\r