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 branch 'kotowicz-master', manually merging conflicts in these files:

Browse Source 
helpdesk/lib.py
	helpdesk/templates/helpdesk/ticket_desc_table.html
	helpdesk/views/staff.py
This commit is contained in:
Ross Poulton
2012-01-11 09:18:05 +00:00
parent 7dca5ce3ae 2d882a393c
commit 533fdc8c2a
26 changed files with 3172 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
helpdesk/lib.py
View File

@ -57,7 +57,13 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
import os
context = Context(email_context)
locale = context['queue'].get('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:
@ -102,7 +108,8 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
).render(context)
if isinstance(recipients,(str,unicode)):
recipients = recipients.split(',')
if recipients.find(','):
recipients = recipients.split(',')
elif type(recipients) != list:
recipients = [recipients,]