Pull in changes from bclermont to fix content-type handling on queues when processing incoming e-mail. Closes GH-70.

This commit is contained in:
Ross Poulton 2011-11-05 00:56:53 +00:00
parent d44fba380d
commit 2aaaf57504

View File

@ -54,13 +54,7 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
import os
context = Context(email_context)
locale = 'en';
if hasattr(context['queue'], 'locale'):
locale = getattr(context['queue'], 'locale', '')
else:
locale = context['queue'].get('locale', 'en')
if not locale:
locale = 'en'
t = None
try: