forked from extern/django-helpdesk
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:
parent
d44fba380d
commit
2aaaf57504
@ -54,13 +54,7 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
context = Context(email_context)
|
context = Context(email_context)
|
||||||
locale = 'en';
|
|
||||||
if hasattr(context['queue'], 'locale'):
|
|
||||||
locale = getattr(context['queue'], 'locale', '')
|
|
||||||
else:
|
|
||||||
locale = context['queue'].get('locale', 'en')
|
locale = context['queue'].get('locale', 'en')
|
||||||
if not locale:
|
|
||||||
locale = 'en'
|
|
||||||
|
|
||||||
t = None
|
t = None
|
||||||
try:
|
try:
|
||||||
|
Loading…
Reference in New Issue
Block a user