Author: jezdez
Date: 2010-10-11 17:36:17 -0500 (Mon, 11 Oct 2010)
New Revision: 14159
Modified:
django/branches/releases/1.2.X/django/core/mail/__init__.py
django/branches/releases/1.2.X/tests/regressiontests/mail/tests.py
Log:
[1.2.X] Fixed #13494 -- Correctly concat an email subject prefix with a
translation string. Thanks, hcarvalhoalves and Andi Albrecht.
Backport from trunk (r14157).
Modified: django/branches/releases/1.2.X/django/core/mail/__init__.py
===================================================================
--- django/branches/releases/1.2.X/django/core/mail/__init__.py 2010-10-11
22:35:24 UTC (rev 14158)
+++ django/branches/releases/1.2.X/django/core/mail/__init__.py 2010-10-11
22:36:17 UTC (rev 14159)
@@ -87,7 +87,7 @@
"""Sends a message to the admins, as defined by the ADMINS setting."""
if not settings.ADMINS:
return
- EmailMessage(settings.EMAIL_SUBJECT_PREFIX + subject, message,
+ EmailMessage(u'%s%s' % (settings.EMAIL_SUBJECT_PREFIX, subject), message,
settings.SERVER_EMAIL, [a[1] for a in settings.ADMINS],
connection=connection).send(fail_silently=fail_silently)
@@ -96,7 +96,7 @@
"""Sends a message to the managers, as defined by the MANAGERS setting."""
if not settings.MANAGERS:
return
- EmailMessage(settings.EMAIL_SUBJECT_PREFIX + subject, message,
+ EmailMessage(u'%s%s' % (settings.EMAIL_SUBJECT_PREFIX, subject), message,
settings.SERVER_EMAIL, [a[1] for a in settings.MANAGERS],
connection=connection).send(fail_silently=fail_silently)
Modified: django/branches/releases/1.2.X/tests/regressiontests/mail/tests.py
===================================================================
--- django/branches/releases/1.2.X/tests/regressiontests/mail/tests.py
2010-10-11 22:35:24 UTC (rev 14158)
+++ django/branches/releases/1.2.X/tests/regressiontests/mail/tests.py
2010-10-11 22:36:17 UTC (rev 14159)
@@ -316,3 +316,23 @@
settings.ADMINS = old_admins
settings.MANAGERS = old_managers
+ def test_mail_prefix(self):
+ """Test prefix argument in manager/admin mail."""
+ # Regression for #13494.
+ old_admins = settings.ADMINS
+ old_managers = settings.MANAGERS
+ settings.ADMINS = settings.MANAGERS = [('nobody','[email protected]')]
+
+ mail_managers(ugettext_lazy('Subject'), 'Content')
+ self.assertEqual(len(mail.outbox), 1)
+ message = mail.outbox[0]
+ self.assertEqual(message.subject, '[Django] Subject')
+
+ mail.outbox = []
+ mail_admins(ugettext_lazy('Subject'), 'Content')
+ self.assertEqual(len(mail.outbox), 1)
+ message = mail.outbox[0]
+ self.assertEqual(message.subject, '[Django] Subject')
+
+ settings.ADMINS = old_admins
+ settings.MANAGERS = old_managers
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
