Put the badge count denormalization back.

[osqa.git] / forum / views / readers.py

diff --git a/forum/views/readers.py b/forum/views/readers.py
index c86794f308a48893d64a25510975cbfe0018c1a4..3efb554544ce8c3bbf2706064931c24017872464 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -52,7 +52,7 @@ def index(request):
 def unanswered(request):
     return question_list(request,
                          Question.objects.filter(extra_ref=None),
-                         _('Open questions without an accepted answer'),
+                         _('open questions without an accepted answer'),
                          request.utils.set_sort_method('active'),
                          None,
                          _("Unanswered questions"))
@@ -65,10 +65,10 @@ def questions(request):
 def tag(request, tag):
     return question_list(request,
                          Question.objects.filter(tags__name=unquote(tag)),
-                         mark_safe(_('Questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
+                         mark_safe(_('questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
                          request.utils.set_sort_method('active'),
                          None,
-                         mark_safe(_('Questions tagged %(tag)s') % {'tag': tag}),
+                         mark_safe(_('questions tagged %(tag)s') % {'tag': tag}),
                          False)
 
 @decorators.list('questions', QUESTIONS_PAGE_SIZE)
@@ -91,11 +91,21 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
     if page_title is None:
         page_title = _("Questions")
 
+    keywords =  ""
+    if request.GET.get("q"):
+        keywords = request.GET.get("q").strip()
+
+    answer_count = Answer.objects.filter(deleted=None, parent__in=questions).count()   
+    answer_description = _("answers")
+    
     return {
         "questions" : questions,
         "questions_count" : questions.count(),
+        "answer_count" : answer_count,
+        "keywords" : keywords,
         #"tags_autocomplete" : _get_tags_cache_json(),
         "list_description": list_description,
+        "answer_description": answer_description,
         "base_path" : base_path,
         "page_title" : page_title,
         }