Pluralize thread info inside a thread

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: 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"
@@ -319,9 +319,7 b' msgstr "\xd0\x9e\xd1\x82\xd0\xb2\xd0\xb5\xd1\x82\xd1\x8b"'
 
 #: 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 сообщения"
@@ -329,9 +327,7 b' msgstr[2] "%(count)s \xd1\x81\xd0\xbe\xd0\xbe\xd0\xb1\xd1\x89\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb9"'
 
 #: 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 изображения"
@@ -427,15 +423,22 b' msgstr "\xd0\x93\xd0\xb0\xd0\xbb\xd0\xb5\xd1\x80\xd0\xb5\xd1\x8f"'
 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 "Последнее обновление: "
 

boards/locale/ru/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 b' 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"
@@ -19,14 +19,37 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"
 
-#: 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

@@ -102,11 +102,10 b' function connectWebsocket() {'
  * 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') + ' ';
     }
@@ -244,8 +243,10 b' 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();
@@ -257,6 +258,9 b' function updateMetadataPanel() {'
 
     blink(replyCountField);
     blink(imageCountField);
+
+    $('#message-count-text').text(ngettext('message', 'messages', replyCount));
+    $('#image-count-text').text(ngettext('image', 'images', imageCount));
 }
 
 /**
@@ -380,9 +384,6 b' function replacePartial(oldNode, newNode'
         // Replace children
         var children = oldNode.children();
         if (children.length == 0) {
-            console.log(oldContent);
-            console.log(newContent)
-
             oldNode.replaceWith(newNode);
         } else {
             var newChildren = newNode.children();
@@ -426,7 +427,7 b' function updateNodeAttr(oldNode, newNode'
     var newAttr = newNode.attr(attrName);
     if (oldAttr != newAttr) {
         oldNode.attr(attrName, newAttr);
-    };
+    }
 }
 
 $(document).ready(function(){

boards/templates/boards/post.html

@@ -98,8 +98,8 b''
     {% 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 }}

boards/templates/boards/thread.html

@@ -31,8 +31,13 b''
           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>