X-Git-Url: https://git.openstreetmap.org/osqa.git/blobdiff_plain/65f6c0b27a2f422e3e61870b84f73f4b2908d147..8b123b1f0d204c972d5a2554f9b27e4f7d8ae33f:/forum/settings/email.py

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 2a46e29..583ab0d 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"),
@@ -40,17 +35,17 @@ widget=PasswordInput))
 
 EMAIL_USE_TLS = Setting('EMAIL_USE_TLS', False, EMAIL_SET, dict(
 label = _("Use TLS"),
-help_text = _("Does your SMTP server usFes TLS for authentication."),
+help_text = _("Whether to use TLS for authentication with your SMTP server."),
 required=False))
 
 DEFAULT_FROM_EMAIL = Setting('DEFAULT_FROM_EMAIL', '', EMAIL_SET, dict(
-label = _("Site 'from' email address"),
+label = _("Site 'from' Email Address"),
 help_text = _("The address that will show up on the 'from' field on emails sent by your website."),
 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."),
+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 their email clients."),
 required=False))
 
 EMAIL_FOOTER_TEXT = Setting(u'EMAIL_FOOTER_TEXT', '', EMAIL_SET, dict(
@@ -59,20 +54,28 @@ help_text = _("Email footer text, usually \"CAN SPAM\" compliance, or the physic
 required=False))
 
 EMAIL_BORDER_COLOR = Setting('EMAIL_BORDER_COLOR', '#e5ebf8', EMAIL_SET, dict(
-label = _("Email Border color"),
+label = _("Email Border Color"),
 help_text = _("The outter border color of the email base template"),
 required=False))
 
 EMAIL_PARAGRAPH_STYLE = Setting('EMAIL_PARAGRAPH_STYLE', "color:#333333;font-family:'helvetica neue', arial, Helvetica, sans-serif;line-height:18px;font-size:14px;margin-top:10px;", EMAIL_SET, dict(
-label = _("Email Paragraph style"),
+label = _("Email Paragraph Style"),
 help_text = _("A valid css string to be used to style email paragraphs (the P tag)."),
 required=False))
 
 EMAIL_ANCHOR_STYLE = Setting('EMAIL_ANCHOR_STYLE', "text-decoration:none;color:#3060a8;font-weight:bold;", EMAIL_SET, dict(
-label = _("Email link style"),
+label = _("Email Link Style"),
 help_text = _("A valid css string to be used to style email links (the A tag)."),
 required=False))
 
+SEND_DIGEST_ONLY_TO_ACTIVE_USERS = Setting('SEND_DIGEST_ONLY_TO_ACTIVE_USERS', True, EMAIL_SET, dict(
+label = _("Send digest only to active users"),
+help_text = _("If checked the daily digest won't be sent to users that have been suspended."),
+required=False))
 
+SEND_DIGEST_ONLY_TO_VALIDATED_USERS = Setting('SEND_DIGEST_ONLY_TO_VALIDATED_USERS', True, EMAIL_SET, dict(
+label = _("Send digest only to validated users"),
+help_text = _("If checked the daily digest won't be sent to users that haven't validated their emails."),
+required=False))
 
 EMAIL_DIGEST_FLAG = Setting('EMAIL_DIGEST_FLAG', None)