diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo index ef9fbb2c1feece5d76d10ef2263833278e48bb41..fb981ac43eb97bff9a7c7ccd86e5dcfb84077a7b GIT binary patch literal 3620 zc$|GzU2Ggz6}~`i;@x#hOA9S+=yhpB(=gjzn@VM4hi>Y1YFPhZuPc=&#@?ItG`lm) z%xs9IJorZm0h=1}7bq(E0rd@a>)OdWo7mz7q`q|Kg`by7AS6@?UO+;Xc;P$uT>q3r zOuX~WJ@=e@zVn?kllShw=f?t9AAXPGxBd|!P6CS`6Z)FHM~Fi}2S}!G1CzjI;KzZN zfSth0z%Jk$#@+y{vG%*@So<~6pY=#hkyrxhdbEsS+hO{ z{5{KQQZOJDGp3ll_K(50Q>$t$-f|p6=xHU1L83yr1|3bHLS3qnGiE4gSgC zpMf{fqxXRYtgnLfCrHl&T-OJ{6!1V7=YJ6R7%&a|6mS&yIPvM?x-NFHo|n2*D@PY#sp~2R=b_kzl>Pm*D-M04Zz#$6CzG6a zI?3}_OLG42COPh^!FA*RJG1^hum|{ll6fRkj1K@W01u`3++U@*{x{A3yD6UaKc@Jc zR5$xQ27CngbT`lAP&e!M4d5%lxo+n5*KUscPdD>9c#!*b2#B`mS)jf?!mp3$6?@mi z`<_27_Q9N;@d8XbxAh;)_Yew*U_oU$b`>)Rl=0bBtT)$xKhw;k_uIq@gQP29! z^HYMg{*2(BrHuU`(XSxxpvTV3zN=r)tr#L@~Gr`X*})B%M~Wtg24UA;qTW zWKg$fRFIY>$RN=sO-ed}^wl>Tj;~NEZRwi~OrBXJz#U$7@-BNSkS+?%YBb)r!Ttdf_LiSe5d{UmVMg3?Kda*k~a^!)29x+YPEjJtv2zibXk^A1TQG!bpC&_omBlA-%n zX|4_zn(k-nRoiio$(dQ(4^%iXRT{FM+w&u0r<89M+!?QovC7HkrkyY`UTyex)f)2r zT9A`&T`z-yzGIRf2cB}D%w`4#vhwg@NspPHfoxWOS!QHTua6J(?rilBe32e?M5aHR zk>}2F2z)X}5R*kr?~!8(d^e))Xd|AFHlnp?D_W15GG2%mVc3dpMlCGxaD(jetMQ_Y zZezI?FGrg)YDRBirx{;Ji|9u%zXi)$)I#uzh<<>;4H+-u+*|Roh`x`g#b_&@r^O{5 z+vXHH)fz0fMRXaD?RY7=uFbb~9(~45A|;~Nuzw5xHn6vd)bmj*+7!{%U5?1T!*MBo zbtnIlh<-`iNNMO@f$u`JO}S0E$RDpliAAheNfd}7qMz@i646hQ0!3=q>tsgm4P7Yh zBjE~VBf&_>O}vMEN;_WBk!wT`acw#t62=!P{59~LM@$R*ch-BE=z;YH*x$x|Lu#FM zf!eG|;G+{=MZhvlH_<>?o7_0!`N1-7I>}(POUpfV zqfK3*85pf_kM{o15z!X0F_J>>3-K}$`~_mSwQ+Yw?yBe=#N$;Fy+I*bzvdmSq=VOp z@xDjigUtIT;0hkLbtx^L#NFA6&+n4eC%#U@VcvmF8d37v){8ckPRkaL1vLs`3&d)t zy7pcvi(2O*ZzeMHBn!P^mh8DHWy^%bzm;f^AW6_^$JM$uu zv`xpg?kcP{t?E~n=WxaJ``X^X-BH-SaU|`@^%gz+nlz+oUHEXTd8A-nqWFBK=>7r0ev3 zLoFn2)RrW{-M&A1*4H4>bv+`)9$i?_Cy>^\n" "Language-Team: LANGUAGE \n" @@ -42,14 +42,6 @@ msgstr "лицензией" msgid "Repository" msgstr "Репозиторий" -#: templates/boards/banned.html:6 -msgid "Banned" -msgstr "Заблокирован" - -#: templates/boards/banned.html:11 -msgid "Your IP address has been banned. Contact the administrator" -msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором" - #: templates/boards/base.html:12 msgid "Feed" msgstr "Лента" @@ -58,16 +50,20 @@ msgstr "Лента" msgid "All threads" msgstr "Все темы" -#: templates/boards/base.html:35 +#: templates/boards/base.html:34 +msgid "Tag management" +msgstr "Управление тегами" + +#: templates/boards/base.html:36 msgid "Settings" msgstr "Настройки" -#: templates/boards/base.html:42 templates/boards/login.html:6 +#: templates/boards/base.html:43 templates/boards/login.html:6 #: templates/boards/login.html.py:21 msgid "Login" msgstr "Вход" -#: templates/boards/base.html:43 +#: templates/boards/base.html:44 msgid "Up" msgstr "Вверх" @@ -97,11 +93,11 @@ msgstr "Ответ" msgid "Delete" msgstr "Удалить" -#: templates/boards/posting_general.html:63 templates/boards/thread.html:113 +#: templates/boards/posting_general.html:63 templates/boards/thread.html:107 msgid "replies" msgstr "ответов" -#: templates/boards/posting_general.html:64 templates/boards/thread.html:114 +#: templates/boards/posting_general.html:64 templates/boards/thread.html:108 msgid "images" msgstr "изображений" @@ -141,8 +137,8 @@ msgstr "" "Теги должны быть разделены пробелами. Текст или изображение обязательны." #: templates/boards/posting_general.html:154 templates/boards/thread.html:98 -msgid "Basic markdown syntax." -msgstr "Базовый синтаксис markdown." +msgid "Text syntax" +msgstr "Синтаксис текста" #: templates/boards/posting_general.html:164 msgid "Pages:" @@ -184,30 +180,63 @@ msgstr "Теги не найдены." msgid "Reply to thread" msgstr "Ответить в тему" -#: templates/boards/thread.html:99 -msgid "Example: " -msgstr "Пример: " - -#: templates/boards/thread.html:99 -msgid "italic" -msgstr "курсив" - -#: templates/boards/thread.html:100 -msgid "bold" -msgstr "полужирный" - -#: templates/boards/thread.html:101 -msgid "Quotes can be inserted with" -msgstr "Цитаты могут быть вставлены при помощи" - -#: templates/boards/thread.html:102 -msgid "Links to answers can be inserted with" -msgstr "Ссылки на ответы могут быть вставлены с помощью" - -#: templates/boards/thread.html:115 +#: templates/boards/thread.html:109 msgid "Last update: " msgstr "Последнее обновление: " +#: templates/boards/staticpages/banned.html:6 +#: templates/boards/staticpages/help.html:6 +msgid "Banned" +msgstr "Заблокирован" + +#: templates/boards/staticpages/banned.html:10 +msgid "Your IP address has been banned. Contact the administrator" +msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором" + +#: templates/boards/staticpages/help.html:10 +msgid "Syntax" +msgstr "Синтаксис" + +#: templates/boards/staticpages/help.html:11 +msgid "2 line breaks for a new line." +msgstr "2 перевода строки создают новый абзац." + +#: templates/boards/staticpages/help.html:12 +msgid "Italic text" +msgstr "Курсивный текст" + +#: templates/boards/staticpages/help.html:13 +msgid "Bold text" +msgstr "Полужирный текст" + +#: templates/boards/staticpages/help.html:14 +msgid "Spoiler" +msgstr "Спойлер" + +#: templates/boards/staticpages/help.html:15 +msgid "Comment" +msgstr "Комментарий" + +#: templates/boards/staticpages/help.html:16 +msgid "Quote" +msgstr "Цитата" + +#: templates/boards/staticpages/help.html:17 +msgid "Link to a post" +msgstr "Ссылка на сообщение" + +#~ msgid "Basic markdown syntax." +#~ msgstr "Базовый синтаксис markdown." + +#~ msgid "Example: " +#~ msgstr "Пример: " + +#~ msgid "italic" +#~ msgstr "курсив" + +#~ msgid "bold" +#~ msgstr "полужирный" + #~ msgid "tags" #~ msgstr "тегов" 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 @@ -150,8 +150,8 @@
{% trans 'Tags must be delimited by spaces. Text or image is required.' %}
- + diff --git a/boards/templates/boards/banned.html b/boards/templates/boards/static_base.html rename from boards/templates/boards/banned.html rename to boards/templates/boards/static_base.html --- a/boards/templates/boards/banned.html +++ b/boards/templates/boards/static_base.html @@ -2,12 +2,9 @@ {% load i18n %} -{% block head %} - {% trans "Banned" %} -{% endblock %} - {% block content %}
- {% trans 'Your IP address has been banned. Contact the administrator' %} + {% block staticcontent %} + {% endblock %}
{% endblock %} \ No newline at end of file diff --git a/boards/templates/boards/banned.html b/boards/templates/boards/staticpages/banned.html copy from boards/templates/boards/banned.html copy to boards/templates/boards/staticpages/banned.html --- a/boards/templates/boards/banned.html +++ b/boards/templates/boards/staticpages/banned.html @@ -1,4 +1,4 @@ -{% extends "boards/base.html" %} +{% extends "boards/static_base.html" %} {% load i18n %} @@ -6,8 +6,6 @@ {% trans "Banned" %} {% endblock %} -{% block content %} -
- {% trans 'Your IP address has been banned. Contact the administrator' %} -
+{% block staticcontent %} + {% trans 'Your IP address has been banned. Contact the administrator' %} {% endblock %} \ No newline at end of file diff --git a/boards/templates/boards/banned.html b/boards/templates/boards/staticpages/help.html copy from boards/templates/boards/banned.html copy to boards/templates/boards/staticpages/help.html --- a/boards/templates/boards/banned.html +++ b/boards/templates/boards/staticpages/help.html @@ -1,13 +1,18 @@ -{% extends "boards/base.html" %} +{% extends "boards/static_base.html" %} {% load i18n %} {% block head %} - {% trans "Banned" %} + {% trans "Syntax" %} {% endblock %} -{% block content %} -
- {% trans 'Your IP address has been banned. Contact the administrator' %} -
+{% block staticcontent %} +

{% trans 'Syntax' %}

+

{% trans '2 line breaks for a new line.' %}

+

_{% trans 'Italic text' %}_

+

__{% trans 'Bold text' %}__

+

%%{% trans 'Spoiler' %}%%

+

//{% trans 'Comment' %}

+

> {% trans 'Quote' %}

+

>>123 -- {% trans 'Link to a post' %}

{% endblock %} \ No newline at end of file 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 @@ -24,7 +24,7 @@ class="fancy" href="{{ post.image.url }}">{% trans 'Post image' %} @@ -94,14 +94,8 @@
- -
{% trans 'Example: ' %}*{% trans 'italic' %}*, - **{% trans 'bold' %}**
-
{% trans 'Quotes can be inserted with' %} ">"
-
{% trans 'Links to answers can be inserted with' %} - ">>123" -
+ diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -38,6 +38,7 @@ urlpatterns = patterns('', url(r'^authors/$', views.authors, name='authors'), url(r'^delete/(?P\w+)/$', views.delete, name='delete'), url(r'^banned/$', views.you_are_banned, name='banned'), + url(r'^staticpage/(?P\w+)/$', views.static_page, name='staticpage'), # RSS feeds url(r'^rss/$', AllThreadsFeed()), diff --git a/boards/views.py b/boards/views.py --- a/boards/views.py +++ b/boards/views.py @@ -236,7 +236,7 @@ def delete(request, post_id): def you_are_banned(request): context = _init_default_context(request) - return render(request, 'boards/banned.html', context) + return render(request, 'boards/staticpages/banned.html', context) def page_404(request): @@ -264,6 +264,11 @@ def tag_unsubscribe(request, tag_name): return redirect(all_tags) +def static_page(request, name): + context = _init_default_context(request) + return render(request, 'boards/staticpages/' + name + '.html', context) + + def _get_theme(request, user=None): """Get user's CSS theme"""