diff --git a/boards/forms.py b/boards/forms.py --- a/boards/forms.py +++ b/boards/forms.py @@ -67,7 +67,6 @@ class PostForm(forms.Form): self._errors['image'] = self.error_class([error_message]) - class ThreadForm(PostForm): regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE) tags = forms.CharField(max_length=100) diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo index 681c3a0d87a8fd2505fc9b2f0cd2782467799575..5a4428249dfa5b008dea0907cb684098535b55b6 GIT binary patch literal 3121 zc$|$?TWnNC7#^jCc8em2S40K{1j$)fF=fwK|!PO0Zr+JE-ft&J}5CUbBu`(Mq`Zc#wQb>{Qj9KEeR%Wa^{=)=f8aa zW%k!qHSaO}w%~gNpK}LeJAs$(Wa{_+62=;U9{`sDKLaiWehIuEI00M<{LaXK0p17v z16U9I2Ur8F!BPvX2i^r-0o({&3w#2&r$*}^s?mNbHQMeNmIQDJxCS_4{Coji0sP9` z&l&w2Sn7b^8@->5{1+^Zz~9YzU9G;~faO8pljgh!3#Hy-&Uq}WfSte$P}FMs3$>c( zX9h3T>iUcuoH2S|1E)~aZ)-K*L0m2eo?WKno(FCPUI9Kv{D5}@YwL7fR@dosW1Y_P zGxwO;d18*HxE`UimfsGjxO-;H|R_aE!E-@lB0T|(oU zgsx}O;B&x}z}*RL|BaFV0Nf7z+1RaU(D#o49|BqpI^TW3H-N7LSJT`y=(xW%=(_yf zpzUjx>%1RWuKjER-l0cQ+0kz;(>Mga`Yks| z@$Xt>M|~qM_2x`{x!>&RZQR3j?^YVwCVY?LTTlF%&Yx^2q15 z7akEo$a`&%_XzHKp$N#^5jW~*ZT>t_E{-Bpk{c$7!VkIuJo=tk550&V^g)1iAXJ!P z9ex<8g}W;FD-}Ny{}H59l#2s;B|;`aoc+*^{9u4}*@p$|5>e!OeIYB@ec+E(Z9`tF zAPSs1qUe@f^4c@N!?N8g!Xz(B8>sT*V`a-MVXLzEcyo!^#9Z?{s*pp)T2 zCDGc_np?;)olGUDcEUrzfihGgH0-Hz(RRI^ytm&DLJ>7}7xr2^7W9bNK@nIvuh(}l zEg8O}$Bhyl#Y$iot-XFw3Nzd*t7F)-eJ9u3rp?~QbgHQ-%{Oi0v`wvVN~ie?JjFBW zysK&3{8eMq)3j91{;ZP}S%^4)kyPV)G;oRrt%VJ6SYF&yUN zK{}k1qw=zxk#lldR^vh77$mbyz5|$|V>~Rca=561hzOunz!T~?M?NDRG67?4B6nMAxUhnhjhm>h%R|uB)`GdeFe^s+yAc#LdK14(DkMRJL;{z%&K<1jgf( zvfA8~5Sa;R%^+7raGtz!IHihr3wi1~iAKS{iawB+X$r={W`^8VZ(BemI)kfGmC#H) zLOzph!GYdhqapl~@>9>_)|OFAsTZg-`k<\n" "Language-Team: LANGUAGE \n" @@ -54,15 +54,15 @@ msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором" msgid "Feed" msgstr "Лента" -#: templates/boards/base.html:36 +#: templates/boards/base.html:29 msgid "All threads" msgstr "Все темы" -#: templates/boards/base.html:42 +#: templates/boards/base.html:35 msgid "Settings" msgstr "Настройки" -#: templates/boards/base.html:50 +#: templates/boards/base.html:43 msgid "Up" msgstr "Вверх" @@ -71,7 +71,7 @@ msgid "Tag: " msgstr "Тег: " #: templates/boards/posting_general.html:35 -#: templates/boards/posting_general.html:81 templates/boards/thread.html:27 +#: templates/boards/posting_general.html:89 templates/boards/thread.html:27 #: templates/boards/rss/post.html:5 msgid "Post image" msgstr "Изображение сообщения" @@ -80,54 +80,58 @@ msgstr "Изображение сообщения" msgid "Reply" msgstr "Ответ" -#: templates/boards/posting_general.html:52 templates/boards/thread.html:49 +#: templates/boards/posting_general.html:54 templates/boards/thread.html:46 msgid "Delete" msgstr "Удалить" -#: templates/boards/posting_general.html:55 templates/boards/thread.html:108 +#: templates/boards/posting_general.html:63 templates/boards/thread.html:113 msgid "replies" msgstr "ответов" -#: templates/boards/posting_general.html:56 templates/boards/thread.html:109 +#: templates/boards/posting_general.html:64 templates/boards/thread.html:114 msgid "images" msgstr "изображений" -#: templates/boards/posting_general.html:58 -#: templates/boards/posting_general.html:131 templates/boards/thread.html:48 +#: templates/boards/posting_general.html:66 +#: templates/boards/posting_general.html:139 templates/boards/thread.html:56 #: templates/boards/rss/post.html:10 msgid "Tags" msgstr "Теги" -#: templates/boards/posting_general.html:113 +#: templates/boards/posting_general.html:115 +msgid "No threads exist. Create the first one!" +msgstr "Нет тем. Создайте первую!" + +#: templates/boards/posting_general.html:121 msgid "Create new thread" msgstr "Создать новую тему" -#: templates/boards/posting_general.html:116 templates/boards/thread.html:70 +#: templates/boards/posting_general.html:124 templates/boards/thread.html:75 msgid "Title" msgstr "Заголовок" -#: templates/boards/posting_general.html:121 templates/boards/thread.html:75 +#: templates/boards/posting_general.html:129 templates/boards/thread.html:80 msgid "Text" msgstr "Текст" -#: templates/boards/posting_general.html:126 templates/boards/thread.html:80 +#: templates/boards/posting_general.html:134 templates/boards/thread.html:85 msgid "Image" msgstr "Изображение" -#: templates/boards/posting_general.html:141 templates/boards/thread.html:91 +#: templates/boards/posting_general.html:149 templates/boards/thread.html:96 msgid "Post" msgstr "Отправить" -#: templates/boards/posting_general.html:143 +#: templates/boards/posting_general.html:151 msgid "Tags must be delimited by spaces. Text or image is required." msgstr "" "Теги должны быть разделены пробелами. Текст или изображение обязательны." -#: templates/boards/posting_general.html:146 templates/boards/thread.html:93 +#: templates/boards/posting_general.html:154 templates/boards/thread.html:98 msgid "Basic markdown syntax." msgstr "Базовый синтаксис markdown." -#: templates/boards/posting_general.html:156 +#: templates/boards/posting_general.html:164 msgid "Pages:" msgstr "Страницы: " @@ -151,35 +155,31 @@ msgstr "Сохранить" msgid "tags" msgstr "тегов" -#: templates/boards/thread.html:39 -msgid "Get!" -msgstr "Гет!" - -#: templates/boards/thread.html:67 +#: templates/boards/thread.html:72 msgid "Reply to thread" msgstr "Ответить в тему" -#: templates/boards/thread.html:94 +#: templates/boards/thread.html:99 msgid "Example: " msgstr "Пример: " -#: templates/boards/thread.html:94 +#: templates/boards/thread.html:99 msgid "italic" msgstr "курсив" -#: templates/boards/thread.html:95 +#: templates/boards/thread.html:100 msgid "bold" msgstr "полужирный" -#: templates/boards/thread.html:96 +#: templates/boards/thread.html:101 msgid "Quotes can be inserted with" msgstr "Цитаты могут быть вставлены при помощи" -#: templates/boards/thread.html:97 +#: templates/boards/thread.html:102 msgid "Links to answers can be inserted with" msgstr "Ссылки на ответы могут быть вставлены с помощью" -#: templates/boards/thread.html:110 +#: templates/boards/thread.html:115 msgid "Last update: " msgstr "Последнее обновление: " diff --git a/boards/models.py b/boards/models.py --- a/boards/models.py +++ b/boards/models.py @@ -31,6 +31,7 @@ RANK_ADMIN = 0 RANK_MODERATOR = 10 RANK_USER = 100 + class PostManager(models.Manager): def create_post(self, title, text, image=None, parent_id=NO_PARENT, ip=NO_IP, tags=None, user=None): 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 @@ -111,8 +111,8 @@ {% endfor %} {% else %} - No threads found. -
+
+ {% trans 'No threads exist. Create the first one!' %}
{% endif %}
{% csrf_token %} 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 @@ -64,9 +64,6 @@ {% endfor %} - {% else %} - No thread found. -
{% endif %}