OSQA-766, smart_encode the item titles for the question RSS feeds

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

diff --git a/forum/feed.py b/forum/feed.py
index f22cbc94df615d039cdf799c1b66d52e308d1ebd..7bf72072d6ada3546fe3a4e2d037357c159df307 100644 (file)
--- a/forum/feed.py
+++ b/forum/feed.py
@@ -6,6 +6,7 @@ except:
     old_version = True
 
 from django.http import HttpResponse
     old_version = True
 
 from django.http import HttpResponse

+from django.utils.encoding import smart_unicode

 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from models import Question
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from models import Question


@@ -83,7 +84,11 @@ class RssAnswerFeed(BaseNodeFeed):
         title_template = "feeds/rss_answer_title.html"
 
     def __init__(self, request, question, include_comments=False):
         title_template = "feeds/rss_answer_title.html"
 
     def __init__(self, request, question, include_comments=False):

-        super(RssAnswerFeed, self).__init__(request, _("Answers to: %s") % question.title, question.html, question.get_absolute_url())
+        super(RssAnswerFeed, self).__init__(
+            request, _("Answers to: %s") % smart_unicode(question.title),
+            question.html,
+            question.get_absolute_url()
+        )

         self._question = question
         self._include_comments = include_comments
 
         self._question = question
         self._include_comments = include_comments
 


@@ -97,12 +102,10 @@ class RssAnswerFeed(BaseNodeFeed):
 
     def item_title(self, item):
         if item.node_type == "answer":
 
     def item_title(self, item):
         if item.node_type == "answer":

-            return _("Answer by %s") % item.author.username
+            return _("Answer by %s") % smart_unicode(item.author.username)

         else:
             return _("Comment by %(cauthor)s on %(pauthor)s's %(qora)s") % dict(
         else:
             return _("Comment by %(cauthor)s on %(pauthor)s's %(qora)s") % dict(

-                cauthor=item.author.username, pauthor=item.parent.author.username, qora=(item.parent.node_type == "answer" and _("answer") or _("question"))
+                cauthor=smart_unicode(item.author.username),
+                pauthor=smart_unicode(item.parent.author.username),
+                qora=(item.parent.node_type == "answer" and _("answer") or _("question"))

             )
             )

-
-
-
-