made the number of answers label translatable.

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 18a257e580c6da93f975ab8eba6ad3874734c229..90fdfb467e3a8059e730461616b63a7f47083c21 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),
 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"))
                          request.utils.set_sort_method('active'),
                          None,
                          _("Unanswered questions"))


@@ -65,18 +65,16 @@ def questions(request):
 def tag(request, tag):
     return question_list(request,
                          Question.objects.filter(tags__name=unquote(tag)),
 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,
                          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)
 def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None, page_title=None, allowIgnoreTags=True):
     questions = initial.filter(deleted=None, in_moderation=None)
 
                          False)
 
 @decorators.list('questions', QUESTIONS_PAGE_SIZE)
 def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None, page_title=None, allowIgnoreTags=True):
     questions = initial.filter(deleted=None, in_moderation=None)
 

-    test = request.user.marked_tags
-

     if request.user.is_authenticated() and allowIgnoreTags:
         questions = questions.filter(~Q(tags__id__in = request.user.marked_tags.filter(user_selections__reason = 'bad')))
 
     if request.user.is_authenticated() and allowIgnoreTags:
         questions = questions.filter(~Q(tags__id__in = request.user.marked_tags.filter(user_selections__reason = 'bad')))
 


@@ -93,11 +91,16 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
     if page_title is None:
         page_title = _("Questions")
 
     if page_title is None:
         page_title = _("Questions")
 

+    answer_count = Answer.objects.filter(deleted=None, parent__in=questions).count()   
+    answer_description = _("answers")
+    

     return {
         "questions" : questions,
         "questions_count" : questions.count(),
     return {
         "questions" : questions,
         "questions_count" : questions.count(),

+        "answer_count" : answer_count,

         #"tags_autocomplete" : _get_tags_cache_json(),
         "list_description": list_description,
         #"tags_autocomplete" : _get_tags_cache_json(),
         "list_description": list_description,

+        "answer_description": answer_description,

         "base_path" : base_path,
         "page_title" : page_title,
         }
         "base_path" : base_path,
         "page_title" : page_title,
         }