OSQA-497, adding a new settings that allows to specify whether the permissions to...

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

diff --git a/forum/settings/email.py b/forum/settings/email.py
index ec271019efce6816aef2acb198e0036790d2e5f1..e934d30a4ac9b52e0b2e37ea3deff06f94d524cd 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


@@ -57,7 +45,7 @@ required=False))
 \r
 EMAIL_SUBJECT_PREFIX = Setting('EMAIL_SUBJECT_PREFIX', '', EMAIL_SET, dict(\r
 label = _("Email Subject Prefix"),\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
 required=False))\r
 \r
 EMAIL_FOOTER_TEXT = Setting(u'EMAIL_FOOTER_TEXT', '', EMAIL_SET, dict(\r