X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..50218f3c76fc43de83da77dda0501b5aabffa4d4:/forum/utils/mail.py

diff --git a/forum/utils/mail.py b/forum/utils/mail.py
index 8dcc047..4d11f85 100644
--- a/forum/utils/mail.py
+++ b/forum/utils/mail.py
@@ -9,7 +9,7 @@ from email.MIMEImage import MIMEImage
 from django.core.mail import DNS_NAME
 from smtplib import SMTP
 import email.Charset
-from django.conf import settings
+from forum import settings
 from django.template import loader, Context, Template
 from forum.utils.html import sanitize_html
 from forum.context import application_settings
@@ -64,7 +64,7 @@ def create_msg(subject, sender, recipient, html, text, images):
     msgRoot['Subject'] = subject
     msgRoot['From'] = named(sender)
     msgRoot['To'] =  named(recipient)
-    msgRoot.preamble = 'This is a multi-part message from %s.' % str(settings.APP_SHORT_NAME)
+    msgRoot.preamble = 'This is a multi-part message from %s.' % unicode(settings.APP_SHORT_NAME).encode('utf8')
 
     msgAlternative = MIMEMultipart('alternative')
     msgRoot.attach(msgAlternative)
@@ -86,9 +86,10 @@ def create_msg(subject, sender, recipient, html, text, images):
 
 def send_email(subject, recipients, template, context={}, sender=None, images=[], threaded=True):
     if sender is None:
-        sender = (str(settings.APP_SHORT_NAME), str(settings.DEFAULT_FROM_EMAIL))
+        sender = (unicode(settings.APP_SHORT_NAME), unicode(settings.DEFAULT_FROM_EMAIL))
 
-    images.append((os.path.join(str(settings.UPFILES_FOLDER), os.path.basename(str(settings.APP_LOGO))), 'logo'))
+    if not len(images):
+        images = [(os.path.join(str(settings.UPFILES_FOLDER), os.path.basename(str(settings.APP_LOGO))), 'logo')]
 
     context.update(application_settings(None))
     html_body = loader.get_template(template).render(Context(context))