Django

Code

Changeset 710

Show
Ignore:
Timestamp:
09/27/05 11:32:21 (3 years ago)
Author:
jacob
Message:

Added EMAIL_SUBJECT_PREFIX setting so you can customize the "[Django]" prefix
on emails send with mail_admins/mail_managers. Refs #568.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/conf/global_settings.py

    r670 r710  
    6767# the site managers. 
    6868DEFAULT_FROM_EMAIL = 'webmaster@localhost' 
     69 
     70# Subject-line prefix for email messages send with django.core.mail.mail_admins 
     71# or ...mail_managers.  Make sure to include the trailing space. 
     72EMAIL_SUBJECT_PREFIX = '[Django] ' 
    6973 
    7074# Whether to append trailing slashes to URLs. 

  • django/trunk/django/core/mail.py

    r54 r710  
    11# Use this module for e-mailing. 
    22 
    3 from django.conf.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST 
     3from django.conf.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST, EMAIL_SUBJECT_PREFIX 
    44from email.MIMEText import MIMEText 
    55import smtplib 
    …… 
    4242    "Sends a message to the admins, as defined by the ADMINS constant in settings.py." 
    4343    from django.conf.settings import ADMINS, SERVER_EMAIL 
    44     send_mail('[Django] ' + subject, message, SERVER_EMAIL, [a[1] for a in ADMINS], fail_silently) 
     44    send_mail(EMAIL_SUBJECT_PREFIX + subject, message, SERVER_EMAIL, [a[1] for a in ADMINS], fail_silently) 
    4545 
    4646def mail_managers(subject, message, fail_silently=False): 
    4747    "Sends a message to the managers, as defined by the MANAGERS constant in settings.py" 
    4848    from django.conf.settings import MANAGERS, SERVER_EMAIL 
    49     send_mail('[Django] ' + subject, message, SERVER_EMAIL, [a[1] for a in MANAGERS], fail_silently) 
     49    send_mail(EMAIL_SUBJECT_PREFIX + subject, message, SERVER_EMAIL, [a[1] for a in MANAGERS], fail_silently)