X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/2444d6ffd7995be782615589fb1d5aef2c8277ce..cf523df2eb6e7b696c693e68b449a2c541bbaa67:/forum/settings/email.py?ds=inline diff --git a/forum/settings/email.py b/forum/settings/email.py index 5e8bddf..e934d30 100644 --- 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 _ from django.forms.widgets import PasswordInput from django.forms.widgets import RadioSelect +from forms import TestEmailSettingsWidget EMAIL_SET = SettingSet('email', _('Email settings'), _("Email server and other email related settings."), 50) -EMAIL_SUBSCRIBE_CHOICES = ( - ('y', _('Users are subscribed by default')), - ('n', _('Users are not subscribed by default')), -) - -INITIAL_EMAIL_SUBSCRIBE_OPTION = Setting('INITIAL_EMAIL_SUBSCRIBE_OPTION', 'y', EMAIL_SET, dict( -label = _("Default email subscription"), -widget=RadioSelect, -choices=EMAIL_SUBSCRIBE_CHOICES, -help_text = _("Choose what should be the default email subscription status while registering."), -required=False)) +TEST_EMAIL_SETTINGS = Setting('TEST_EMAIL_SETTINGS', '', EMAIL_SET, dict( +label = _("E-Mail settings test"), +help_text = _("Test the current E-Mail configuration."), +required=False, +widget=TestEmailSettingsWidget)) EMAIL_HOST = Setting('EMAIL_HOST', '', EMAIL_SET, dict( label = _("Email Server"), @@ -50,7 +45,7 @@ required=False)) EMAIL_SUBJECT_PREFIX = Setting('EMAIL_SUBJECT_PREFIX', '', EMAIL_SET, dict( label = _("Email Subject Prefix"), -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."), +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."), required=False)) EMAIL_FOOTER_TEXT = Setting(u'EMAIL_FOOTER_TEXT', '', EMAIL_SET, dict(