# HG changeset patch # User neko259 <neko259@gmail.com> # Date 2014-01-13 08:54:27 # Node ID 0680713dda8576bff8be2b3a506344d7c5a05cd2 # Parent 44953ced217cbf1a4eda6a7a715ba7c655bc3e63 Fixed tags field placeholder. Fixed thread title diff --git a/boards/forms.py b/boards/forms.py --- a/boards/forms.py +++ b/boards/forms.py @@ -17,7 +17,7 @@ LAST_POST_TIME = 'last_post_time' LAST_LOGIN_TIME = 'last_login_time' TEXT_PLACEHOLDER = _('''Type message here. You can reply to message >>123 like this. 2 new lines are required to start new paragraph.''') -TAGS_PLACEHOLDER = _('#tag1 #several_words_tag') +TAGS_PLACEHOLDER = _('tag1 several_words_tag') class FormatPanel(forms.Textarea): diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo index 1e9c41ac16518ab0e57d43785e57e55c89257e11..e586eefda511b95f1abff50aa25606ed057d30f1 GIT binary patch literal 6532 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 S3F;y$vxuRShg3jm$A17RhrPD| 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: 2014-01-12 21:30+0200\n" +"POT-Creation-Date: 2014-01-13 10:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -34,7 +34,7 @@ msgstr "разработчик javascript" msgid "designer" msgstr "дизайнер" -#: forms.py:16 +#: forms.py:18 msgid "" "Type message here. You can reply to message >>123 like\n" " this. 2 new lines are required to start new paragraph." @@ -42,75 +42,75 @@ msgstr "" "Введите сообщение здесь. Вы можете ответить на сообщение >>123 вот так. 2 " "переноса строки обязательны для создания нового абзаца." -#: forms.py:18 -msgid "#tag1 #several_words_tag" -msgstr "#тег1 #тег_из_нескольких_слов" +#: forms.py:20 +msgid "tag1 several_words_tag" +msgstr "тег1 тег_из_нескольких_слов" -#: forms.py:75 +#: forms.py:77 msgid "Title" msgstr "Заголовок" -#: forms.py:78 +#: forms.py:80 msgid "Text" msgstr "Текст" -#: forms.py:79 +#: forms.py:81 msgid "Image" msgstr "Изображение" -#: forms.py:82 +#: forms.py:84 msgid "e-mail" msgstr "" -#: forms.py:93 +#: forms.py:95 #, python-format msgid "Title must have less than %s characters" msgstr "Заголовок должен иметь меньше %s символов" -#: forms.py:102 +#: forms.py:104 #, python-format msgid "Text must have less than %s characters" msgstr "Текст должен быть короче %s символов" -#: forms.py:113 +#: forms.py:115 #, python-format msgid "Image must be less than %s bytes" msgstr "Изображение должно быть менее %s байт" -#: forms.py:140 +#: forms.py:142 msgid "Either text or image must be entered." msgstr "Текст или картинка должны быть введены." -#: forms.py:153 +#: forms.py:155 #, python-format msgid "Wait %s seconds after last posting" msgstr "Подождите %s секунд после последнего постинга" -#: forms.py:169 templates/boards/tags.html:6 templates/boards/rss/post.html:10 +#: forms.py:171 templates/boards/tags.html:6 templates/boards/rss/post.html:10 msgid "Tags" msgstr "Теги" -#: forms.py:177 +#: forms.py:179 msgid "Inappropriate characters in tags." msgstr "Недопустимые символы в тегах." -#: forms.py:205 forms.py:226 +#: forms.py:207 forms.py:228 msgid "Captcha validation failed" msgstr "Проверка капчи провалена" -#: forms.py:232 +#: forms.py:234 msgid "Theme" msgstr "Тема" -#: forms.py:237 +#: forms.py:239 msgid "Enable moderation panel" msgstr "Включить панель модерации" -#: forms.py:252 +#: forms.py:254 msgid "No such user found" msgstr "Данный пользователь не найден" -#: forms.py:266 +#: forms.py:268 #, python-format msgid "Wait %s minutes after last login" msgstr "Подождите %s минут после последнего входа" diff --git a/boards/models/post.py b/boards/models/post.py --- a/boards/models/post.py +++ b/boards/models/post.py @@ -252,7 +252,7 @@ class Post(models.Model): def get_title(self): title = self.title if len(title) == 0: - title = self.text.rendered[:MAX_TITLE_LENGTH] + title = self.text.rendered return title 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 @@ -6,7 +6,7 @@ {% load board %} {% block head %} - <title>Neboard - {{ thread.get_opening_post.get_title|striptags }}</title> + <title>Neboard - {{ thread.get_opening_post.get_title|striptags|truncatewords:10 }}</title> {% endblock %} {% block content %} diff --git a/boards/templates/boards/thread_gallery.html b/boards/templates/boards/thread_gallery.html --- a/boards/templates/boards/thread_gallery.html +++ b/boards/templates/boards/thread_gallery.html @@ -6,7 +6,7 @@ {% load board %} {% block head %} - <title>Neboard - {{ thread.get_opening_post.get_title|striptags }}</title> + <title>Neboard - {{ thread.get_opening_post.get_title|striptags|truncatewords:10 }}</title> {% endblock %} {% block content %}