Merge pull request #24 from kjona/master

Bugfix: Non ascii-chars in user name
zapier · Mar 8, 2012 · 75f17b7 · 75f17b7
2 parents e4e155d + 80cadaa
commit 75f17b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/knowledge/models.py b/knowledge/models.py
@@ -81,7 +81,7 @@ def get_name(self):
         Get local name, then self.user's first/last, and finally
         their username if all else fails.
         """
-        name = (self.name or '{0} {1}'.format(
+        name = (self.name or u'{0} {1}'.format(
             self.user.first_name, self.user.last_name))
         return name.strip() or self.user.username
 

diff --git a/knowledge/signals.py b/knowledge/signals.py
@@ -15,7 +15,7 @@ def send_alerts(target_dict, response=None, question=None, **kwargs):
 
     for email, name in target_dict.items():
         if isinstance(name, User):
-            name = '{0} {1}'.format(name.first_name, name.last_name)
+            name = u'{0} {1}'.format(name.first_name, name.last_name)
         else:
             name = name[0]