merged with 0.9.x branch

ASKBOT · Dec 27, 2016 · e75c96f · e75c96f
2 parents f47a624 + f3a9bee
commit e75c96f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/askbot/feed.py b/askbot/feed.py
@@ -34,10 +34,7 @@ class RssIndividualQuestionFeed(Feed):
     """
 
     def title(self):
-        return askbot_settings.APP_TITLE + _(' - ') + \
-            _('Individual %(question)s feed') % {
-                'question': askbot_settings.WORDS_QUESTION_SINGULAR
-            }
+        return askbot_settings.APP_TITLE + _(' - ') + _('RSS feed')
 
     def feed_copyright(self):
         return askbot_settings.APP_COPYRIGHT
@@ -122,9 +119,7 @@ class RssLastestQuestionsFeed(Feed):
     """
 
     def title(self):
-        return askbot_settings.APP_TITLE + _(' - ') + \
-            _('Latest %(question)s feed') % {
-                'question': askbot_settings.WORDS_QUESTION_SINGULAR}
+        return askbot_settings.APP_TITLE + _(' - ') + _('RSS feed')
 
     def feed_copyright(self):
         return askbot_settings.APP_COPYRIGHT

diff --git a/askbot/templates/base.html b/askbot/templates/base.html
@@ -13,7 +13,6 @@
         <link
             rel="alternate"
             type="application/rss+xml"
-            title="{% trans site_title=settings.APP_SHORT_NAME %}RSS feed from {{ site_title }}{% endtrans %}"
             href="{{ base_url }}{% url "latest_questions_feed" %}"
         />
         {% block before_css %}{% endblock %}