Show posts per

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' 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 <[e-mail]>\n"
@@ -34,77 +34,77 b' msgstr "\xd1\x80\xd0\xb0\xd0\xb7\xd1\x80\xd0\xb0\xd0\xb1\xd0\xbe\xd1\x82\xd1\x87\xd0\xb8\xd0\xba 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 b' msgstr "\xd0\xa0\xd0\xb5\xd0\xbf\xd0\xbe\xd0\xb7\xd0\xb8\xd1\x82\xd0\xbe\xd1\x80\xd0\xb8\xd0\xb9"'
 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 b' msgstr "ID \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f"'
 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 b' msgstr "\xd1\x82\xd0\xb5\xd0\xbc"'
 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 "Заблокирован"

boards/models/post.py

@@ -1,3 +1,5 b''
+from datetime import datetime, timedelta
+from datetime import time as dtime
 import os
 from random import random
 import time
@@ -151,6 +153,17 b' 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."""

boards/templates/boards/base.html

@@ -47,6 +47,7 b''
 <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>
 

boards/views.py

@@ -478,6 +478,7 b' 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

todo.txt

@@ -9,8 +9,9 b' 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 b' 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