# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2015-10-26 15:21:37
# Node ID 679c05d2bba33669dcdf1dac74d5e9c18d60d945
# Parent  8669bd71818f682b9ea46887a5444a87a7fc467a

Show bumplimit thread count in the tag page

diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index fc8dce598425ae07942a06aab92599125213863e..f512f1dba9e9d8f0cfc8b35c50c24c967d65a3d3
GIT binary patch
literal 9173
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

diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po
--- a/boards/locale/ru/LC_MESSAGES/django.po
+++ b/boards/locale/ru/LC_MESSAGES/django.po
@@ -158,6 +158,14 @@ msgstr[0] "%(count)s активная тема"
 msgstr[1] "%(count)s активные темы"
 msgstr[2] "%(count)s активных тем"
 
+#: templates/boards/all_threads.html:76
+#, python-format
+msgid "%(count)s thread in bumplimit"
+msgid_plural "%(count)s threads in bumplimit"
+msgstr[0] "%(count)s тема в бамплимите"
+msgstr[1] "%(count)s темы в бамплимите"
+msgstr[2] "%(count)s тем в бамплимите"
+
 #: templates/boards/all_threads.html:77
 #, python-format
 msgid "%(count)s archived thread"
diff --git a/boards/models/tag.py b/boards/models/tag.py
--- a/boards/models/tag.py
+++ b/boards/models/tag.py
@@ -61,14 +61,19 @@ class Tag(models.Model, Viewable):
 
         return self.get_thread_count() == 0
 
-    def get_thread_count(self, archived=None) -> int:
+    def get_thread_count(self, archived=None, bumpable=None) -> int:
         threads = self.get_threads()
         if archived is not None:
             threads = threads.filter(archived=archived)
+        if bumpable is not None:
+            threads = threads.filter(bumpable=bumpable)
         return threads.count()
 
     def get_active_thread_count(self) -> int:
-        return self.get_thread_count(archived=False)
+        return self.get_thread_count(archived=False, bumpable=True)
+
+    def get_bumplimit_thread_count(self) -> int:
+        return self.get_thread_count(archived=False, bumpable=False)
 
     def get_archived_thread_count(self) -> int:
         return self.get_thread_count(archived=True)
diff --git a/boards/templates/boards/all_threads.html b/boards/templates/boards/all_threads.html
--- a/boards/templates/boards/all_threads.html
+++ b/boards/templates/boards/all_threads.html
@@ -74,6 +74,7 @@
             {% endif %}
             <p>
                 {% blocktrans count count=tag.get_active_thread_count %}{{ count }} active thread{% plural %}active threads{% endblocktrans %},
+                {% blocktrans count count=tag.get_bumplimit_thread_count %}{{ count }} thread in bumplimit{% plural %} threads in bumplimit{% endblocktrans %},
                 {% blocktrans count count=tag.get_archived_thread_count %}{{ count }} archived thread{% plural %}archived threads{% endblocktrans %},
                 {% blocktrans count count=tag.get_post_count %}{{ count }} message{% plural %}messages{% endblocktrans %}.
             </p>