Small fix on the new get method for users.

[osqa.git] / forum / feed.py

diff --git a/forum/feed.py b/forum/feed.py
index 72e085d82408bb1160b9fddb54f9eb336d6aefbe..420a117eea37ca658437d15ba902a4f852255c89 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


@@ -15,7 +16,7 @@ from forum.utils.pagination import generate_uri
 
 @decorate(add_domain, needs_origin=False)
 def add_domain(domain, url, *args, **kwargs):
 
 @decorate(add_domain, needs_origin=False)
 def add_domain(domain, url, *args, **kwargs):

-    return "%s%s" % (settings.APP_URL, url)
+    return "%s%s" % (settings.APP_BASE_URL, url)

 
 class BaseNodeFeed(Feed):
     if old_version:
 
 class BaseNodeFeed(Feed):
     if old_version:


@@ -24,7 +25,7 @@ class BaseNodeFeed(Feed):
 
     def __init__(self, request, title, description, url):
         self._title = title
 
     def __init__(self, request, title, description, url):
         self._title = title

-        self._description = mark_safe(unicode(description))
+        self._description = mark_safe(description.encode("utf-8"))

         self._url = url
 
         if old_version:
         self._url = url
 
         if old_version:


@@ -67,7 +68,7 @@ class BaseNodeFeed(Feed):
 
 class RssQuestionFeed(BaseNodeFeed):
     def __init__(self, request, question_list, title, description):
 
 class RssQuestionFeed(BaseNodeFeed):
     def __init__(self, request, question_list, title, description):

-        url = request.path + "&" + generate_uri(request.GET, (_('page'), _('pagesize'), _('sort')))
+        url = request.path + "?" + generate_uri(request.GET, (_('page'), _('pagesize'), _('sort')))

         super(RssQuestionFeed, self).__init__(request, title, description, url)
 
         self._question_list = question_list
         super(RssQuestionFeed, self).__init__(request, title, description, url)
 
         self._question_list = question_list


@@ -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"))

             )
             )

-
-
-
-