Pluralize thread info inside a thread

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,469 +1,472 b''
 # 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-09-04 16:30+0300\n"
+"POT-Creation-Date: 2015-09-04 19:00+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:38
 #, python-format
 msgid "Please wait %s seconds before sending message"
 msgstr "Пожалуйста подождите %s секунд перед отправкой сообщения"
 
 #: forms.py:138
 msgid "File"
 msgstr "Файл"
 
 #: forms.py:141
 msgid "File URL"
 msgstr "URL файла"
 
 #: forms.py:147
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:150
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
 #: forms.py:161
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:171
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:191
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
 #: forms.py:212
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
 #: forms.py:257
 msgid "Either text or file must be entered."
 msgstr "Текст или файл должны быть введены."
 
 #: forms.py:316 templates/boards/all_threads.html:148
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
 
 #: forms.py:323
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
 #: forms.py:337
 msgid "Need at least one section."
 msgstr "Нужен хотя бы один раздел."
 
 #: forms.py:349
 msgid "Theme"
 msgstr "Тема"
 
 #: forms.py:350
 msgid "Image view mode"
 msgstr "Режим просмотра изображений"
 
 #: forms.py:351
 msgid "User name"
 msgstr "Имя пользователя"
 
 #: forms.py:352
 msgid "Time zone"
 msgstr "Часовой пояс"
 
 #: forms.py:358
 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 "Related message"
 msgstr "Связанное сообщение"
 
 #: templates/boards/all_threads.html:69
 msgid "Edit tag"
 msgstr "Изменить метку"
 
 #: templates/boards/all_threads.html:75
 #, python-format
 msgid ""
 "This tag has %(thread_count)s threads (%(active_thread_count)s active) and "
 "%(post_count)s posts."
 msgstr ""
 "С этой меткой есть %(thread_count)s тем (%(active_thread_count)s активных) и "
 "%(post_count)s сообщений."
 
 #: templates/boards/all_threads.html:77
 msgid "Related tags:"
 msgstr "Похожие метки:"
 
 #: templates/boards/all_threads.html:90 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/all_threads.html:104
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
 #: templates/boards/all_threads.html:122 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
 #: templates/boards/all_threads.html:127
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/all_threads.html:133
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/all_threads.html:138 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:51
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/all_threads.html:139 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:144
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/all_threads.html:147 templates/boards/thread_normal.html:58
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/all_threads.html:161 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:45 templates/boards/base.html.py:46
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Уведомления"
 
 #: templates/boards/base.html:53 templates/boards/settings.html:8
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:79
 msgid "Admin"
 msgstr "Администрирование"
 
 #: templates/boards/base.html:81
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:83
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/feed.html:45
 msgid "No posts exist. Create the first one!"
 msgstr "Нет сообщений. Создайте первое!"
 
 #: templates/boards/post.html:32
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:34 templates/boards/post.html.py:45
 msgid "Reply"
 msgstr "Ответить"
 
 #: templates/boards/post.html:40
 msgid " in "
 msgstr " в "
 
 #: templates/boards/post.html:50
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:52
 msgid "Edit thread"
 msgstr "Изменить тему"
 
 #: templates/boards/post.html:94
 msgid "Replies"
 msgstr "Ответы"
 
 #: templates/boards/post.html:105
 #, python-format
-#| msgid "%(count)s message,"
-#| msgid_plural "%(count)s messages,"
-msgid "%(count)s message,"
+msgid "%(count)s message"
 msgid_plural "%(count)s messages"
 msgstr[0] "%(count)s сообщение"
 msgstr[1] "%(count)s сообщения"
 msgstr[2] "%(count)s сообщений"
 
 #: templates/boards/post.html:106
 #, python-format
-#| msgid "%(count)s message,"
-#| msgid_plural "%(count)s messages,"
-msgid "%(count)s image,"
+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:15
 msgid "Normal"
 msgstr "Нормальный"
 
 #: templates/boards/thread.html:16
 msgid "Gallery"
 msgstr "Галерея"
 
 #: templates/boards/thread.html:17
 msgid "Tree"
 msgstr "Дерево"
 
-#: templates/boards/thread.html:34
-msgid "messages"
-msgstr "сообщений"
+#: templates/boards/thread.html:36
+#| msgid "messages"
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "сообщение"
+msgstr[1] "сообщения"
+msgstr[2] "сообщений"
 
-#: templates/boards/thread.html:35
-msgid "images"
-msgstr "изображений"
+#: templates/boards/thread.html:39
+msgid "image"
+msgid_plural "images"
+msgstr[0] "изображение"
+msgstr[1] "изображения"
+msgstr[2] "изображений"
 
-#: templates/boards/thread.html:36
+#: templates/boards/thread.html:41
 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:102
 #, python-format
 msgid "File must be less than %s bytes"
 msgstr "Файл должен быть менее %s байт"

boards/locale/ru/LC_MESSAGES/djangojs.po

@@ -1,32 +1,55 b''
 # 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.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-02 13:26+0300\n"
+"POT-Creation-Date: 2015-09-04 18:47+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: \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"
 
-#: static/js/refpopup.js:58
+#: static/js/3party/jquery-ui.min.js:8
+msgid "'"
+msgstr ""
+
+#: static/js/refpopup.js:72
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: static/js/refpopup.js:77
+#: static/js/refpopup.js:91
 msgid "Post not found"
 msgstr "Сообщение не найдено"
 
-#: static/js/thread_update.js:279
+#: static/js/thread_update.js:261
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "сообщение"
+msgstr[1] "сообщения"
+msgstr[2] "сообщений"
+
+#: static/js/thread_update.js:262
+msgid "image"
+msgid_plural "images"
+msgstr[0] "изображение"
+msgstr[1] "изображения"
+msgstr[2] "изображений"
+
+#: static/js/thread_update.js:445
 msgid "Sending message..."
-msgstr "Отправка сообщения..."
  No newline at end of file
+msgstr "Отправка сообщения..."
+
+#: static/js/thread_update.js:449
+msgid "Server error!"
+msgstr "Ошибка сервера!"
+

boards/static/js/thread_update.js

@@ -1,456 +1,457 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013-2014  neko259
 
  The JavaScript code in this page is free software: you can
  redistribute it and/or modify it under the terms of the GNU
  General Public License (GNU GPL) as published by the Free Software
  Foundation, either version 3 of the License, or (at your option)
  any later version.  The code is distributed WITHOUT ANY WARRANTY;
  without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 
  As additional permission under GNU GPL version 3 section 7, you
  may distribute non-source (e.g., minimized or compacted) forms of
  that code without the copy of the GNU GPL normally required by
  section 4, provided you include this license notice and a URL
  through which recipients can access the Corresponding Source.
 
  @licend  The above is the entire license notice
  for the JavaScript code in this page.
  */
 
 var CLASS_POST = '.post'
 
 var POST_ADDED = 0;
 var POST_UPDATED = 1;
 
 var JS_AUTOUPDATE_PERIOD = 20000;
 
 var ALLOWED_FOR_PARTIAL_UPDATE = [
     'refmap',
     'post-info'
 ];
 
 var ATTR_CLASS = 'class';
 var ATTR_UID = 'data-uid';
 
 var wsUser = '';
 
 var unreadPosts = 0;
 var documentOriginalTitle = '';
 
 // Thread ID does not change, can be stored one time
 var threadId = $('div.thread').children(CLASS_POST).first().attr('id');
 
 /**
  * Connect to websocket server and subscribe to thread updates. On any update we
  * request a thread diff.
  *
  * @returns {boolean} true if connected, false otherwise
  */
 function connectWebsocket() {
     var metapanel = $('.metapanel')[0];
 
     var wsHost = metapanel.getAttribute('data-ws-host');
     var wsPort = metapanel.getAttribute('data-ws-port');
 
     if (wsHost.length > 0 && wsPort.length > 0) {
         var centrifuge = new Centrifuge({
             "url": 'ws://' + wsHost + ':' + wsPort + "/connection/websocket",
             "project": metapanel.getAttribute('data-ws-project'),
             "user": wsUser,
             "timestamp": metapanel.getAttribute('data-ws-token-time'),
             "token": metapanel.getAttribute('data-ws-token'),
             "debug": false
         });
 
         centrifuge.on('error', function(error_message) {
             console.log("Error connecting to websocket server.");
             console.log(error_message);
             console.log("Using javascript update instead.");
 
             // If websockets don't work, enable JS update instead
             enableJsUpdate()
         });
 
         centrifuge.on('connect', function() {
             var channelName = 'thread:' + threadId;
             centrifuge.subscribe(channelName, function(message) {
                 getThreadDiff();
             });
 
             // For the case we closed the browser and missed some updates
             getThreadDiff();
             $('#autoupdate').hide();
         });
 
         centrifuge.connect();
 
         return true;
     } else {
         return false;
     }
 }
 
 /**
  * Get diff of the posts from the current thread timestamp.
  * This is required if the browser was closed and some post updates were
  * missed.
  */
 function getThreadDiff() {
-    var lastUpdateTime = $('.metapanel').attr('data-last-update');
-    var lastPostId = $('.post').last().attr('id');
+    var all_posts = $('.post');
 
     var uids = '';
-    var posts = $('.post');
+    var posts = all_posts;
     for (var i = 0; i < posts.length; i++) {
         uids += posts[i].getAttribute('data-uid') + ' ';
     }
 
     var data = {
         uids: uids,
         thread: threadId
     }
 
     var diffUrl = '/api/diff_thread/';
 
     $.post(diffUrl,
         data,
         function(data) {
             var updatedPosts = data.updated;
             var addedPostCount = 0;
 
             for (var i = 0; i < updatedPosts.length; i++) {
                 var postText = updatedPosts[i];
                 var post = $(postText);
 
                 if (updatePost(post) == POST_ADDED) {
                     addedPostCount++;
                 }
             }
 
             var hasMetaUpdates = updatedPosts.length > 0;
             if (hasMetaUpdates) {
                 updateMetadataPanel();
             }
 
             if (addedPostCount > 0) {
                 updateBumplimitProgress(addedPostCount);
             }
 
             if (updatedPosts.length > 0) {
                 showNewPostsTitle(addedPostCount);
             }
 
             // TODO Process removed posts if any
             $('.metapanel').attr('data-last-update', data.last_update);
         },
         'json'
     )
 }
 
 /**
  * Add or update the post on html page.
  */
 function updatePost(postHtml) {
     // This needs to be set on start because the page is scrolled after posts
     // are added or updated
     var bottom = isPageBottom();
 
     var post = $(postHtml);
 
     var threadBlock = $('div.thread');
 
     var postId = post.attr('id');
 
     // If the post already exists, replace it. Otherwise add as a new one.
     var existingPosts = threadBlock.children('.post[id=' + postId + ']');
 
     var type;
 
     if (existingPosts.size() > 0) {
         replacePartial(existingPosts.first(), post, false);
         post = existingPosts.first();
 
         type = POST_UPDATED;
     } else {
         post.appendTo(threadBlock);
 
         if (bottom) {
             scrollToBottom();
         }
 
         type = POST_ADDED;
     }
 
     processNewPost(post);
 
     return type;
 }
 
 /**
  * Initiate a blinking animation on a node to show it was updated.
  */
 function blink(node) {
     var blinkCount = 2;
 
     var nodeToAnimate = node;
     for (var i = 0; i < blinkCount; i++) {
         nodeToAnimate = nodeToAnimate.fadeTo('fast', 0.5).fadeTo('fast', 1.0);
     }
 }
 
 function isPageBottom() {
     var scroll = $(window).scrollTop() / ($(document).height()
         - $(window).height());
 
     return scroll == 1
 }
 
 function enableJsUpdate() {
     setInterval(getThreadDiff, JS_AUTOUPDATE_PERIOD);
     return true;
 }
 
 function initAutoupdate() {
     if (location.protocol === 'https:') {
         return enableJsUpdate();
     } else {
         if (connectWebsocket()) {
             return true;
         } else {
             return enableJsUpdate();
         }
     }
 }
 
 function getReplyCount() {
     return $('.thread').children(CLASS_POST).length
 }
 
 function getImageCount() {
     return $('.thread').find('img').length
 }
 
 /**
  * Update post count, images count and last update time in the metadata
  * panel.
  */
 function updateMetadataPanel() {
     var replyCountField = $('#reply-count');
     var imageCountField = $('#image-count');
 
-    replyCountField.text(getReplyCount());
-    imageCountField.text(getImageCount());
+    var replyCount = getReplyCount();
+    replyCountField.text(replyCount);
+    var imageCount = getImageCount();
+    imageCountField.text(imageCount);
 
     var lastUpdate = $('.post:last').children('.post-info').first()
         .children('.pub_time').first().html();
     if (lastUpdate !== '') {
         var lastUpdateField = $('#last-update');
         lastUpdateField.html(lastUpdate);
         blink(lastUpdateField);
     }
 
     blink(replyCountField);
     blink(imageCountField);
+
+    $('#message-count-text').text(ngettext('message', 'messages', replyCount));
+    $('#image-count-text').text(ngettext('image', 'images', imageCount));
 }
 
 /**
  * Update bumplimit progress bar
  */
 function updateBumplimitProgress(postDelta) {
     var progressBar = $('#bumplimit_progress');
     if (progressBar) {
         var postsToLimitElement = $('#left_to_limit');
 
         var oldPostsToLimit = parseInt(postsToLimitElement.text());
         var postCount = getReplyCount();
         var bumplimit = postCount - postDelta + oldPostsToLimit;
 
         var newPostsToLimit = bumplimit - postCount;
         if (newPostsToLimit <= 0) {
             $('.bar-bg').remove();
         } else {
             postsToLimitElement.text(newPostsToLimit);
             progressBar.width((100 - postCount / bumplimit * 100.0) + '%');
         }
     }
 }
 
 /**
  * Show 'new posts' text in the title if the document is not visible to a user
  */
 function showNewPostsTitle(newPostCount) {
     if (document.hidden) {
         if (documentOriginalTitle === '') {
             documentOriginalTitle = document.title;
         }
         unreadPosts = unreadPosts + newPostCount;
 
         var newTitle = '* ';
         if (unreadPosts > 0) {
             newTitle += '[' + unreadPosts + '] ';
         }
         newTitle += documentOriginalTitle;
 
         document.title = newTitle;
 
         document.addEventListener('visibilitychange', function() {
             if (documentOriginalTitle !== '') {
                 document.title = documentOriginalTitle;
                 documentOriginalTitle = '';
                 unreadPosts = 0;
             }
 
             document.removeEventListener('visibilitychange', null);
         });
     }
 }
 
 /**
  * Clear all entered values in the form fields
  */
 function resetForm(form) {
     form.find('input:text, input:password, input:file, select, textarea').val('');
     form.find('input:radio, input:checkbox')
              .removeAttr('checked').removeAttr('selected');
     $('.file_wrap').find('.file-thumb').remove();
     $('#preview-text').hide();
 }
 
 /**
  * When the form is posted, this method will be run as a callback
  */
 function updateOnPost(response, statusText, xhr, form) {
     var json = $.parseJSON(response);
     var status = json.status;
 
     showAsErrors(form, '');
 
     if (status === 'ok') {
         resetFormPosition();
         resetForm(form);
         getThreadDiff();
         scrollToBottom();
     } else {
         var errors = json.errors;
         for (var i = 0; i < errors.length; i++) {
             var fieldErrors = errors[i];
 
             var error = fieldErrors.errors;
 
             showAsErrors(form, error);
         }
     }
 }
 
 /**
  * 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);
     }
 }
 
 /**
  * Run js methods that are usually run on the document, on the new post
  */
 function processNewPost(post) {
     addRefLinkPreview(post[0]);
     highlightCode(post);
     blink(post);
 }
 
 function replacePartial(oldNode, newNode, recursive) {
     if (!equalNodes(oldNode, newNode)) {
         // Update parent node attributes
         updateNodeAttr(oldNode, newNode, ATTR_CLASS);
         updateNodeAttr(oldNode, newNode, ATTR_UID);
 
         // Replace children
         var children = oldNode.children();
         if (children.length == 0) {
-            console.log(oldContent);
-            console.log(newContent)
-
             oldNode.replaceWith(newNode);
         } else {
             var newChildren = newNode.children();
             newChildren.each(function(i) {
                 var newChild = newChildren.eq(i);
                 var newChildClass = newChild.attr(ATTR_CLASS);
 
                 // Update only certain allowed blocks (e.g. not images)
                 if (ALLOWED_FOR_PARTIAL_UPDATE.indexOf(newChildClass) > -1) {
                     var oldChild = oldNode.children('.' + newChildClass);
 
                     if (oldChild.length == 0) {
                         oldNode.append(newChild);
                     } else {
                         if (!equalNodes(oldChild, newChild)) {
                             if (recursive) {
                                 replacePartial(oldChild, newChild, false);
                             } else {
                                 oldChild.replaceWith(newChild);
                             }
                         }
                     }
                 }
             });
         }
     }
 }
 
 /**
  * Compare nodes by content
  */
 function equalNodes(node1, node2) {
     return node1[0].outerHTML == node2[0].outerHTML;
 }
 
 /**
  * Update attribute of a node if it has changed
  */
 function updateNodeAttr(oldNode, newNode, attrName) {
     var oldAttr = oldNode.attr(attrName);
     var newAttr = newNode.attr(attrName);
     if (oldAttr != newAttr) {
         oldNode.attr(attrName, newAttr);
-    };
+    }
 }
 
 $(document).ready(function(){
     if (initAutoupdate()) {
         // Post form data over AJAX
         var threadId = $('div.thread').children('.post').first().attr('id');
 
         var form = $('#form');
 
         if (form.length > 0) {
             var options = {
                 beforeSubmit: function(arr, $form, options) {
                     showAsErrors($('#form'), gettext('Sending message...'));
                 },
                 success: updateOnPost,
                 error: function() {
                     showAsErrors($('#form'), gettext('Server error!'));
                 },
                 url: '/api/add_post/' + threadId + '/'
             };
 
             form.ajaxForm(options);
 
             resetForm(form);
         }
     }
 });

boards/templates/boards/post.html

@@ -1,109 +1,109 b''
 {% load i18n %}
 {% load board %}
 
 {% get_current_language as LANGUAGE_CODE %}
 
 <div class="{{ css_class }}" id="{{ post.id }}" data-uid="{{ post.uid }}">
     <div class="post-info">
         <a class="post_id" href="{{ post.get_absolute_url }}">#{{ post.get_absolute_id }}</a>
         <span class="title">{{ post.title }}</span>
         <span class="pub_time"><time datetime="{{ post.pub_time|date:'c' }}">{{ post.pub_time }}</time></span>
         {% if post.tripcode %}
             {% with tripcode=post.get_tripcode %}
             <a href="{% url 'feed' %}?tripcode={{ tripcode.get_full_text }}"
                class="tripcode" title="{{ tripcode.get_full_text }}"
                style="border: solid 2px #{{ tripcode.get_color }}; border-left: solid 1ex #{{ tripcode.get_color }};">{{ tripcode.get_short_text }}</a>
             {% endwith %}
         {% endif %}
         {% comment %}
             Thread death time needs to be shown only if the thread is alredy archived
             and this is an opening post (thread death time) or a post for popup
             (we don't see OP here so we show the death time in the post itself).
         {% endcomment %}
         {% if thread.archived %}
             {% if is_opening %}
             — <time datetime="{{ thread.bump_time|date:'c' }}">{{ thread.bump_time }}</time>
             {% endif %}
         {% endif %}
         {% if is_opening %}
             {% if need_open_link %}
                 {% if thread.archived %}
                     <a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>
                 {% else %}
                     <a class="link" href="{% url 'thread' post.id %}#form">{% trans "Reply" %}</a>
                 {% endif %}
             {% endif %}
         {% else %}
             {% if need_op_data %}
                 {% with thread.get_opening_post as op %}
                     {% trans " in " %}{{ op.get_link_view|safe }} <span class="title">{{ op.get_title|striptags|truncatewords:5 }}</span>
                 {% endwith %}
             {% endif %}
         {% endif %}
         {% if reply_link and not thread.archived %}
             <a href="#form" onclick="addQuickReply('{{ post.id }}'); return false;">{% trans 'Reply' %}</a>
         {% endif %}
 
         {% if moderator %}
             <span class="moderator_info">
                 | <a href="{% url 'admin:boards_post_change' post.id %}">{% trans 'Edit' %}</a>
                 {% if is_opening %}
                    | <a href="{% url 'admin:boards_thread_change' thread.id %}">{% trans 'Edit thread' %}</a>
                 {% endif %}
             </span>
         {% endif %}
     </div>
     {% comment %}
         Post images. Currently only 1 image can be posted and shown, but post model
         supports multiple.
     {%  endcomment %}
     {% if post.images.exists %}
         {% with post.images.first as image %}
             {{ image.get_view|safe }}
         {% endwith %}
     {% endif %}
     {% if post.attachments.exists %}
         {% with post.attachments.first as file %}
             {{ file.get_view|safe }}
         {% endwith %}
     {% endif %}
     {% comment %}
         Post message (text)
     {% endcomment %}
     <div class="message">
         {% autoescape off %}
             {% if truncated %}
                 {{ post.get_text|truncatewords_html:50 }}
             {% else %}
                 {{ post.get_text }}
             {% endif %}
         {% endautoescape %}
     </div>
     {% if post.is_referenced %}
         {% if mode_tree %}
             <div class="tree_reply">
                 {% for refpost in post.get_referenced_posts %}
                     {% post_view refpost mode_tree=True %}
                 {% endfor %}
             </div>
         {% else %}
             <div class="refmap">
                 {% trans "Replies" %}: {{ post.refmap|safe }}
             </div>
         {% endif %}
     {% endif %}
     {% comment %}
         Thread metadata: counters, tags etc
     {% endcomment %}
     {% if is_opening %}
         <div class="metadata">
             {% if is_opening and need_open_link %}
-                {% blocktrans count count=thread.get_reply_count %}{{ count }} message,{% plural %}{{ count }} messages{% endblocktrans %},
-                {% blocktrans count count=thread.get_images_count %}{{ count }} image,{% plural %}{{ count }} images{% endblocktrans %}.
+                {% blocktrans count count=thread.get_reply_count %}{{ count }} message{% plural %}{{ count }} messages{% endblocktrans %},
+                {% blocktrans count count=thread.get_images_count %}{{ count }} image{% plural %}{{ count }} images{% endblocktrans %}.
             {% endif %}
             <span class="tags">
                 {{ thread.get_tag_url_list|safe }}
             </span>
         </div>
     {% endif %}
 </div>

boards/templates/boards/thread.html

@@ -1,40 +1,45 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load static from staticfiles %}
 {% load board %}
 {% load tz %}
 
 {% block head %}
     <title>{{ opening_post.get_title|striptags|truncatewords:10 }}
         - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
     <div class="image-mode-tab">
         <a {% ifequal mode 'normal' %}class="current_mode"{% endifequal %} href="{% url 'thread' opening_post.id %}">{% trans 'Normal' %}</a>,
         <a {% ifequal mode 'gallery' %}class="current_mode"{% endifequal %} href="{% url 'thread_gallery' opening_post.id %}">{% trans 'Gallery' %}</a>,
         <a {% ifequal mode 'tree' %}class="current_mode"{% endifequal %} href="{% url 'thread_tree' opening_post.id %}">{% trans 'Tree' %}</a>
     </div>
 
     {% block thread_content %}
     {% endblock %}
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel"
           data-last-update="{{ last_update }}"
           data-ws-token-time="{{ ws_token_time }}"
           data-ws-token="{{ ws_token }}"
           data-ws-project="{{ ws_project }}"
           data-ws-host="{{ ws_host }}"
           data-ws-port="{{ ws_port }}">
 
-        <span id="reply-count">{{ thread.get_reply_count }}</span>{% if thread.has_post_limit %}/{{ thread.max_posts }}{% endif %} {% trans 'messages' %},
-            <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
+        {% with replies_count=thread.get_reply_count%}
+            <span id="reply-count">{{ thread.get_reply_count }}</span>{% if thread.has_post_limit %}/{{ thread.max_posts }}{% endif %}
+            <span id="message-count-text">{% blocktrans count repliess_count=replies_count %}message{% plural %}messages{% endblocktrans %}</span>,
+        {% endwith %}
+        {% with images_count=thread.get_images_count%}
+            <span id="image-count">{{ images_count }}</span> <span id="image-count-text">{% blocktrans count count=images_count %}image{% plural %}images{% endblocktrans %}</span>.
+        {% endwith %}
             {% trans 'Last update: ' %}<span id="last-update"><time datetime="{{ thread.last_edit_time|date:'c' }}">{{ thread.last_edit_time }}</time></span>
             [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}