Ticket #13494: bug13494.diff

django/core/mail/__init__.py

@@ -87 +87 @@
     """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 +96 @@
     """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)
 

tests/regressiontests/mail/tests.py

@@ -414 +414 @@
 Content
 -------------------------------------------------------------------------------
 
+# Make sure that adding a prefix works with translated subject (#13494).
+>>> mail_managers(ugettext_lazy('Subject'), 'Content', connection=connection)
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+Subject: [Django] Subject
+From: root@localhost
+To: nobody@example.com
+Date: ...
+Message-ID: ...
+
+Content
+-------------------------------------------------------------------------------
+
+>>> mail_admins(ugettext_lazy('Subject'), 'Content', connection=connection)
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+Subject: [Django] Subject
+From: root@localhost
+To: nobody@example.com
+Date: ...
+Message-ID: ...
+
+Content
+-------------------------------------------------------------------------------
+
+
 >>> settings.ADMINS = old_admins
 >>> settings.MANAGERS = old_managers