diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo index 4371d836c7aee513da3eeda3e587c4e855c463cf..c96da443016b4ec221f995f7007a8f9256c23c68 GIT binary patch literal 2136 zc$|%sOKclO7{`aCX@bkM6bc2TDN+kjw8nN2RGT=|O`H&6Cn0f);I^>`XX$#^-CZ|{ zR3Hzv0woG650wKC6;KawF-c6^I7!c3(5$#ZZ-@&LH;{k>|CyaUkcz}g>)-5r|M|ZE zd^5gv_`rt*&tvNS8}A9cKi)y)Q*I*U5O^MZ2z&#)AN&Bk6TA){0IOgNSOf0{8%<%J z@4$oLZ%X$&_$c_7(jRRm+tM3IBe_L@GY!bdy{AzPp z_hZE`z*g`p6<-0@vBz~)-$9ZN@GbBO@N4iM@cWi<-A^sy{(lDBMW4Wz!IMaS7<^Ol z3OE3M2}ZzQ4~BjHL&cA@hJ3O$+^4SC3tk2@t>L;K)ch@_|3%IJ2_6Ak+Co3az`MYB zTj;l^E!1T}afITm#5o-bk5g*IBYGzG{UF|l)!Bnq?JS`dSxq>rgQ*Xxhjp-=qMbu~1 zW>ZQ@($hw%Y%!gZ0p=ekgC(QLNXGDdS}7NxMId9^=RE2=)UdrN=6W=5*mQzX)ApF_ zvjUwm{Yf%{g`Q4E9M2~&RUDuFhi;UWt(ovwk-p8EHh7Bm@)C`i-IGr^E%7>+F(IDi_Myjt<#ZI?~AE{G(DRh9UB}Tiom_& z`dZd2ng#7lrRZrnN2igI;hZKrj73_XY+fQ3@6=+?YVjCNB=p2{9kI?>3_@*`T`;{p z-7D$TsFoep`cm|TVLdz8@#^qUIwHHh7P5&Y1*C6rUo;oQ+<7- z>9MgMNbO<;o6>U3DCsnl8X6cEmb){V)0P=^+~S@_r*0*Z9n7Zpb{LPwBE637GaChG z%8>Zz-P2{uFzqgypEO*L`N{EIzjkU*Cyc$uTrF+qodOO{r>7=NKQdxfT*K1(9k=A^ z)Go_UFWK2e!(s9%`$RmJOvdTSlT-|2$CL3meV)dsF28${iJee)@)C;M z5@=%WSQE#ZM0;0+@b`i_UZcT0ukp=bk?$7UJGV%H~IS*%pWKGBU$4c1grd8XtyA$ zLCv>OrGbexOx0jasKUf@TIxiiYrz~0Huwgwi^5e1QFKM54;Cp3Zu3=GnWreS7}{IG z60s4L2{P=4--HtC;GJM8SQdHbr708&E(eRE)TdZ=Q%#HJ5mncqYM|57$&O2z zP@G@w-!4VV#Z(nW>rpDRY=~kM-EW9=_1hhvJgeYcgsRecBUlnSqhv2ZINan_!mncK zs&pmJcAIbDD#`}T2A7EJQX^PE@;ZuaiMvQ{TNTqA=>4p`s4Hae7KpS&`dF32e*lKH B4gmlF 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 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-09 17:35+0300\n" +"POT-Creation-Date: 2013-06-10 22:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,115 +18,119 @@ 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" -#: templates/base.html:27 +#: templates/boards/base.html:27 msgid "All threads" msgstr "Все темы" -#: templates/base.html:33 +#: templates/boards/base.html:33 msgid "Settings" msgstr "Настройки" -#: templates/base.html:40 +#: templates/boards/base.html:40 msgid "Up" msgstr "Вверх" -#: templates/posting_general.html:18 +#: templates/boards/posting_general.html:18 msgid "Tag: " msgstr "Тег: " -#: templates/posting_general.html:35 templates/posting_general.html.py:79 -#: templates/thread.html:27 +#: templates/boards/posting_general.html:35 +#: templates/boards/posting_general.html:79 templates/boards/thread.html:27 #, fuzzy msgid "Post image" msgstr "Изображение сообщения" -#: templates/posting_general.html:46 +#: templates/boards/posting_general.html:46 msgid "Reply" msgstr "Ответ" -#: templates/posting_general.html:53 templates/thread.html:107 +#: templates/boards/posting_general.html:53 templates/boards/thread.html:107 msgid "replies" msgstr "ответов" -#: templates/posting_general.html:54 templates/thread.html:108 +#: templates/boards/posting_general.html:54 templates/boards/thread.html:108 msgid "images" msgstr "изображений" -#: templates/posting_general.html:56 templates/posting_general.html.py:127 -#: templates/thread.html:49 +#: templates/boards/posting_general.html:56 +#: templates/boards/posting_general.html:127 templates/boards/thread.html:49 msgid "Tags" msgstr "Теги" -#: templates/posting_general.html:109 +#: templates/boards/posting_general.html:109 msgid "Create new thread" msgstr "Создать новую тему" -#: templates/posting_general.html:112 templates/thread.html:71 +#: templates/boards/posting_general.html:112 templates/boards/thread.html:71 msgid "Title" msgstr "Заголовок" -#: templates/posting_general.html:117 templates/thread.html:76 +#: templates/boards/posting_general.html:117 templates/boards/thread.html:76 msgid "Text" msgstr "Текст" -#: templates/posting_general.html:122 templates/thread.html:81 +#: templates/boards/posting_general.html:122 templates/boards/thread.html:81 msgid "Image" msgstr "Изображение" -#: templates/posting_general.html:136 templates/thread.html:91 +#: templates/boards/posting_general.html:136 templates/boards/thread.html:91 msgid "Post" msgstr "Отправить" -#: templates/posting_general.html:152 -#, fuzzy +#: templates/boards/posting_general.html:138 +msgid "Tags must be delimited by spaces. Text or image is required." +msgstr "" +"Теги должны быть разделены пробелами. Текст или изображение обязательны." + +#: templates/boards/posting_general.html:141 templates/boards/thread.html:93 +msgid "Basic markdown syntax." +msgstr "Базовый синтаксис markdown." + +#: templates/boards/posting_general.html:152 msgid "Pages:" msgstr "Страницы: " -#: templates/settings.html:13 +#: templates/boards/settings.html:13 msgid "Theme" msgstr "Тема" -#: templates/settings.html:29 +#: templates/boards/settings.html:29 msgid "Save" msgstr "Сохранить" -#: templates/tags.html:7 +#: templates/boards/tags.html:7 msgid "tags" msgstr "тегов" -#: templates/thread.html:39 +#: templates/boards/thread.html:39 msgid "Get!" msgstr "Гет!" -#: templates/thread.html:68 +#: templates/boards/thread.html:68 msgid "Reply to thread" msgstr "Ответить в тему" -#: templates/thread.html:93 -msgid "Basic markdown syntax." -msgstr "Базовый синтаксис markdown." - -#: templates/thread.html:94 +#: templates/boards/thread.html:94 msgid "Example: " msgstr "Пример: " -#: templates/thread.html:94 +#: templates/boards/thread.html:94 msgid "italic" msgstr "курсив" -#: templates/thread.html:95 +#: templates/boards/thread.html:95 msgid "bold" msgstr "полужирный" -#: templates/thread.html:96 +#: templates/boards/thread.html:96 msgid "Quotes can be inserted with" msgstr "Цитаты могут быть вставлены при помощи" -#: templates/thread.html:97 +#: templates/boards/thread.html:97 msgid "Links to answers can be inserted with" msgstr "Ссылки на ответы могут быть вставлены с помощью" -#: templates/thread.html:109 +#: templates/boards/thread.html:109 msgid "Last update: " msgstr "Последнее обновление: " @@ -135,7 +139,3 @@ msgstr "Последнее обновление: " #~ msgid "gets" #~ msgstr "гетов" - -#~ msgid "Tags must be delimited by spaces. Text or image is required." -#~ msgstr "" -#~ "Теги должны быть разделены пробелами. Текст или изображение обязательны." diff --git a/boards/models.py b/boards/models.py --- a/boards/models.py +++ b/boards/models.py @@ -22,7 +22,7 @@ NO_PARENT = -1 NO_IP = '0.0.0.0' UNKNOWN_UA = '' ALL_PAGES = -1 -OPENING_POST_WEIGHT = 5 +OPENING_POST_POPULARITY_WEIGHT = 2 IMAGES_DIRECTORY = 'images/' FILE_EXTENSION_DELIMITER = '.' @@ -187,7 +187,7 @@ class Tag(models.Model): reply_count = 0 for post in posts_with_tag: reply_count += post.get_reply_count() - reply_count += OPENING_POST_WEIGHT + reply_count += OPENING_POST_POPULARITY_WEIGHT return reply_count diff --git a/boards/templates/boards/base.html b/boards/templates/boards/base.html --- a/boards/templates/boards/base.html +++ b/boards/templates/boards/base.html @@ -8,7 +8,7 @@ href="{{ STATIC_URL }}css/jquery.fancybox.css" media="all"/> - + {% block head %}{% endblock %} diff --git a/boards/templates/boards/posting_general.html b/boards/templates/boards/posting_general.html --- a/boards/templates/boards/posting_general.html +++ b/boards/templates/boards/posting_general.html @@ -134,11 +134,11 @@
-
Tags must be delimited by spaces. Text or image is required -
-
Use - markdown syntax for posting.
+
+ {% trans 'Tags must be delimited by spaces. Text or image is required.' %} +
+ @@ -148,7 +148,7 @@ Neboard - 2013-05 (dev) + pre1.0 {% trans "Pages:" %} {% for page in pages %} [