Added localizations to forms. Do not allow users without session to post.

boards/authors.py

@@ -1,24 +1,31 b''
+from django.utils.translation import ugettext_lazy as _
+
 __author__ = 'neko259'
 
+ROLE_AUTHOR = _('author')
+ROLE_DEVELOPER = _('developer')
+ROLE_JS_DEV = _('javascript developer')
+ROLE_DESIGNER = _('designer')
+
 authors = {
     'neko259': {
         'name': 'Pavel Ryapolov',
         'contacts': ['[e-mail]'],
-        'roles': ['author', 'developer'],
+        'roles': [ROLE_AUTHOR, ROLE_DEVELOPER],
     },
     'ilyas': {
         'name': 'Ilyas Babayev',
         'contacts': ['[e-mail]'],
-        'roles': ['author', 'developer'],
+        'roles': [ROLE_AUTHOR, ROLE_DEVELOPER],
     },
     'ritsufag': {
         'name': 'Aiko Kirino',
         'contacts': ['[e-mail]'],
-        'roles': ['javascript developer', 'designer'],
+        'roles': [ROLE_JS_DEV, ROLE_DESIGNER],
     },
     'Tenno Seremel': {
         'name': 'anonymous',
         'contacts': ['[e-mail]'],
-        'roles': ['javascript developer', 'designer'],
+        'roles': [ROLE_JS_DEV, ROLE_DESIGNER],
     },
 }
  No newline at end of file

boards/forms.py

@@ -9,6 +9,12 b' from neboard import settings'
 from boards import utils
 
 LAST_POST_TIME = "last_post_time"
+LAST_LOGIN_TIME = "last_login_time"
+
+LOGIN_DELAY = 60 * 60
+
+MAX_TEXT_LENGTH = 30000
+MAX_IMAGE_SIZE = 8 * 1024 * 1024
 
 
 class PlainErrorList(ErrorList):
@@ -41,9 +47,6 b' class NeboardForm(forms.Form):'
 
 class PostForm(NeboardForm):
 
-    MAX_TEXT_LENGTH = 30000
-    MAX_IMAGE_SIZE = 8 * 1024 * 1024
-
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False)
     text = forms.CharField(widget=forms.Textarea, required=False)
     image = forms.ImageField(required=False)
@@ -57,34 +60,36 b' class PostForm(NeboardForm):'
         title = self.cleaned_data['title']
         if title:
             if len(title) > TITLE_MAX_LENGTH:
-                raise forms.ValidationError('Title must have less than' +
-                                            str(TITLE_MAX_LENGTH) +
-                                            ' characters.')
+                raise forms.ValidationError(_('Title must have less than %s '
+                                              'characters') %
+                                            str(TITLE_MAX_LENGTH))
         return title
 
     def clean_text(self):
         text = self.cleaned_data['text']
         if text:
-            if len(text) > self.MAX_TEXT_LENGTH:
-                raise forms.ValidationError('Text must have less than ' +
-                                            str(self.MAX_TEXT_LENGTH) +
-                                            ' characters.')
+            if len(text) > MAX_TEXT_LENGTH:
+                raise forms.ValidationError(_('Text must have less than %s '
+                                              'characters') %
+                                            str(MAX_TEXT_LENGTH))
         return text
 
     def clean_image(self):
         image = self.cleaned_data['image']
         if image:
-            if image._size > self.MAX_IMAGE_SIZE:
-                raise forms.ValidationError('Image must be less than ' +
-                                            str(self.MAX_IMAGE_SIZE) +
-                                            ' bytes.')
+            if image._size > MAX_IMAGE_SIZE:
+                raise forms.ValidationError(_('Image must be less than %s '
+                                              'bytes') % str(MAX_IMAGE_SIZE))
         return image
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
-	if cleaned_data['email']:
-	    raise forms.ValidationError('A human cannot enter a hidden field')
+        if not self.session:
+            raise forms.ValidationError('Humans have sessions')
+
+        if cleaned_data['email']:
+            raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
             self._clean_text_image()
@@ -112,9 +117,8 b' class PostForm(NeboardForm):'
             current_delay = int(now - last_post_time)
 
             if current_delay < settings.POSTING_DELAY:
-                error_message = 'Wait ' + str(settings.POSTING_DELAY -
-                                              current_delay)\
-                                + ' seconds after last posting'
+                error_message = _('Wait %s seconds after last posting') % str(
+                    settings.POSTING_DELAY - current_delay)
                 self._errors['text'] = self.error_class([error_message])
 
                 can_post = False
@@ -198,8 +202,11 b' class ModeratorSettingsForm(SettingsForm'
 
 
 class LoginForm(NeboardForm):
+
     user_id = forms.CharField()
 
+    session = None
+
     def clean_user_id(self):
         user_id = self.cleaned_data['user_id']
         if user_id:
@@ -209,7 +216,31 b' class LoginForm(NeboardForm):'
 
         return user_id
 
+    def _validate_login_speed(self):
+        can_post = True
+
+        if LAST_LOGIN_TIME in self.session:
+            now = time.time()
+            last_login_time = self.session[LAST_LOGIN_TIME]
+
+            current_delay = int(now - last_login_time)
+
+            if current_delay < LOGIN_DELAY:
+                error_message = _('Wait %s minutes after last login') % str(
+                    (LOGIN_DELAY - current_delay) / 60)
+                self._errors['user_id'] = self.error_class([error_message])
+
+                can_post = False
+
+        if can_post:
+            self.session[LAST_LOGIN_TIME] = time.time()
+
     def clean(self):
+        if not self.session:
+            raise forms.ValidationError('Humans have sessions')
+
+        self._validate_login_speed()
+
         cleaned_data = super(LoginForm, self).clean()
 
-        return cleaned_data
+        return cleaned_data
  No newline at end of file

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-09-17 21:58+0300\n"
+"POT-Creation-Date: 2013-09-18 21:02+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"
@@ -18,31 +18,71 b' msgstr ""'
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: forms.py:96
+#: authors.py:5
+msgid "author"
+msgstr "автор"
+
+#: authors.py:6
+msgid "developer"
+msgstr "разработчик"
+
+#: authors.py:7
+msgid "javascript developer"
+msgstr "разработчик javascript"
+
+#: authors.py:8
+msgid "designer"
+msgstr "дизайнер"
+
+#: forms.py:63
+#, python-format
+msgid "Title must have less than %s characters"
+msgstr "Заголовок должен иметь меньше %s символов"
+
+#: forms.py:72
+#, python-format
+msgid "Text must have less than %s characters"
+msgstr "Текст должен быть короче %s символов"
+
+#: forms.py:81
+#, python-format
+msgid "Image must be less than %s bytes"
+msgstr "Изображение должно быть менее %s байт"
+
+#: forms.py:107
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:130
+#: forms.py:120
+#, python-format
+msgid "Wait %s seconds after last posting"
+msgstr "Подождите %s секунд после последнего постинга"
+
+#: forms.py:140
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:158 forms.py:179
+#: forms.py:168 forms.py:189
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:185
+#: forms.py:195
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:190
+#: forms.py:200
 msgid "Enable moderation panel"
 msgstr "Включить панель модерации"
 
-#: forms.py:202
-#, fuzzy
+#: forms.py:215
 msgid "No such user found"
 msgstr "Теги не найдены."
 
+#: forms.py:229
+#, python-format
+msgid "Wait %s minutes after last login"
+msgstr "Подождите %s минут после последнего входа"
+
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
@@ -122,11 +162,11 b' msgstr "\xd0\xa3\xd0\xb4\xd0\xb0\xd0\xbb\xd0\xb8\xd1\x82\xd1\x8c"'
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
-#: templates/boards/posting_general.html:74 templates/boards/thread.html:116
+#: templates/boards/posting_general.html:74 templates/boards/thread.html:121
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/posting_general.html:75 templates/boards/thread.html:117
+#: templates/boards/posting_general.html:75 templates/boards/thread.html:122
 msgid "images"
 msgstr "изображений"
 
@@ -156,20 +196,24 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xba\xd1\x81\xd1\x82"'
 msgid "Image"
 msgstr "Изображение"
 
-#: templates/boards/posting_general.html:163 templates/boards/thread.html:104
+#: templates/boards/posting_general.html:155 templates/boards/thread.html:95
+msgid "e-mail"
+msgstr ""
+
+#: templates/boards/posting_general.html:168 templates/boards/thread.html:109
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:165
+#: templates/boards/posting_general.html:170
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:168 templates/boards/thread.html:106
+#: templates/boards/posting_general.html:173 templates/boards/thread.html:111
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:178
+#: templates/boards/posting_general.html:183
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -209,7 +253,7 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xb3\xd0\xb8 \xd0\xbd\xd0\xb5 \xd0\xbd\xd0\xb0\xd0\xb9\xd0\xb4\xd0\xb5\xd0\xbd\xd1\x8b."'
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:118
+#: templates/boards/thread.html:123
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -283,15 +327,3 b' msgstr "\xd0\xa1\xd1\x81\xd1\x8b\xd0\xbb\xd0\xba\xd0\xb0 \xd0\xbd\xd0\xb0 \xd1\x81\xd0\xbe\xd0\xbe\xd0\xb1\xd1\x89\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5"'
 
 #~ msgid "gets"
 #~ msgstr "гетов"
-
-#~ msgid "author"
-#~ msgstr "автор"
-
-#~ msgid "developer"
-#~ msgstr "разработчик"
-
-#~ msgid "javascript developer"
-#~ msgstr "разработчик javascript"
-
-#~ msgid "designer"
-#~ msgstr "дизайнер"

boards/views.py

@@ -167,6 +167,8 b' def login(request):'
     if request.method == 'POST':
         form = LoginForm(request.POST, request.FILES,
                          error_class=PlainErrorList)
+        form.session = request.session
+
         if form.is_valid():
             user = User.objects.get(user_id=form.cleaned_data['user_id'])
             request.session['user_id'] = user.id