Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added EMAIL_SUBJECT_PREFIX setting so you can customize the "[Django]…

…" prefix

on emails send with mail_admins/mail_managers.  Refs #568.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2d1303bd68ee42e5c8014e2b479fc0f11cb8c08d 1 parent cac9914
@jacobian jacobian authored
Showing with 7 additions and 3 deletions.
  1. +4 −0 django/conf/global_settings.py
  2. +3 −3 django/core/mail.py
View
4 django/conf/global_settings.py
@@ -67,6 +67,10 @@
# the site managers.
DEFAULT_FROM_EMAIL = 'webmaster@localhost'
+# Subject-line prefix for email messages send with django.core.mail.mail_admins
+# or ...mail_managers. Make sure to include the trailing space.
+EMAIL_SUBJECT_PREFIX = '[Django] '
+
# Whether to append trailing slashes to URLs.
APPEND_SLASH = True
View
6 django/core/mail.py
@@ -1,6 +1,6 @@
# Use this module for e-mailing.
-from django.conf.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST
+from django.conf.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST, EMAIL_SUBJECT_PREFIX
from email.MIMEText import MIMEText
import smtplib
@@ -41,9 +41,9 @@ def send_mass_mail(datatuple, fail_silently=False):
def mail_admins(subject, message, fail_silently=False):
"Sends a message to the admins, as defined by the ADMINS constant in settings.py."
from django.conf.settings import ADMINS, SERVER_EMAIL
- send_mail('[Django] ' + subject, message, SERVER_EMAIL, [a[1] for a in ADMINS], fail_silently)
+ send_mail(EMAIL_SUBJECT_PREFIX + subject, message, SERVER_EMAIL, [a[1] for a in ADMINS], fail_silently)
def mail_managers(subject, message, fail_silently=False):
"Sends a message to the managers, as defined by the MANAGERS constant in settings.py"
from django.conf.settings import MANAGERS, SERVER_EMAIL
- send_mail('[Django] ' + subject, message, SERVER_EMAIL, [a[1] for a in MANAGERS], fail_silently)
+ send_mail(EMAIL_SUBJECT_PREFIX + subject, message, SERVER_EMAIL, [a[1] for a in MANAGERS], fail_silently)
Please sign in to comment.
Something went wrong with that request. Please try again.