# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2016-12-30 09:29:36
# Node ID 8d73e7634e15abaa59a61368c113d000c11da8dd
# Parent  7a6a61e1c2eb3a4c049dad9a20fc6d79d7803bb6

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

diff --git a/boards/forms/__init__.py b/boards/forms/__init__.py
--- a/boards/forms/__init__.py
+++ b/boards/forms/__init__.py
@@ -49,7 +49,8 @@ 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 @@ 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))
diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index e0fe14ec3e48c89828f560bdd0eff7057d397f94..e6305537725c5e7c035cf3877fa9b5b738af21d7
GIT binary patch
literal 11001
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
S=~5hdrlYC&d8*DQ-+uz?m32D+

diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po
--- a/boards/locale/ru/LC_MESSAGES/django.po
+++ b/boards/locale/ru/LC_MESSAGES/django.po
@@ -567,3 +567,9 @@ 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 файлов."
diff --git a/boards/static/js/form.js b/boards/static/js/form.js
--- a/boards/static/js/form.js
+++ b/boards/static/js/form.js
@@ -1,6 +1,7 @@
 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 @@ 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 @@ 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;
         }
     })