Fixed sticker autocompletions. Localized 'too many files' message and added max file count there

boards/forms/__init__.py

@@ -1,483 +1,486
 import hashlib
 import logging
 import re
 import time
 
 import pytz
 from django import forms
 from django.core.files.uploadedfile import SimpleUploadedFile, UploadedFile
 from django.forms.utils import ErrorList
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 
 import boards.settings as board_settings
 import neboard
 from boards.abstracts.attachment_alias import get_image_by_alias
 from boards.abstracts.settingsmanager import get_settings_manager
 from boards.forms.fields import UrlFileField
 from boards.mdx_neboard import formatters
 from boards.models import Tag
 from boards.models.attachment.downloaders import download, REGEX_MAGNET
 from boards.models.post import TITLE_MAX_LENGTH
 from boards.utils import validate_file_size, get_file_mimetype, \
     FILE_EXTENSION_DELIMITER
 from neboard import settings
 
 SECTION_FORMS = 'Forms'
 
 POW_HASH_LENGTH = 16
 POW_LIFE_MINUTES = 5
 
 REGEX_TAGS = re.compile(r'^[\w\s\d]+$', re.UNICODE)
 REGEX_USERNAMES = re.compile(r'^[\w\s\d,]+$', re.UNICODE)
 REGEX_URL = re.compile(r'^(http|https|ftp):\/\/', re.UNICODE)
 
 VETERAN_POSTING_DELAY = 5
 
 ATTRIBUTE_PLACEHOLDER = 'placeholder'
 ATTRIBUTE_ROWS = 'rows'
 
 LAST_POST_TIME = 'last_post_time'
 LAST_LOGIN_TIME = 'last_login_time'
 TEXT_PLACEHOLDER = _('Type message here. Use formatting panel for more advanced usage.')
 TAGS_PLACEHOLDER = _('music images i_dont_like_tags')
 
 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
 LABEL_FILE = _('File')
 
 ERROR_SPEED = 'Please wait %(delay)d second before sending message'
 ERROR_SPEED_PLURAL = 'Please wait %(delay)d seconds before sending message'
-ERROR_MANY_FILES = _('Too many files.')
+ERROR_MANY_FILES = 'You can post no more than %(files)d file.'
+ERROR_MANY_FILES_PLURAL = 'You can post no more than %(files)d files.'
 
 TAG_MAX_LENGTH = 20
 
 TEXTAREA_ROWS = 4
 
 TRIPCODE_DELIM = '#'
 
 # TODO Maybe this may be converted into the database table?
 MIMETYPE_EXTENSIONS = {
     'image/jpeg': 'jpeg',
     'image/png': 'png',
     'image/gif': 'gif',
     'video/webm': 'webm',
     'application/pdf': 'pdf',
     'x-diff': 'diff',
     'image/svg+xml': 'svg',
     'application/x-shockwave-flash': 'swf',
     'image/x-ms-bmp': 'bmp',
     'image/bmp': 'bmp',
 }
 
 
 logger = logging.getLogger('boards.forms')
 
 
 def get_timezones():
     timezones = []
     for tz in pytz.common_timezones:
         timezones.append((tz, tz),)
     return timezones
 
 
 class FormatPanel(forms.Textarea):
     """
     Panel for text formatting. Consists of buttons to add different tags to the
     form text area.
     """
 
     def render(self, name, value, attrs=None):
         output = '<div id="mark-panel">'
         for formatter in formatters:
             output += '<span class="mark_btn"' + \
                       ' onClick="addMarkToMsg(\'' + formatter.format_left + \
                       '\', \'' + formatter.format_right + '\')">' + \
                       formatter.preview_left + formatter.name + \
                       formatter.preview_right + '</span>'
 
         output += '</div>'
         output += super(FormatPanel, self).render(name, value, attrs=attrs)
 
         return output
 
 
 class PlainErrorList(ErrorList):
     def __unicode__(self):
         return self.as_text()
 
     def as_text(self):
         return ''.join(['(!) %s ' % e for e in self])
 
 
 class NeboardForm(forms.Form):
     """
     Form with neboard-specific formatting.
     """
     required_css_class = 'required-field'
 
     def as_div(self):
         """
         Returns this form rendered as HTML <as_div>s.
         """
 
         return self._html_output(
             # TODO Do not show hidden rows in the list here
             normal_row='<div class="form-row">'
                        '<div class="form-label">'
                        '%(label)s'
                        '</div>'
                        '<div class="form-input">'
                        '%(field)s'
                        '</div>'
                        '</div>'
                        '<div class="form-row">'
                        '%(help_text)s'
                        '</div>',
             error_row='<div class="form-row">'
                       '<div class="form-label"></div>'
                       '<div class="form-errors">%s</div>'
                       '</div>',
             row_ender='</div>',
             help_text_html='%s',
             errors_on_separate_row=True)
 
     def as_json_errors(self):
         errors = []
 
         for name, field in list(self.fields.items()):
             if self[name].errors:
                 errors.append({
                     'field': name,
                     'errors': self[name].errors.as_text(),
                 })
 
         return errors
 
 
 class PostForm(NeboardForm):
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=LABEL_TITLE,
                             widget=forms.TextInput(
                                 attrs={ATTRIBUTE_PLACEHOLDER: 'title#tripcode'}))
     text = forms.CharField(
         widget=FormatPanel(attrs={
             ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER,
             ATTRIBUTE_ROWS: TEXTAREA_ROWS,
         }),
         required=False, label=LABEL_TEXT)
     file = UrlFileField(required=False, label=LABEL_FILE)
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
                             widget=forms.TextInput(attrs={
                                 'class': 'form-email'}))
     subscribe = forms.BooleanField(required=False, label=_('Subscribe to thread'))
 
     guess = forms.CharField(widget=forms.HiddenInput(), required=False)
     timestamp = forms.CharField(widget=forms.HiddenInput(), required=False)
     iteration = forms.CharField(widget=forms.HiddenInput(), required=False)
 
     session = None
     need_to_ban = False
     image = None
 
     def clean_title(self):
         title = self.cleaned_data['title']
         if title:
             if len(title) > TITLE_MAX_LENGTH:
                 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'].strip()
         if text:
             max_length = board_settings.get_int(SECTION_FORMS, 'MaxTextLength')
             if len(text) > max_length:
                 raise forms.ValidationError(_('Text must have less than %s '
                                               'characters') % str(max_length))
         return text
 
     def clean_file(self):
         return self._clean_files(self.cleaned_data['file'])
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
         if cleaned_data['email']:
             if board_settings.get_bool(SECTION_FORMS, 'Autoban'):
                 self.need_to_ban = True
             raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
             self._clean_text_file()
 
         limit_speed = board_settings.get_bool(SECTION_FORMS, 'LimitPostingSpeed')
         limit_first = board_settings.get_bool(SECTION_FORMS, 'LimitFirstPosting')
 
         settings_manager = get_settings_manager(self)
         if not self.errors and limit_speed or (limit_first and not settings_manager.get_setting('confirmed_user')):
             pow_difficulty = board_settings.get_int(SECTION_FORMS, 'PowDifficulty')
             if pow_difficulty > 0:
                 # PoW-based
                 if cleaned_data['timestamp'] \
                         and cleaned_data['iteration'] and cleaned_data['guess'] \
                         and not settings_manager.get_setting('confirmed_user'):
                     self._validate_hash(cleaned_data['timestamp'], cleaned_data['iteration'], cleaned_data['guess'], cleaned_data['text'])
             else:
                 # Time-based
                 self._validate_posting_speed()
             settings_manager.set_setting('confirmed_user', True)
 
         return cleaned_data
 
     def get_files(self):
         """
         Gets file from form or URL.
         """
 
         files = []
         for file in self.cleaned_data['file']:
             if isinstance(file, UploadedFile):
                 files.append(file)
 
         return files
 
     def get_file_urls(self):
         files = []
         for file in self.cleaned_data['file']:
             if type(file) == str:
                 files.append(file)
 
         return files
 
     def get_tripcode(self):
         title = self.cleaned_data['title']
         if title is not None and TRIPCODE_DELIM in title:
             code = title.split(TRIPCODE_DELIM, maxsplit=1)[1] + neboard.settings.SECRET_KEY
             tripcode = hashlib.md5(code.encode()).hexdigest()
         else:
             tripcode = ''
         return tripcode
 
     def get_title(self):
         title = self.cleaned_data['title']
         if title is not None and TRIPCODE_DELIM in title:
             return title.split(TRIPCODE_DELIM, maxsplit=1)[0]
         else:
             return title
 
     def get_images(self):
         if self.image:
             return [self.image]
         else:
             return []
 
     def is_subscribe(self):
         return self.cleaned_data['subscribe']
 
     def _update_file_extension(self, file):
         if file:
             mimetype = get_file_mimetype(file)
             extension = MIMETYPE_EXTENSIONS.get(mimetype)
             if extension:
                 filename = file.name.split(FILE_EXTENSION_DELIMITER, 1)[0]
                 new_filename = filename + FILE_EXTENSION_DELIMITER + extension
 
                 file.name = new_filename
             else:
                 logger.info('Unrecognized file mimetype: {}'.format(mimetype))
 
     def _clean_files(self, inputs):
         files = []
 
         max_file_count = board_settings.get_int(SECTION_FORMS, 'MaxFileCount')
         if len(inputs) > max_file_count:
-            raise forms.ValidationError(ERROR_MANY_FILES)
+            raise forms.ValidationError(
+                ungettext_lazy(ERROR_MANY_FILES, ERROR_MANY_FILES,
+                               max_file_count) % {'files': max_file_count})
         for file_input in inputs:
             if isinstance(file_input, UploadedFile):
                 files.append(self._clean_file_file(file_input))
             else:
                 files.append(self._clean_file_url(file_input))
 
         return files
 
     def _clean_file_file(self, file):
         validate_file_size(file.size)
         self._update_file_extension(file)
 
         return file
 
     def _clean_file_url(self, url):
         file = None
 
         if url:
             try:
                 file = get_image_by_alias(url, self.session)
                 self.image = file
 
                 if file is not None:
                     return
 
                 if file is None:
                     file = self._get_file_from_url(url)
                     if not file:
                         raise forms.ValidationError(_('Invalid URL'))
                     else:
                         validate_file_size(file.size)
                 self._update_file_extension(file)
             except forms.ValidationError as e:
                 # Assume we will get the plain URL instead of a file and save it
                 if REGEX_URL.match(url) or REGEX_MAGNET.match(url):
                     logger.info('Error in forms: {}'.format(e))
                     return url
                 else:
                     raise e
 
         return file
 
     def _clean_text_file(self):
         text = self.cleaned_data.get('text')
         file = self.get_files()
         file_url = self.get_file_urls()
         images = self.get_images()
 
         if (not text) and (not file) and (not file_url) and len(images) == 0:
             error_message = _('Either text or file must be entered.')
             self._errors['text'] = self.error_class([error_message])
 
     def _validate_posting_speed(self):
         can_post = True
 
         posting_delay = board_settings.get_int(SECTION_FORMS, 'PostingDelay')
 
         if board_settings.get_bool(SECTION_FORMS, 'LimitPostingSpeed'):
             now = time.time()
 
             current_delay = 0
 
             if LAST_POST_TIME not in self.session:
                 self.session[LAST_POST_TIME] = now
 
                 need_delay = True
             else:
                 last_post_time = self.session.get(LAST_POST_TIME)
                 current_delay = int(now - last_post_time)
 
                 need_delay = current_delay < posting_delay
 
             if need_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
 
             if can_post:
                 self.session[LAST_POST_TIME] = now
 
     def _get_file_from_url(self, url: str) -> SimpleUploadedFile:
         """
         Gets an file file from URL.
         """
 
         try:
             return download(url)
         except forms.ValidationError as e:
             raise e
         except Exception as e:
             raise forms.ValidationError(e)
 
     def _validate_hash(self, timestamp: str, iteration: str, guess: str, message: str):
         payload = timestamp + message.replace('\r\n', '\n')
         difficulty = board_settings.get_int(SECTION_FORMS, 'PowDifficulty')
         target = str(int(2 ** (POW_HASH_LENGTH * 3) / difficulty))
         if len(target) < POW_HASH_LENGTH:
             target = '0' * (POW_HASH_LENGTH - len(target)) + target
 
         computed_guess = hashlib.sha256((payload + iteration).encode())\
                              .hexdigest()[0:POW_HASH_LENGTH]
         if guess != computed_guess or guess > target:
             self._errors['text'] = self.error_class(
                 [_('Invalid PoW.')])
 
 
 class ThreadForm(PostForm):
 
     tags = forms.CharField(
         widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER: TAGS_PLACEHOLDER}),
         max_length=100, label=_('Tags'), required=True)
     monochrome = forms.BooleanField(label=_('Monochrome'), required=False)
 
     def clean_tags(self):
         tags = self.cleaned_data['tags'].strip()
 
         if not tags or not REGEX_TAGS.match(tags):
             raise forms.ValidationError(
                 _('Inappropriate characters in tags.'))
 
         default_tag_name = board_settings.get(SECTION_FORMS, 'DefaultTag')\
                 .strip().lower()
 
         required_tag_exists = False
         tag_set = set()
         for tag_string in tags.split():
             if tag_string.strip().lower() == default_tag_name:
                 required_tag_exists = True
                 tag, created = Tag.objects.get_or_create(
                         name=tag_string.strip().lower(), required=True)
             else:
                 tag, created = Tag.objects.get_or_create(
                         name=tag_string.strip().lower())
             tag_set.add(tag)
 
             # If this is a new tag, don't check for its parents because nobody
             # added them yet
             if not created:
                 tag_set |= set(tag.get_all_parents())
 
         for tag in tag_set:
             if tag.required:
                 required_tag_exists = True
                 break
 
         # Use default tag if no section exists
         if not required_tag_exists:
             default_tag, created = Tag.objects.get_or_create(
                     name=default_tag_name, required=True)
             tag_set.add(default_tag)
 
         return tag_set
 
     def clean(self):
         cleaned_data = super(ThreadForm, self).clean()
 
         return cleaned_data
 
     def is_monochrome(self):
         return self.cleaned_data['monochrome']
 
 
 class SettingsForm(NeboardForm):
 
     theme = forms.ChoiceField(choices=settings.THEMES, label=_('Theme'))
     image_viewer = forms.ChoiceField(choices=settings.IMAGE_VIEWERS, label=_('Image view mode'))
     username = forms.CharField(label=_('User name'), required=False)
     timezone = forms.ChoiceField(choices=get_timezones(), label=_('Time zone'))
 
     def clean_username(self):
         username = self.cleaned_data['username']
 
         if username and not REGEX_USERNAMES.match(username):
             raise forms.ValidationError(_('Inappropriate characters.'))
 
         return username
 
 
 class SearchForm(NeboardForm):
     query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,569 +1,575
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 23:21+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"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 
 #: admin.py:22
 msgid "{} posters were banned"
 msgstr ""
 
 #: authors.py:9
 msgid "author"
 msgstr "автор"
 
 #: authors.py:10
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:11
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:12
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:30
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
 #: forms.py:31
 msgid "music images i_dont_like_tags"
 msgstr "музыка картинки теги_не_нужны"
 
 #: forms.py:33
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:34
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:35
 msgid "Tag"
 msgstr "Метка"
 
 #: forms.py:36 templates/boards/base.html:40 templates/search/search.html:7
 msgid "Search"
 msgstr "Поиск"
 
 #: forms.py:48
 msgid "File 1"
 msgstr "Файл 1"
 
 #: forms.py:48
 msgid "File 2"
 msgstr "Файл 2"
 
 #: forms.py:142
 msgid "File URL"
 msgstr "URL файла"
 
 #: forms.py:148
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:151
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
 #: forms.py:162
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:172
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:192
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
 #: forms.py:213
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
 #: forms.py:258
 msgid "Either text or file must be entered."
 msgstr "Текст или файл должны быть введены."
 
 #: forms.py:317 templates/boards/all_threads.html:153
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
 
 #: forms.py:324
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
 #: forms.py:344
 msgid "Need at least one section."
 msgstr "Нужен хотя бы один раздел."
 
 #: forms.py:356
 msgid "Theme"
 msgstr "Тема"
 
 #: forms.py:357
 msgid "Image view mode"
 msgstr "Режим просмотра изображений"
 
 #: forms.py:358
 msgid "User name"
 msgstr "Имя пользователя"
 
 #: forms.py:359
 msgid "Time zone"
 msgstr "Часовой пояс"
 
 #: forms.py:365
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/all_threads.html:35
 msgid "Details"
 msgstr "Подробности"
 
 #: templates/boards/all_threads.html:69
 msgid "Edit tag"
 msgstr "Изменить метку"
 
 #: templates/boards/all_threads.html:76
 #, python-format
 msgid "%(count)s active thread"
 msgid_plural "%(count)s active threads"
 msgstr[0] "%(count)s активная тема"
 msgstr[1] "%(count)s активные темы"
 msgstr[2] "%(count)s активных тем"
 
 #: templates/boards/all_threads.html:76
 #, python-format
 msgid "%(count)s thread in bumplimit"
 msgid_plural "%(count)s threads in bumplimit"
 msgstr[0] "%(count)s тема в бамплимите"
 msgstr[1] "%(count)s темы в бамплимите"
 msgstr[2] "%(count)s тем в бамплимите"
 
 #: templates/boards/all_threads.html:77
 #, python-format
 msgid "%(count)s archived thread"
 msgid_plural "%(count)s archived thread"
 msgstr[0] "%(count)s архивная тема"
 msgstr[1] "%(count)s архивные темы"
 msgstr[2] "%(count)s архивных тем"
 
 #: templates/boards/all_threads.html:78 templates/boards/post.html:102
 #, python-format
 #| msgid "%(count)s message"
 #| msgid_plural "%(count)s messages"
 msgid "%(count)s message"
 msgid_plural "%(count)s messages"
 msgstr[0] "%(count)s сообщение"
 msgstr[1] "%(count)s сообщения"
 msgstr[2] "%(count)s сообщений"
 
 #: templates/boards/all_threads.html:95 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/all_threads.html:109
 #, python-format
 msgid "Skipped %(count)s reply. Open thread to see all replies."
 msgid_plural "Skipped %(count)s replies. Open thread to see all replies."
 msgstr[0] "Пропущен %(count)s ответ. Откройте тред, чтобы увидеть все ответы."
 msgstr[1] ""
 "Пропущено %(count)s ответа. Откройте тред, чтобы увидеть все ответы."
 msgstr[2] ""
 "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
 #: templates/boards/all_threads.html:127 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
 #: templates/boards/all_threads.html:132
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/all_threads.html:138
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/all_threads.html:143 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:51
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/all_threads.html:144 templates/boards/preview.html:6
 #: templates/boards/staticpages/help.html:21
 #: templates/boards/thread_normal.html:52
 msgid "Preview"
 msgstr "Предпросмотр"
 
 #: templates/boards/all_threads.html:149
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/all_threads.html:152 templates/boards/thread_normal.html:58
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/all_threads.html:166 templates/boards/feed.html:53
 msgid "Pages:"
 msgstr "Страницы: "
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:14 templates/boards/base.html.py:41
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:31
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:37
 msgid "Add tags"
 msgstr "Добавить метки"
 
 #: templates/boards/base.html:39
 msgid "Tag management"
 msgstr "Управление метками"
 
 #: templates/boards/base.html:39
 msgid "tags"
 msgstr "метки"
 
 #: templates/boards/base.html:40
 msgid "search"
 msgstr "поиск"
 
 #: templates/boards/base.html:41 templates/boards/feed.html:11
 msgid "feed"
 msgstr "лента"
 
 #: templates/boards/base.html:42 templates/boards/random.html:6
 msgid "Random images"
 msgstr "Случайные изображения"
 
 #: templates/boards/base.html:42
 msgid "random"
 msgstr "случайные"
 
 #: templates/boards/base.html:44
 msgid "favorites"
 msgstr "избранное"
 
 #: templates/boards/base.html:48 templates/boards/base.html.py:49
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Уведомления"
 
 #: templates/boards/base.html:56 templates/boards/settings.html:8
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:59
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #: templates/boards/base.html:71
 msgid "Admin"
 msgstr "Администрирование"
 
 #: templates/boards/base.html:73
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:75
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/feed.html:45
 msgid "No posts exist. Create the first one!"
 msgstr "Нет сообщений. Создайте первое!"
 
 #: templates/boards/post.html:33
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:35 templates/boards/post.html.py:46
 msgid "Reply"
 msgstr "Ответить"
 
 #: templates/boards/post.html:41
 msgid " in "
 msgstr " в "
 
 #: templates/boards/post.html:51
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:53
 msgid "Edit thread"
 msgstr "Изменить тему"
 
 #: templates/boards/post.html:91
 msgid "Replies"
 msgstr "Ответы"
 
 #: templates/boards/post.html:103
 #, python-format
 msgid "%(count)s image"
 msgid_plural "%(count)s images"
 msgstr[0] "%(count)s изображение"
 msgstr[1] "%(count)s изображения"
 msgstr[2] "%(count)s изображений"
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/settings.html:15
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:19
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
 #: templates/boards/settings.html:25
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
 #: templates/boards/settings.html:34
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 msgid "Syntax"
 msgstr "Синтаксис"
 
 #: templates/boards/staticpages/help.html:11
 msgid "Italic text"
 msgstr "Курсивный текст"
 
 #: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Comment"
 msgstr "Комментарий"
 
 #: templates/boards/staticpages/help.html:17
 #: templates/boards/staticpages/help.html:18
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/staticpages/help.html:21
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
 #: templates/boards/tags.html:17
 msgid "Sections:"
 msgstr "Разделы:"
 
 #: templates/boards/tags.html:30
 msgid "Other tags:"
 msgstr "Другие метки:"
 
 #: templates/boards/tags.html:43
 msgid "All tags..."
 msgstr "Все метки..."
 
 #: templates/boards/thread.html:14
 msgid "Normal"
 msgstr "Нормальный"
 
 #: templates/boards/thread.html:15
 msgid "Gallery"
 msgstr "Галерея"
 
 #: templates/boards/thread.html:16
 msgid "Tree"
 msgstr "Дерево"
 
 #: templates/boards/thread.html:35
 msgid "message"
 msgid_plural "messages"
 msgstr[0] "сообщение"
 msgstr[1] "сообщения"
 msgstr[2] "сообщений"
 
 #: templates/boards/thread.html:38
 msgid "image"
 msgid_plural "images"
 msgstr[0] "изображение"
 msgstr[1] "изображения"
 msgstr[2] "изображений"
 
 #: templates/boards/thread.html:40
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/thread_gallery.html:36
 msgid "No images."
 msgstr "Нет изображений."
 
 #: templates/boards/thread_normal.html:30
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread_normal.html:44
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread_normal.html:44
 msgid "to message "
 msgstr "на сообщение"
 
 #: templates/boards/thread_normal.html:59
 msgid "Close form"
 msgstr "Закрыть форму"
 
 #: templates/search/search.html:17
 msgid "Ok"
 msgstr "Ок"
 
 #: utils.py:120
 #, python-format
 msgid "File must be less than %s but is %s."
 msgstr "Файл должен быть менее %s, но его размер %s."
 
 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 секунд перед отправкой сообщения"
 
 msgid "New threads"
 msgstr "Новые темы"
 
 #, python-format
 msgid "Max file size is %(size)s."
 msgstr "Максимальный размер файла %(size)s."
 
 msgid "Size of media:"
 msgstr "Размер медиа:"
 
 msgid "Statistics"
 msgstr "Статистика"
 
 msgid "Invalid PoW."
 msgstr "Неверный PoW."
 
 msgid "Stale PoW."
 msgstr "PoW устарел."
 
 msgid "Show"
 msgstr "Показывать"
 
 msgid "Hide"
 msgstr "Скрывать"
 
 msgid "Add to favorites"
 msgstr "Добавить в избранное"
 
 msgid "Remove from favorites"
 msgstr "Убрать из избранного"
 
 msgid "Monochrome"
 msgstr "Монохромный"
 
 msgid "Subsections: "
 msgstr "Подразделы: "
 
 msgid "Change file source"
 msgstr "Изменить источник файла"
 
 msgid "interesting"
 msgstr "интересное"
 
 msgid "images"
 msgstr "изображения"
 
 msgid "Delete post"
 msgstr "Удалить пост"
 
 msgid "Delete thread"
 msgstr "Удалить тему"
 
 msgid "Messages per day/week/month:"
 msgstr "Сообщений за день/неделю/месяц:"
 
 msgid "Subscribe to thread"
 msgstr "Подписаться на тему"
 
 msgid "Active threads:"
 msgstr "Активные темы:"
 
 msgid "No active threads today."
 msgstr "Сегодня нет активных тем."
 
 msgid "Insert URLs on separate lines."
 msgstr "Вставляйте ссылки на отдельных строках."
+
+msgid "You can post no more than %(files)d file."
+msgid_plural "You can post no more than %(files)d files."
+msgstr[0] "Вы можете отправить не более %(files)d файла."
+msgstr[1] "Вы можете отправить не более %(files)d файлов."
+msgstr[2] "Вы можете отправить не более %(files)d файлов."

boards/static/js/form.js

@@ -1,173 +1,190
 var ITEM_FILE_SOURCE = 'fileSource';
-var URL_STICKERS = '/api/stickers'
+var URL_STICKERS = '/api/stickers';
 var MIN_INPUT_LENGTH = 3;
+var URL_DELIMITER = '\n';
 
 $('input[name=image]').wrap($('<div class="file_wrap"></div>'));
 
 $('body').on('change', 'input[name=image]', function(event) {
     var file = event.target.files[0];
 
     if(file.type.match('image.*')) {
         var fileReader = new FileReader();
 
         fileReader.addEventListener("load", function(event) {
             var wrapper = $('.file_wrap');
 
             wrapper.find('.file-thumb').remove();
             wrapper.append(
                 $('<div class="file-thumb" style="background-image: url('+event.target.result+')"></div>')
             );
         });
 
         fileReader.readAsDataURL(file);
     }
 });
 
 var form = $('#form');
 $('textarea').keypress(function(event) {
     if ((event.which == 10 || event.which == 13) && event.ctrlKey) {
         form.find('input[type=submit]').click();
     }
 });
 
 $('#preview-button').click(function() {
     var data = {
         raw_text: $('textarea').val()
     }
 
     var diffUrl = '/api/preview/';
 
     $.post(diffUrl,
         data,
         function(data) {
             var previewTextBlock = $('#preview-text');
             previewTextBlock.html(data);
             previewTextBlock.show();
 
             addScriptsToPost(previewTextBlock);
         })
 });
 
 /**
  * Show text in the errors row of the form.
  * @param form
  * @param text
  */
 function showAsErrors(form, text) {
     form.children('.form-errors').remove();
 
     if (text.length > 0) {
         var errorList = $('<div class="form-errors">' + text + '<div>');
         errorList.appendTo(form);
     }
 }
 
 function addHiddenInput(form, name, value) {
     form.find('input[name=' + name + ']').val(value);
 }
 
 function selectFileChoice() {
     var file_input = $('#id_file');
     var url_input = $('#id_file_url');
 
     var file_input_row = file_input.parent().parent();
     var url_input_row = url_input.parent().parent();
 
     file_input_row.toggle();
     url_input_row.toggle();
     url_input.val('');
     file_input.val('');
 
     var source;
     if (file_input_row.is(':visible')) {
         source = 'file';
     } else {
         source = 'url';
     }
     localStorage.setItem(ITEM_FILE_SOURCE, source);
 }
 
 $(document).ready(function() {
     var powDifficulty = parseInt($('body').attr('data-pow-difficulty'));
     if (powDifficulty > 0 && typeof SharedWorker != 'undefined') {
         var worker = new SharedWorker($('.post-form').attr('data-pow-script'));
         worker.port.onmessage = function(e) {
             var form = $('#form');
             addHiddenInput(form, 'timestamp', e.data.timestamp);
             addHiddenInput(form, 'iteration', e.data.iteration);
             addHiddenInput(form, 'guess', e.data.guess);
 
             form.submit();
             $('.post-form-w').unblock();
         };
         worker.onerror = function(event){
             throw new Error(event.message + " (" + event.filename + ":" + event.lineno + ")");
         };
         worker.port.start();
 
         var form = $('#form');
         var submitButton = form.find('input[type=submit]');
         submitButton.click(function() {
             showAsErrors(form, gettext('Computing PoW...'));
             $('.post-form-w').block({ message: gettext('Computing PoW...') })
 
             var msg = $('textarea').val().trim();
 
             var data = {
                 msg: msg,
                 difficulty: parseInt($('body').attr('data-pow-difficulty')),
                 hasher: $('.post-form').attr('data-hasher')
             };
             worker.port.postMessage(data);
 
             return false;
         });
     }
 
     var $fileSourceButton = $('#file-source-button');
     if (window.localStorage) {
         var source = localStorage.getItem(ITEM_FILE_SOURCE);
         if (source == null) {
             source = 'file';
         }
         if (source == 'file') {
             $('#id_file_url').parent().parent().hide();
         } else {
             $('#id_file').parent().parent().hide();
         }
 
         $fileSourceButton.click(function() {
             selectFileChoice();
         });
     } else {
         $fileSourceButton.hide();
     }
 
-    $('#id_file_url').autocomplete({
+    // Stickers autocomplete
+    function split( val ) {
+        return val.split(URL_DELIMITER);
+    }
+
+    function extractLast( term ) {
+        return split(term).pop();
+    }
+
+    $('#id_file_1').autocomplete({
         source: function( request, response ) {
             $.getJSON(URL_STICKERS, {
-                term: request.term
+                term: extractLast( request.term )
             }, response);
         },
         search: function() {
             // custom minLength
-            var term = this.value;
+            var term = extractLast( this.value );
             if (term.length < MIN_INPUT_LENGTH) {
                 return false;
             }
         },
         focus: function() {
             // prevent value inserted on focus
             return false;
         },
         select: function( event, ui ) {
-            this.value = ui.item.alias;
+            var terms = split( this.value );
+            // remove the current input
+            terms.pop();
+            // add the selected item
+            terms.push( ui.item.alias );
+            // add placeholder to get the comma-and-space at the end
+            terms.push("");
+            this.value = terms.join(URL_DELIMITER);
             return false;
         }
     })
     .autocomplete( "instance" )._renderItem = function( ul, item ) {
         return $( "<li>" )
             .append( "<div>" + '<img src="' + item.thumb + '">' + '<br />' + item.alias + "</div>" )
             .appendTo( ul );
     };
 });