Plural in form error

boards/forms.py

@@ -7,7 +7,7 b' from django import forms'
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.exceptions import ObjectDoesNotExist
 from django.forms.util import ErrorList
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 
 from boards.mdx_neboard import formatters
 from boards.models.attachment.downloaders import Downloader
@@ -35,7 +35,8 b" LABEL_TEXT = _('Text')"
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
 
-ERROR_SPEED = _('Please wait %s seconds before sending message')
+ERROR_SPEED = 'Please wait %(delay)d second before sending message'
+ERROR_SPEED_PLURAL = 'Please wait %(delay)d seconds before sending message'
 
 TAG_MAX_LENGTH = 20
 
@@ -266,9 +267,8 b' class PostForm(NeboardForm):'
             now = time.time()
 
             current_delay = 0
-            need_delay = False
 
-            if not LAST_POST_TIME in self.session:
+            if LAST_POST_TIME not in self.session:
                 self.session[LAST_POST_TIME] = now
 
                 need_delay = True
@@ -279,8 +279,9 b' class PostForm(NeboardForm):'
                 need_delay = current_delay < posting_delay
 
             if need_delay:
-                error_message = ERROR_SPEED % str(posting_delay
-                        - current_delay)
+                delay = posting_delay - current_delay
+                error_message = ungettext_lazy(ERROR_SPEED, ERROR_SPEED_PLURAL,
+                                               delay) % {'delay': delay}
                 self._errors['text'] = self.error_class([error_message])
 
                 can_post = False

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: 2015-09-04 19:00+0300\n"
+"POT-Creation-Date: 2015-09-05 22:33+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -63,79 +63,74 b' msgstr "\xd0\x9c\xd0\xb5\xd1\x82\xd0\xba\xd0\xb0"'
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:38
-#, python-format
-msgid "Please wait %s seconds before sending message"
-msgstr "Пожалуйста подождите %s секунд перед отправкой сообщения"
-
-#: forms.py:138
+#: forms.py:139
 msgid "File"
 msgstr "Файл"
 
-#: forms.py:141
+#: forms.py:142
 msgid "File URL"
 msgstr "URL файла"
 
-#: forms.py:147
+#: forms.py:148
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:150
+#: forms.py:151
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
-#: forms.py:161
+#: forms.py:162
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:171
+#: forms.py:172
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:191
+#: forms.py:192
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: forms.py:212
+#: forms.py:213
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
-#: forms.py:257
+#: forms.py:258
 msgid "Either text or file must be entered."
 msgstr "Текст или файл должны быть введены."
 
-#: forms.py:316 templates/boards/all_threads.html:148
+#: forms.py:317 templates/boards/all_threads.html:148
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
 
-#: forms.py:323
+#: forms.py:324
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
-#: forms.py:337
+#: forms.py:338
 msgid "Need at least one section."
 msgstr "Нужен хотя бы один раздел."
 
-#: forms.py:349
+#: forms.py:350
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:350
+#: forms.py:351
 msgid "Image view mode"
 msgstr "Режим просмотра изображений"
 
-#: forms.py:351
+#: forms.py:352
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:352
+#: forms.py:353
 msgid "Time zone"
 msgstr "Часовой пояс"
 
-#: forms.py:358
+#: forms.py:359
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
@@ -325,6 +320,13 b' msgstr[0] "%(count)s \xd1\x81\xd0\xbe\xd0\xbe\xd0\xb1\xd1\x89\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5"'
 msgstr[1] "%(count)s сообщения"
 msgstr[2] "%(count)s сообщений"
 
+#, python-format
+msgid "Please wait %(delay)d second before sending message"
+msgid_plural "Please wait %(delay)d seconds before sending message"
+msgstr[0] "Пожалуйста подождите %(delay)d секунду перед отправкой сообщения"
+msgstr[1] "Пожалуйста подождите %(delay)d секунды перед отправкой сообщения"
+msgstr[2] "Пожалуйста подождите %(delay)d секунд перед отправкой сообщения"
+
 #: templates/boards/post.html:106
 #, python-format
 msgid "%(count)s image"
@@ -424,7 +426,6 b' msgid "Tree"'
 msgstr "Дерево"
 
 #: templates/boards/thread.html:36
-#| msgid "messages"
 msgid "message"
 msgid_plural "messages"
 msgstr[0] "сообщение"

boards/static/css/md/base_page.css

@@ -424,6 +424,8 b' li {'
     padding: 5px;
     color: #eee;
     font-size: 2ex;
+    margin-top: .5ex;
+    margin-bottom: .5ex;
 }
 
 .skipped_replies {