From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Thu, 19 Apr 2012 22:22:25 +0000 (+0000)
Subject: OSQA-829, resolves a unicode problem when answering question, use smart_unicode for... 
X-Git-Tag: live~64
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/b03fbe3fb080bdcec16778e981c61c67ec7e3bac?ds=sidebyside;hp=626876f896404c5b8ed10e200d95cbedc5158f5b

OSQA-829, resolves a unicode problem when answering question, use smart_unicode for the username field which is used in the friendly_username and friendly_ownername methods of the ActionProxy class

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

diff --git a/forum/models/action.py b/forum/models/action.py
index 3aa6582..7e88745 100644
--- a/forum/models/action.py
+++ b/forum/models/action.py
@@ -1,4 +1,6 @@
 from django.utils.translation import ugettext as _
+from django.utils.encoding import smart_unicode
+
 from utils import PickledObjectField
 from threading import Thread
 from forum.utils import html
@@ -213,10 +215,10 @@ class ActionProxy(Action):
     __metaclass__ = ActionProxyMetaClass
 
     def friendly_username(self, viewer, user):
-        return (viewer == user) and _('You') or user.username
+        return (viewer == user) and _('You') or smart_unicode(user.username)
 
     def friendly_ownername(self, owner, user):
-        return (owner == user) and _('your') or user.username
+        return (owner == user) and _('your') or smart_unicode(user.username)
 
     def viewer_or_user_verb(self, viewer, user, viewer_verb, user_verb):
         return (viewer == user) and viewer_verb or user_verb