From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Mon, 24 Oct 2011 21:41:35 +0000 (+0000)
Subject: 'show N more' comments rather than 'show all'
X-Git-Tag: live~124
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/e6a05ab54f6eea95902b7e9d12858de123e39d17

'show N more' comments rather than 'show all'

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

diff --git a/forum/skins/default/templates/node/comments.html b/forum/skins/default/templates/node/comments.html
index 68ebde2..3457aab 100644
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -98,7 +98,7 @@
         <span class="comments-showing">
             {% blocktrans %}showing {{ showing }} of {{ total }}{% endblocktrans %}
         </span>
-        <a href="#" class="show-all-comments-link">{% trans "show all" %}</a>
+        <a href="#" class="show-all-comments-link">{% blocktrans %}show {{ more_comments_count }} more comments{% endblocktrans %}</a>
     {% endifnotequal %}
     {% if can_comment %}
         <a href="#" class="add-comment-link">{% trans "add new comment" %}</a>
diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index 6fc19ce..5cdd3b0 100644
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -221,6 +221,7 @@ def comments(post, user):
         })
         canned_comments.append(t.render(c))
 
+    total = len(all_comments)
     return {
         'comments': comments,
         'canned_comments': canned_comments,
@@ -230,7 +231,8 @@ def comments(post, user):
         'min_length': settings.FORM_MIN_COMMENT_BODY,
         'show_gravatar': settings.FORM_GRAVATAR_IN_COMMENTS,
         'showing': showing,
-        'total': len(all_comments),
+        'total': total,
+        'more_comments_count' : int(total - showing),
         'user': user,
     }