Fixed #13494 -- Correctly concat an email subject prefix with a translation string. Thanks, hcarvalhoalves and Andi Albrecht.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14157 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/regressiontests/mail/tests.py b/tests/regressiontests/mail/tests.py
index b0c60d836e..d2f7562d8f 100644
--- a/tests/regressiontests/mail/tests.py
+++ b/tests/regressiontests/mail/tests.py
@@ -343,3 +343,23 @@ class MailTests(TestCase):
         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','nobody@example.com')]
+
+        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