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

boards/forms/__init__.py

@@ -49,7 +49,8 b" 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
 
@@ -297,7 +298,9 b' class PostForm(NeboardForm):'
 
         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))

boards/locale/ru/LC_MESSAGES/django.po

@@ -567,3 +567,9 b' msgstr "\xd0\xa1\xd0\xb5\xd0\xb3\xd0\xbe\xd0\xb4\xd0\xbd\xd1\x8f \xd0\xbd\xd0\xb5\xd1\x82 \xd0\xb0\xd0\xba\xd1\x82\xd0\xb8\xd0\xb2\xd0\xbd\xd1\x8b\xd1\x85 \xd1\x82\xd0\xb5\xd0\xbc."'
 
 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,6 +1,7 b''
 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>'));
 
@@ -143,15 +144,24 b' function selectFileChoice() {'
         $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;
             }
@@ -161,7 +171,14 b' function selectFileChoice() {'
             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;
         }
     })