OSQA-829, resolves a unicode problem when answering question, use smart_unicode for...

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 3aa6582161ddcc7679d31ca7e4473a21cf99d3b0..7e887452dcd0451909cc618f834179ade80fd2a4 100644 (file)
--- a/forum/models/action.py
+++ b/forum/models/action.py
@@ -1,4 +1,6 @@
 from django.utils.translation import ugettext as _
 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
 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):
     __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):
 
     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
 
     def viewer_or_user_verb(self, viewer, user, viewer_verb, user_verb):
         return (viewer == user) and viewer_verb or user_verb