# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2013-11-24 14:58:42
# Node ID 33667f743d7e767eb0bf885f2139387555e29a64
# Parent  c7fb6785875f95adacaeacdada8ac20d4e6b43ee

Show posts per

diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index 9fc3d4ed0bcce068a21d6d8df33925519e06efff..95d85d6ccb6213fb62ad9b8bb426eb5ce9bcb81a
GIT binary patch
literal 5894
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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
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-09 21:41+0200\n"
+"POT-Creation-Date: 2013-11-24 16:57+0200\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"
@@ -34,77 +34,77 @@ msgstr "разработчик javascript"
 msgid "designer"
 msgstr "дизайнер"
 
-#: forms.py:47 templates/boards/posting_general.html:184
-#: templates/boards/thread.html:103
+#: forms.py:48 templates/boards/posting_general.html:206
+#: templates/boards/thread.html:101
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:49 templates/boards/posting_general.html:199
-#: templates/boards/thread.html:118
+#: forms.py:50 templates/boards/posting_general.html:221
+#: templates/boards/thread.html:116
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:50 templates/boards/posting_general.html:204
-#: templates/boards/thread.html:123
+#: forms.py:51 templates/boards/posting_general.html:226
+#: templates/boards/thread.html:121
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:53 templates/boards/posting_general.html:214
-#: templates/boards/thread.html:128
+#: forms.py:54 templates/boards/posting_general.html:236
+#: templates/boards/thread.html:126
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:64
+#: forms.py:65
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:73
+#: forms.py:74
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:84
+#: forms.py:85
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:111
+#: forms.py:112
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:124
+#: forms.py:125
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:138 templates/boards/post.html:39
-#: templates/boards/posting_general.html:209 templates/boards/tags.html:7
+#: forms.py:139 templates/boards/post.html:60
+#: templates/boards/posting_general.html:231 templates/boards/tags.html:6
 #: templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:146
+#: forms.py:147
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:174 forms.py:195
+#: forms.py:175 forms.py:196
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:201
+#: forms.py:202
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:206
+#: forms.py:207
 msgid "Enable moderation panel"
 msgstr "Включить панель модерации"
 
-#: forms.py:221
+#: forms.py:222
 msgid "No such user found"
 msgstr "Данный пользователь не найден"
 
-#: forms.py:235
+#: forms.py:236
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
@@ -137,24 +137,29 @@ msgstr "Репозиторий"
 msgid "Feed"
 msgstr "Лента"
 
-#: templates/boards/base.html:34
+#: templates/boards/base.html:35
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:39
+#: templates/boards/base.html:40
 msgid "Tag management"
 msgstr "Управление тегами"
 
-#: templates/boards/base.html:41
+#: templates/boards/base.html:42
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:48 templates/boards/login.html:6
+#: templates/boards/base.html:49 templates/boards/login.html:6
 #: templates/boards/login.html.py:21
 msgid "Login"
 msgstr "Вход"
 
-#: templates/boards/base.html:49
+#: templates/boards/base.html:50
+#, python-format
+msgid "Speed: %(posts_per_day)s posts per day"
+msgstr "Скорость: %(posts_per_day)s сообщений в день"
+
+#: templates/boards/base.html:51
 msgid "Up"
 msgstr "Вверх"
 
@@ -166,91 +171,87 @@ msgstr "ID пользователя"
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
-#: templates/boards/post.html:10 templates/boards/rss/post.html:5
-msgid "Post image"
-msgstr "Изображение сообщения"
-
-#: templates/boards/post.html:26 templates/boards/posting_general.html:79
-#: templates/boards/thread.html:60
+#: templates/boards/post.html:34 templates/boards/posting_general.html:100
+#: templates/boards/thread.html:59
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/boards/post.html:29 templates/boards/posting_general.html:82
-#: templates/boards/thread.html:63
+#: templates/boards/post.html:37 templates/boards/posting_general.html:104
+#: templates/boards/thread.html:62
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
-#: templates/boards/posting_general.html:44
+#: templates/boards/post.html:50 templates/boards/posting_general.html:113
+#: templates/boards/posting_general.html:169 templates/boards/thread.html:71
+msgid "Replies"
+msgstr "Ответы"
+
+#: templates/boards/posting_general.html:63
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/posting_general.html:74
+#: templates/boards/posting_general.html:94
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:91
-#: templates/boards/posting_general.html:147 templates/boards/thread.html:72
-msgid "Replies"
-msgstr "Ответы"
-
-#: templates/boards/posting_general.html:100 templates/boards/thread.html:156
+#: templates/boards/posting_general.html:122 templates/boards/thread.html:154
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/posting_general.html:101 templates/boards/thread.html:157
+#: templates/boards/posting_general.html:123 templates/boards/thread.html:155
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:170
+#: templates/boards/posting_general.html:192
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/posting_general.html:175
+#: templates/boards/posting_general.html:197
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/posting_general.html:181
+#: templates/boards/posting_general.html:203
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:189 templates/boards/thread.html:108
+#: templates/boards/posting_general.html:211 templates/boards/thread.html:106
 msgid "Formatting"
 msgstr "Форматирование"
 
-#: templates/boards/posting_general.html:191 templates/boards/thread.html:110
+#: templates/boards/posting_general.html:213 templates/boards/thread.html:108
 msgid "quote"
 msgstr "цитата"
 
-#: templates/boards/posting_general.html:192 templates/boards/thread.html:111
+#: templates/boards/posting_general.html:214 templates/boards/thread.html:109
 msgid "italic"
 msgstr "курсив"
 
-#: templates/boards/posting_general.html:193 templates/boards/thread.html:112
+#: templates/boards/posting_general.html:215 templates/boards/thread.html:110
 msgid "bold"
 msgstr "полужирный"
 
-#: templates/boards/posting_general.html:194 templates/boards/thread.html:113
+#: templates/boards/posting_general.html:216 templates/boards/thread.html:111
 msgid "spoiler"
 msgstr "спойлер"
 
-#: templates/boards/posting_general.html:195 templates/boards/thread.html:114
+#: templates/boards/posting_general.html:217 templates/boards/thread.html:112
 msgid "comment"
 msgstr "комментарий"
 
-#: templates/boards/posting_general.html:227 templates/boards/thread.html:142
+#: templates/boards/posting_general.html:249 templates/boards/thread.html:140
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:229
+#: templates/boards/posting_general.html:251
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:232 templates/boards/thread.html:144
+#: templates/boards/posting_general.html:254 templates/boards/thread.html:142
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:242
+#: templates/boards/posting_general.html:264
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -286,18 +287,22 @@ msgstr "тем"
 msgid "No tags found."
 msgstr "Теги не найдены."
 
-#: templates/boards/thread.html:25
+#: templates/boards/thread.html:24
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread.html:100
+#: templates/boards/thread.html:98
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:158
+#: templates/boards/thread.html:156
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
+#: templates/boards/rss/post.html:5
+msgid "Post image"
+msgstr "Изображение сообщения"
+
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
diff --git a/boards/models/post.py b/boards/models/post.py
--- a/boards/models/post.py
+++ b/boards/models/post.py
@@ -1,3 +1,5 @@
+from datetime import datetime, timedelta
+from datetime import time as dtime
 import os
 from random import random
 import time
@@ -151,6 +153,17 @@ class PostManager(models.Manager):
     def _get_page_count(self, thread_count):
         return int(math.ceil(thread_count / float(settings.THREADS_PER_PAGE)))
 
+    def get_posts_per_day(self):
+        """Get count of posts for the current day"""
+
+        today = datetime.now().date()
+        tomorrow = today + timedelta(1)
+        today_start = datetime.combine(today, dtime())
+        today_end = datetime.combine(tomorrow, dtime())
+
+        return self.filter(pub_time__lte=today_end, pub_time__gte=today_start)\
+            .count()
+
 
 class Post(models.Model):
     """A post is a message."""
diff --git a/boards/templates/boards/base.html b/boards/templates/boards/base.html
--- a/boards/templates/boards/base.html
+++ b/boards/templates/boards/base.html
@@ -47,6 +47,7 @@
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
+    {% blocktrans %}Speed: {{ posts_per_day }} posts per day{% endblocktrans %}
     <a class="link" href="#top">{% trans 'Up' %}</a>
 </div>
 
diff --git a/boards/views.py b/boards/views.py
--- a/boards/views.py
+++ b/boards/views.py
@@ -478,6 +478,7 @@ def _init_default_context(request):
     user = _get_user(request)
     context['user'] = user
     context['tags'] = user.get_sorted_fav_tags()
+    context['posts_per_day'] = Post.objects.get_posts_per_day()
 
     theme = _get_theme(request, user)
     context['theme'] = theme
diff --git a/todo.txt b/todo.txt
--- a/todo.txt
+++ b/todo.txt
@@ -9,8 +9,9 @@ denied". Use second only for autoban for
 [DONE] Clean up tests and make them run ALWAYS
 [DONE] Use transactions in tests
 [DONE] Thread autoupdate (JS + API)
-[IN PROGRESS] Split up post model into post and thread,
+[DONE] Split up post model into post and thread,
 and move everything that is used only in 1st post to thread model.
+[DONE] Show board speed in the lower panel (posts per day)
 
 [NOT STARTED] Tree view (JS)
 [NOT STARTED] Adding tags to images filename
@@ -20,7 +21,6 @@ and move everything that is used only in
 [NOT STARTED] Notification engine
 [NOT STARTED] Javascript disabling engine
 [NOT STARTED] Group tags by first letter in all tags list
-[NOT STARTED] Show board speed in the lower panel (posts per day)
 [NOT STARTED] Character counter in the post field
 [NOT STARTED] Save image thumbnails size to the separate field
 [NOT STARTED] Whitelist functionality. Permin autoban of an address