extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-09 00:04:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #358 from flinz/django-1.9-fixes

Browse Source 
Django 1.9 compatibility
This commit is contained in:
Ross Poulton
2015-12-16 10:24:16 +11:00
parent cee87eb50d 54e541230e
commit 6187b0568c
8 changed files with 102 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
helpdesk/lib.py
View File

@ -49,6 +49,7 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
along with the File objects to be read. files can be blank.
"""
from django import VERSION
from django.conf import settings
from django.core.mail import EmailMultiAlternatives
from django.template import loader, Context
@ -57,7 +58,11 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
from helpdesk.settings import HELPDESK_EMAIL_SUBJECT_TEMPLATE
import os
context = Context(email_context)
# RemovedInDjango110Warning: render() must be called with a dict, not a Context.
if VERSION >= (1, 8):
context = email_context
else:
context = Context(email_context)
if hasattr(context['queue'], 'locale'):
locale = getattr(context['queue'], 'locale', '')