# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2015-08-12 15:37:28
# Node ID 819f972ff3323d07280fa16fc50ecfbffa0f5cee
# Parent  59984fb195408c78400dffec82973a7fa04c45dd

Show related tags in the tag page

diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index c430bbf78d49e077b880ab8529e2e4f4b09fd798..35e8b7e1536721479164a4f6f1881106e815743e
GIT binary patch
literal 7750
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
ZG=ezAT;`LJCeJw)6^GdzEV=)={tKM-i$nkb

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
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-10 10:22+0300\n"
+"POT-Creation-Date: 2015-08-12 18:32+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -111,7 +111,7 @@ msgstr "Текст или картинка должны быть введены."
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:338 templates/boards/all_threads.html:141
+#: forms.py:338 templates/boards/all_threads.html:154
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
@@ -156,62 +156,68 @@ msgstr "Этой страницы не существует"
 msgid "Related message"
 msgstr "Связанное сообщение"
 
-#: templates/boards/all_threads.html:68
+#: templates/boards/all_threads.html:71
 msgid "Edit tag"
 msgstr "Изменить метку"
 
-#: templates/boards/all_threads.html:76
+#: templates/boards/all_threads.html:79
 #, python-format
-#| msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
 msgid ""
 "This tag has %(active_thread_count)s/%(thread_count)s threads and "
 "%(post_count)s posts."
-msgstr "С этой меткой есть %(active_thread_count)s/%(thread_count)s тем и %(post_count)s сообщений."
+msgstr ""
+"С этой меткой есть %(active_thread_count)s/%(thread_count)s тем и "
+"%(post_count)s сообщений."
 
-#: templates/boards/all_threads.html:83 templates/boards/feed.html:30
+#: templates/boards/all_threads.html:81
+#| msgid "Related message"
+msgid "Related tags:"
+msgstr "Похожие метки:"
+
+#: templates/boards/all_threads.html:96 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/all_threads.html:97
+#: templates/boards/all_threads.html:110
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/all_threads.html:115 templates/boards/feed.html:40
+#: templates/boards/all_threads.html:128 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/all_threads.html:120
+#: templates/boards/all_threads.html:133
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/all_threads.html:126
+#: templates/boards/all_threads.html:139
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/all_threads.html:131 templates/boards/preview.html:16
+#: templates/boards/all_threads.html:144 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:38
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/all_threads.html:136
+#: templates/boards/all_threads.html:149
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/all_threads.html:138 templates/boards/preview.html:6
+#: templates/boards/all_threads.html:151 templates/boards/preview.html:6
 #: templates/boards/staticpages/help.html:21
 #: templates/boards/thread_normal.html:42
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: templates/boards/all_threads.html:140 templates/boards/thread_normal.html:45
+#: templates/boards/all_threads.html:153 templates/boards/thread_normal.html:45
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/all_threads.html:154 templates/boards/feed.html:53
+#: templates/boards/all_threads.html:167 templates/boards/feed.html:53
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -391,15 +397,15 @@ msgstr "Цитата"
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
-#: templates/boards/tags.html:14
+#: templates/boards/tags.html:17
 msgid "Sections:"
 msgstr "Разделы:"
 
-#: templates/boards/tags.html:26
+#: templates/boards/tags.html:30
 msgid "Other tags:"
 msgstr "Другие метки:"
 
-#: templates/boards/tags.html:38
+#: templates/boards/tags.html:43
 msgid "All tags..."
 msgstr "Все метки..."
 
diff --git a/boards/models/tag.py b/boards/models/tag.py
--- a/boards/models/tag.py
+++ b/boards/models/tag.py
@@ -17,7 +17,7 @@ class TagManager(models.Manager):
         Gets tags that have non-archived threads.
         """
 
-        return self.annotate(num_threads=Count('thread')).filter(num_threads__gt=0)\
+        return self.annotate(num_threads=Count('thread_tags')).filter(num_threads__gt=0)\
             .order_by('-required', 'name')
 
     def get_tag_url_list(self, tags: list) -> str:
@@ -67,7 +67,7 @@ class Tag(models.Model, Viewable):
         return reverse('tag', kwargs={'tag_name': self.name})
 
     def get_threads(self):
-        return self.thread_set.order_by('-bump_time')
+        return self.thread_tags.order_by('-bump_time')
 
     def is_required(self):
         return self.required
@@ -100,3 +100,7 @@ class Tag(models.Model, Viewable):
 
     def get_first_letter(self):
         return self.name and self.name[0] or ''
+
+    def get_related_tags(self):
+        return Tag.objects.filter(thread_tags__in=self.get_threads()).exclude(
+                id=self.id).distinct()
diff --git a/boards/models/thread.py b/boards/models/thread.py
--- a/boards/models/thread.py
+++ b/boards/models/thread.py
@@ -65,7 +65,7 @@ class Thread(models.Model):
     class Meta:
         app_label = 'boards'
 
-    tags = models.ManyToManyField('Tag')
+    tags = models.ManyToManyField('Tag', related_name='thread_tags')
     bump_time = models.DateTimeField(db_index=True)
     last_edit_time = models.DateTimeField()
     archived = models.BooleanField(default=False)
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
@@ -77,6 +77,15 @@
                 {% endautoescape %}
             {% endif %}
             <p>{% blocktrans with active_thread_count=tag.get_active_thread_count thread_count=tag.get_thread_count post_count=tag.get_post_count %}This tag has {{ active_thread_count}}/{{ thread_count }} threads and {{ post_count }} posts.{% endblocktrans %}</p>
+            {% if related_tags %}
+                <p>{% trans 'Related tags:' %}
+                {% for rel_tag in related_tags %}
+                    {% autoescape off %}
+                    {{ rel_tag.get_view }}{% if not forloop.last %}, {% endif %}
+                    {% endautoescape %}
+                {% endfor %}
+                </p>
+            {% endif %}
         </div>
     </div>
 {% endif %}
diff --git a/boards/views/tag_threads.py b/boards/views/tag_threads.py
--- a/boards/views/tag_threads.py
+++ b/boards/views/tag_threads.py
@@ -13,6 +13,8 @@ PARAM_TAG = 'tag'
 PARAM_IS_FAVORITE = 'is_favorite'
 PARAM_IS_HIDDEN = 'is_hidden'
 PARAM_RANDOM_IMAGE_POST = 'random_image_post'
+PARAM_RELATED_TAGS = 'related_tags'
+
 
 __author__ = 'neko259'
 
@@ -49,6 +51,7 @@ class TagView(AllThreadsView, Dispatcher
         params[PARAM_IS_HIDDEN] = hidden_tag_names is not None and tag.name in hidden_tag_names
 
         params[PARAM_RANDOM_IMAGE_POST] = tag.get_random_image_post()
+        params[PARAM_RELATED_TAGS] = tag.get_related_tags().all()
 
         return params