Improvements on full text search.

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

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 43baeb5a4d97481bc1ca61a9c28fc2ed849977ab..d1a46c4b7ba457750644fb434843860fd29c8743 100644 (file)
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -1,53 +1,43 @@
 from base import Setting, SettingSet\r
 from django.utils.translation import ugettext_lazy as _\r
 from base import Setting, SettingSet\r
 from django.utils.translation import ugettext_lazy as _\r

+from django.forms.widgets import PasswordInput\r

 \r
 \r

-EMAIL_SET = SettingSet('email', _('Email Settings'), _("Email server and other email related settings."), 50)\r
+EMAIL_SET = SettingSet('email', _('Email settings'), _("Email server and other email related settings."), 50)\r

 \r
 EMAIL_HOST = Setting('EMAIL_HOST', '', EMAIL_SET, dict(\r
 label = _("Email Server"),\r
 \r
 EMAIL_HOST = Setting('EMAIL_HOST', '', EMAIL_SET, dict(\r
 label = _("Email Server"),\r

-help_text = _("""\r
-The SMTP server through which your application will be sending emails.\r
-"""),\r
+help_text = _("The SMTP server through which your application will be sending emails."),\r

 required=False))\r
 \r
 EMAIL_PORT = Setting('EMAIL_PORT', 25, EMAIL_SET, dict(\r
 label = _("Email Port"),\r
 required=False))\r
 \r
 EMAIL_PORT = Setting('EMAIL_PORT', 25, EMAIL_SET, dict(\r
 label = _("Email Port"),\r

-help_text = _("""\r
-The port on which your SMTP server is listening to. Usually this is 25, but can be something else.\r
-"""),\r
+help_text = _("The port on which your SMTP server is listening to. Usually this is 25, but can be something else."),\r

 required=False))\r
 \r
 EMAIL_HOST_USER = Setting('EMAIL_HOST_USER', '', EMAIL_SET, dict(\r
 label = _("Email User"),\r
 required=False))\r
 \r
 EMAIL_HOST_USER = Setting('EMAIL_HOST_USER', '', EMAIL_SET, dict(\r
 label = _("Email User"),\r

-help_text = _("""\r
-The username for your SMTP connection.\r
-"""),\r
+help_text = _("The username for your SMTP connection."),\r

 required=False))\r
 \r
 EMAIL_HOST_PASSWORD = Setting('EMAIL_HOST_PASSWORD', '', EMAIL_SET, dict(\r
 label = _("Email Password"),\r
 required=False))\r
 \r
 EMAIL_HOST_PASSWORD = Setting('EMAIL_HOST_PASSWORD', '', EMAIL_SET, dict(\r
 label = _("Email Password"),\r

-help_text = _("""\r
-The password for your SMTP connection.\r
-"""),\r
-required=False))\r
+help_text = _("The password for your SMTP connection."),\r
+required=False,\r
+widget=PasswordInput))\r

 \r
 EMAIL_USE_TLS = Setting('EMAIL_USE_TLS', False, EMAIL_SET, dict(\r
 label = _("Use TLS"),\r
 \r
 EMAIL_USE_TLS = Setting('EMAIL_USE_TLS', False, EMAIL_SET, dict(\r
 label = _("Use TLS"),\r

-help_text = _("""\r
-Does your SMTP server uses TLS for authentication.\r
-"""),\r
+help_text = _("Does your SMTP server usFes TLS for authentication."),\r

 required=False))\r
 \r
 DEFAULT_FROM_EMAIL = Setting('DEFAULT_FROM_EMAIL', '', EMAIL_SET, dict(\r
 required=False))\r
 \r
 DEFAULT_FROM_EMAIL = Setting('DEFAULT_FROM_EMAIL', '', EMAIL_SET, dict(\r

-label = _("Site email address"),\r
-help_text = _("""\r
-The address that will show up on the 'from' field on emails sent by your website.\r
-"""),\r
+label = _("Site 'from' email address"),\r
+help_text = _("The address that will show up on the 'from' 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
 required=False))\r
 \r
 EMAIL_SUBJECT_PREFIX = Setting('EMAIL_SUBJECT_PREFIX', '', EMAIL_SET, dict(\r
 label = _("Email subject prefix"),\r

-help_text = _("""\r
-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 easilly set up a filter on theyr email clients.\r
-"""),\r
-required=False))
\ No newline at end of file
+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 easilly set up a filter on theyr email clients."),\r
+required=False))\r
+\r
+EMAIL_DIGEST_CONTROL = Setting('EMAIL_DIGEST_CONTROL', None)\r