summaryrefslogtreecommitdiff
path: root/django/conf
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2005-09-27 16:32:21 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2005-09-27 16:32:21 +0000
commit2d1303bd68ee42e5c8014e2b479fc0f11cb8c08d (patch)
tree7e5913aa6331c4f2f9f7114b883b41f37334d1e4 /django/conf
parentcac99144fd7fb38f485be9fb049d380bc6415f9d (diff)
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
Diffstat (limited to 'django/conf')
-rw-r--r--django/conf/global_settings.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 59edbcec70..9876713718 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -67,6 +67,10 @@ ADMIN_MEDIA_PREFIX = '/media/'
# 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