X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/25d2724e64a7828113860d6f7232815a34133ec1..4f6bdf82bd020d966714f8aba451781072a13d47:/forum/views/readers.py?ds=sidebyside diff --git a/forum/views/readers.py b/forum/views/readers.py index 32aedec..d988230 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -1,4 +1,4 @@ -# encoding:utf-8 +# encoding:utf-8 import datetime import logging from urllib import unquote @@ -55,7 +55,7 @@ def unanswered(request): _('open questions without an accepted answer'), request.utils.set_sort_method('active'), None, - _("Unanswered questions")) + _("Unanswered Questions")) @decorators.render('questions.html', 'questions') def questions(request): @@ -68,12 +68,17 @@ def tag(request, tag): mark_safe(_('questions tagged %(tag)s') % {'tag': tag}), request.utils.set_sort_method('active'), None, - mark_safe(_('questions tagged %(tag)s') % {'tag': tag}), + mark_safe(_('Questions Tagged With %(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, +def question_list(request, initial, + list_description=_('questions'), + sort=None, + base_path=None, + page_title=_("All Questions"), allowIgnoreTags=True): + questions = initial.filter_state(deleted=False) if request.user.is_authenticated() and allowIgnoreTags: @@ -134,8 +139,11 @@ def search(request): def question_search(request, keywords): initial = Question.objects.search(keywords) - return question_list(request, initial, _("questions matching '%(keywords)s'") % {'keywords': keywords}, - base_path="%s?t=question&q=%s" % (reverse('search'), django_urlquote(keywords)), sort=False) + return question_list(request, initial, + _("questions matching '%(keywords)s'") % {'keywords': keywords}, + False, + "%s?t=question&q=%s" % (reverse('search'),django_urlquote(keywords)), + _("questions matching '%(keywords)s'") % {'keywords': keywords}) def tags(request):#view showing a listing of available tags - plain list