diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo index 86b9aff8d44a33ba50efee8712a08463779c4f0c..bd3cae0b03220890b441cdae66d5855e90820079 GIT binary patch literal 8164 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\n" "Language-Team: LANGUAGE \n" @@ -319,9 +319,7 @@ 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 сообщения" @@ -329,9 +327,7 @@ 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 изображения" @@ -427,15 +423,22 @@ msgstr "Галерея" 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 "Последнее обновление: " diff --git a/boards/locale/ru/LC_MESSAGES/djangojs.mo b/boards/locale/ru/LC_MESSAGES/djangojs.mo index 58d209b02d15ab1f664e6f18e0dbda7ae067c0d4..6f605db078c248373980e3357705bfd3fa87bf9c GIT binary patch literal 965 zc${sKO>fgM7{|RAKngEHV z0us_rh}$H-K{qH{kr)>a9362*9Qg!%0G_0)3T%#ke(cBpzn>?`&#}=r2*w%UGEf1| z08_~R&!jP&YUgP4W5 z3^5(ogE)i+3oCRHiIG!3`>R-#QV zLgL9jxnZxMYK8)mVd0x)I2M z?!IG}h*uz48{aLMUT*3^A@69eFGErhK9hAnjKR>OqQ&+CT%XdO6P-yq}TMwMEWC%AnlSCI~|MB)s0N z`vIH7Yma;(X=trfmPmS_i`!bKf;eoA#~<9p>4!n673(eG*U1tW4QXQ5Ot#XRnZv!M zb(LK)bjvdE!~~9)`nY8n_%_zDne6AS>Hbm1nvIua#jf9Sk9v+N!HQB-ulxcB1F%OSA>az1WJQ zXaD-5?c}zd=q22-+n02}v6sy4aRdkZi6y?}W53*q>1g|8br=0#7cMy7%5hZ}{Q;mV BS(E?( diff --git a/boards/locale/ru/LC_MESSAGES/djangojs.po b/boards/locale/ru/LC_MESSAGES/djangojs.po --- a/boards/locale/ru/LC_MESSAGES/djangojs.po +++ b/boards/locale/ru/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ 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 \n" "Language-Team: LANGUAGE \n" @@ -19,14 +19,37 @@ 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 "Ошибка сервера!" + diff --git a/boards/static/js/thread_update.js b/boards/static/js/thread_update.js --- a/boards/static/js/thread_update.js +++ b/boards/static/js/thread_update.js @@ -102,11 +102,10 @@ 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 @@ 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 @@ 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 @@ 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 @@ function updateNodeAttr(oldNode, newNode var newAttr = newNode.attr(attrName); if (oldAttr != newAttr) { oldNode.attr(attrName, newAttr); - }; + } } $(document).ready(function(){ diff --git a/boards/templates/boards/post.html b/boards/templates/boards/post.html --- a/boards/templates/boards/post.html +++ b/boards/templates/boards/post.html @@ -98,8 +98,8 @@ {% if is_opening %}
{% 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 %} {{ thread.get_tag_url_list|safe }} diff --git a/boards/templates/boards/thread.html b/boards/templates/boards/thread.html --- a/boards/templates/boards/thread.html +++ b/boards/templates/boards/thread.html @@ -31,8 +31,13 @@ data-ws-host="{{ ws_host }}" data-ws-port="{{ ws_port }}"> - {{ thread.get_reply_count }}{% if thread.has_post_limit %}/{{ thread.max_posts }}{% endif %} {% trans 'messages' %}, - {{ thread.get_images_count }} {% trans 'images' %}. + {% with replies_count=thread.get_reply_count%} + {{ thread.get_reply_count }}{% if thread.has_post_limit %}/{{ thread.max_posts }}{% endif %} + {% blocktrans count repliess_count=replies_count %}message{% plural %}messages{% endblocktrans %}, + {% endwith %} + {% with images_count=thread.get_images_count%} + {{ images_count }} {% blocktrans count count=images_count %}image{% plural %}images{% endblocktrans %}. + {% endwith %} {% trans 'Last update: ' %} [RSS]