git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@244 0cfe37f9-358a-4d5e-be75-b63607...

[osqa.git] / forum / utils / mail.py

diff --git a/forum/utils/mail.py b/forum/utils/mail.py
index 1dc2209f81b21e87dc8ea095ca4ca9dcea9ef470..4d11f854d710a625f9b5a5f690b51fe4faf87136 100644 (file)
--- 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\r
 from smtplib import SMTP\r
 import email.Charset\r
-from django.conf import settings\r
+from forum import settings\r
 from django.template import loader, Context, Template\r
 from forum.utils.html import sanitize_html\r
 from forum.context import application_settings\r
@@ -64,7 +64,7 @@ def create_msg(subject, sender, recipient, html, text, images):
     msgRoot['Subject'] = subject\r
     msgRoot['From'] = named(sender)\r
     msgRoot['To'] =  named(recipient)\r
-    msgRoot.preamble = 'This is a multi-part message from %s.' % str(settings.APP_SHORT_NAME)\r
+    msgRoot.preamble = 'This is a multi-part message from %s.' % unicode(settings.APP_SHORT_NAME).encode('utf8')\r
 \r
     msgAlternative = MIMEMultipart('alternative')\r
     msgRoot.attach(msgAlternative)\r
@@ -86,7 +86,7 @@ def create_msg(subject, sender, recipient, html, text, images):
 \r
 def send_email(subject, recipients, template, context={}, sender=None, images=[], threaded=True):\r
     if sender is None:\r
-        sender = (str(settings.APP_SHORT_NAME), str(settings.DEFAULT_FROM_EMAIL))\r
+        sender = (unicode(settings.APP_SHORT_NAME), unicode(settings.DEFAULT_FROM_EMAIL))\r
 \r
     if not len(images):\r
         images = [(os.path.join(str(settings.UPFILES_FOLDER), os.path.basename(str(settings.APP_LOGO))), 'logo')]\r