undoing changes made in commit #1080

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1085 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/skins/default/templates/users/stats.html b/forum/skins/default/templates/users/stats.html
index f2eb736221e1415c83af340ddb31522c7fb348a0..fe34b19f3010f415629ef5ca8d8eb72e366a7b0f 100644 (file)
--- a/forum/skins/default/templates/users/stats.html
+++ b/forum/skins/default/templates/users/stats.html
@@ -11,9 +11,9 @@
         {% spaceless %}
             <h2>
                 {% blocktrans count questions.paginator.count as counter %}
-                <span class="count">{{counter}}</span> {% trans "Question" %}
+                <span class="count">{{counter}}</span> Question
                 {% plural %}
-                <span class="count">{{counter}}</span> {% trans "Questions" %}
+                <span class="count">{{counter}}</span> Questions
                 {% endblocktrans %}
                 <a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');"
                     href="{{ view_user.get_asked_url }}?type=rss" title="{% trans "subscribe to question RSS feed" %}"></a>
@@ -33,9 +33,9 @@
         {% spaceless %}
             <h2>
                 {% blocktrans count answers.paginator.count as counter %}
-                <span class="count">{{counter}}</span> {% trans "Answer" %}
+                <span class="count">{{counter}}</span> Answer
                 {% plural %}
-                <span class="count">{{counter}}</span> {% trans "Answers" %}
+                <span class="count">{{counter}}</span> Answers
                 {% endblocktrans %}
             </h2>
         {% endspaceless %}
@@ -65,9 +65,9 @@
         {% spaceless %}
             <h2>
                 {% blocktrans count total_votes as cnt %}
-                    <span class="count">{{cnt}}</span> {% trans "Vote" %}
+                    <span class="count">{{cnt}}</span> Vote
                 {% plural %}
-                    <span class="count">{{cnt}}</span> {% trans "Votes" %}
+                    <span class="count">{{cnt}}</span> Votes
                 {% endblocktrans %}
             </h2>
         {% endspaceless %}
@@ -91,9 +91,9 @@
         {% spaceless %}
             <h2>
                 {% blocktrans count user_tags|length as counter %}
-                    <span class="count">{{counter}}</span> {% trans "Tag" %}
+                    <span class="count">{{counter}}</span> Tag
                 {% plural %}
-                    <span class="count">{{counter}}</span> {% trans "Tags"  %}
+                    <span class="count">{{counter}}</span> Tags
                 {% endblocktrans %}
             </h2>
         {% endspaceless %}
@@ -120,9 +120,9 @@
         {% spaceless %}
         <h2>
             {% blocktrans count total_awards as counter %}
-            <span class="count">{{counter}}</span> {% trans "Badge" %}
+            <span class="count">{{counter}}</span> Badge
             {% plural %}
-            <span class="count">{{counter}}</span> {% trans "Badges" %}
+            <span class="count">{{counter}}</span> Badges
             {% endblocktrans %}
         </h2>
         {% endspaceless %}

diff --git a/forum/views/readers.py b/forum/views/readers.py
index dccb05e520ea53a69e2fa695334db4ab2832436c..c88ba685577688341696a4569ff22bafe640ea12 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -183,7 +183,8 @@ def question_list(request, initial,
     #answer_description = _("answers")
 
     if not feed_url:
-        req_params = generate_uri(request.GET, (_('page'), _('pagesize'), _('sort')))
+        req_params = generate_uri(request.GET, (_('page'), _('pagesize')))
+
         if req_params:
             req_params = '&' + req_params