diff --git a/boards/forms.py b/boards/forms.py --- a/boards/forms.py +++ b/boards/forms.py @@ -33,7 +33,7 @@ ATTRIBUTE_ROWS = 'rows' LAST_POST_TIME = 'last_post_time' LAST_LOGIN_TIME = 'last_login_time' TEXT_PLACEHOLDER = _('Type message here. Use formatting panel for more advanced usage.') -TAGS_PLACEHOLDER = _('tag1 several_words_tag') +TAGS_PLACEHOLDER = _('music images i_dont_like_tags') LABEL_TITLE = _('Title') LABEL_TEXT = _('Text') diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo index e37b969700cf0977b990809d84beac1619b36d43..f5b2a64531591d0413a09539fafe05aa1deed0d6 GIT binary patch literal 7081 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 Z7j;tUZ1ZU1nvpNMX=HAS3xnTg>i?c*a<~8h 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: 2015-04-07 15:26+0300\n" +"POT-Creation-Date: 2015-04-14 13:07+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,8 +44,8 @@ msgstr "" "Вводите сообщение сюда. Используйте панель для более сложного форматирования." #: forms.py:36 -msgid "tag1 several_words_tag" -msgstr "метка1 метка_из_нескольких_слов" +msgid "music images i_dont_like_tags" +msgstr "музыка картинки теги_не_нужны" #: forms.py:38 msgid "Title" @@ -59,7 +59,7 @@ msgstr "Текст" msgid "Tag" msgstr "Метка" -#: forms.py:41 templates/boards/base.html:36 templates/search/search.html:7 +#: forms.py:41 templates/boards/base.html:40 templates/search/search.html:7 msgid "Search" msgstr "Поиск" @@ -76,7 +76,6 @@ msgid "e-mail" msgstr "" #: forms.py:152 -#| msgid "All threads" msgid "Additional threads" msgstr "Дополнительные темы" @@ -94,50 +93,50 @@ msgstr "Текст должен быть короче %s символов" msgid "Invalid URL" msgstr "Неверный URL" -#: forms.py:214 +#: forms.py:215 msgid "Invalid additional thread list" msgstr "Неверный список дополнительных тем" -#: forms.py:249 +#: forms.py:250 msgid "Either text or image must be entered." msgstr "Текст или картинка должны быть введены." -#: forms.py:265 +#: forms.py:266 #, python-format msgid "Wait %s seconds after last posting" msgstr "Подождите %s секунд после последнего постинга" -#: forms.py:277 +#: forms.py:278 #, python-format msgid "Image must be less than %s bytes" msgstr "Изображение должно быть менее %s байт" -#: forms.py:324 templates/boards/posting_general.html:148 +#: forms.py:325 templates/boards/posting_general.html:148 #: templates/boards/rss/post.html:10 templates/boards/tags.html:7 msgid "Tags" msgstr "Метки" -#: forms.py:331 +#: forms.py:332 msgid "Inappropriate characters in tags." msgstr "Недопустимые символы в метках." -#: forms.py:342 +#: forms.py:343 msgid "Need at least 1 required tag." msgstr "Нужна хотя бы 1 обязательная метка." -#: forms.py:354 +#: forms.py:355 msgid "Theme" msgstr "Тема" -#: forms.py:355 +#: forms.py:356 msgid "User name" msgstr "Имя пользователя" -#: forms.py:356 +#: forms.py:357 msgid "Time zone" msgstr "Часовой пояс" -#: forms.py:362 +#: forms.py:363 msgid "Inappropriate characters." msgstr "Недопустимые символы." @@ -173,29 +172,33 @@ msgstr "Лента" msgid "All threads" msgstr "Все темы" -#: templates/boards/base.html:34 +#: templates/boards/base.html:36 +msgid "Add tags" +msgstr "Добавить метки" + +#: templates/boards/base.html:38 msgid "Tag management" msgstr "Управление метками" -#: templates/boards/base.html:39 templates/boards/base.html.py:40 +#: templates/boards/base.html:43 templates/boards/base.html.py:44 #: templates/boards/notifications.html:8 msgid "Notifications" msgstr "Уведомления" -#: templates/boards/base.html:47 templates/boards/settings.html:9 +#: templates/boards/base.html:51 templates/boards/settings.html:9 msgid "Settings" msgstr "Настройки" -#: templates/boards/base.html:60 +#: templates/boards/base.html:64 msgid "Admin" msgstr "Администрирование" -#: templates/boards/base.html:62 +#: templates/boards/base.html:66 #, python-format msgid "Speed: %(ppd)s posts per day" msgstr "Скорость: %(ppd)s сообщений в день" -#: templates/boards/base.html:64 +#: templates/boards/base.html:68 msgid "Up" msgstr "Вверх" @@ -229,11 +232,11 @@ msgstr "Изменить тему" msgid "Replies" msgstr "Ответы" -#: templates/boards/post.html:86 templates/boards/thread.html:30 +#: templates/boards/post.html:86 templates/boards/thread.html:31 msgid "messages" msgstr "сообщений" -#: templates/boards/post.html:87 templates/boards/thread.html:31 +#: templates/boards/post.html:87 templates/boards/thread.html:32 msgid "images" msgstr "изображений" @@ -356,7 +359,7 @@ msgstr "Метки не найдены." msgid "All tags" msgstr "Все метки" -#: templates/boards/thread.html:32 +#: templates/boards/thread.html:33 msgid "Last update: " msgstr "Последнее обновление: " @@ -392,5 +395,7 @@ msgstr "Обновить" #: templates/search/search.html:17 msgid "Ok" -msgstr "" +msgstr "Ок" +#~ msgid "tag1 several_words_tag" +#~ msgstr "метка1 метка_из_нескольких_слов" 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 @@ -28,9 +28,13 @@
{% trans "All threads" %} - {% autoescape off %} - {{ tags_str }}, - {% endautoescape %} + {% if tags_str %} + {% autoescape off %} + {{ tags_str }}, + {% endautoescape %} + {% else %} + {% trans 'Add tags' %} → + {% endif %} [...], [S]. 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 @@ -4,92 +4,85 @@ {% get_current_language as LANGUAGE_CODE %} -{% if thread.archived %} -
-{% elif bumpable %} -
-{% else %} -
-{% endif %} - -
- ({{ post.get_absolute_id }}) - {{ post.title }} - - {% comment %} - Thread death time needs to be shown only if the thread is alredy archived - and this is an opening post (thread death time) or a post for popup - (we don't see OP here so we show the death time in the post itself). - {% endcomment %} - {% if thread.archived %} - {% if is_opening %} - — +
+
+ ({{ post.get_absolute_id }}) + {{ post.title }} + + {% comment %} + Thread death time needs to be shown only if the thread is alredy archived + and this is an opening post (thread death time) or a post for popup + (we don't see OP here so we show the death time in the post itself). + {% endcomment %} + {% if thread.archived %} + {% if is_opening %} + — + {% endif %} {% endif %} - {% endif %} - {% if is_opening and need_open_link %} - {% if thread.archived %} - {% trans "Open" %} - {% else %} - {% trans "Reply" %} + {% if is_opening and need_open_link %} + {% if thread.archived %} + {% trans "Open" %} + {% else %} + {% trans "Reply" %} + {% endif %} {% endif %} - {% endif %} - {% if reply_link and not thread.archived %} - {% trans 'Reply' %} - {% endif %} + {% if reply_link and not thread.archived %} + {% trans 'Reply' %} + {% endif %} - {% if moderator %} - - {% trans 'Edit' %} - {% if is_opening %} - | {% trans 'Edit thread' %} - {% endif %} - + {% if moderator %} + + {% trans 'Edit' %} + {% if is_opening %} + | {% trans 'Edit thread' %} + {% endif %} + + {% endif %} +
+ {% comment %} + Post images. Currently only 1 image can be posted and shown, but post model + supports multiple. + {% endcomment %} + {% if post.images.exists %} + {% with post.images.all.0 as image %} + {% autoescape off %} + {{ image.get_view }} + {% endautoescape %} + {% endwith %} {% endif %} -
-{% comment %} - Post images. Currently only 1 image can be posted and shown, but post model - supports multiple. -{% endcomment %} -{% if post.images.exists %} - {% with post.images.all.0 as image %} + {% comment %} + Post message (text) + {% endcomment %} +
{% autoescape off %} - {{ image.get_view }} + {% if truncated %} + {{ post.get_text|truncatewords_html:50 }} + {% else %} + {{ post.get_text }} + {% endif %} {% endautoescape %} - {% endwith %} -{% endif %} -{% comment %} - Post message (text) -{% endcomment %} -
- {% autoescape off %} - {% if truncated %} - {{ post.get_text|truncatewords_html:50 }} - {% else %} - {{ post.get_text }} + {% if post.is_referenced %} +
+ {% autoescape off %} + {% trans "Replies" %}: {{ post.refmap }} + {% endautoescape %} +
{% endif %} - {% endautoescape %} - {% if post.is_referenced %} -
- {% autoescape off %} - {% trans "Replies" %}: {{ post.refmap }} - {% endautoescape %} +
+ {% comment %} + Thread metadata: counters, tags etc + {% endcomment %} + {% if is_opening %} +
+ {% if is_opening and need_open_link %} + {{ thread.get_reply_count }} {% trans 'messages' %}, + {{ thread.get_images_count }} {% trans 'images' %}. + {% endif %} + + {% autoescape off %} + {{ thread.get_tag_url_list }} + {% endautoescape %} +
{% endif %}
-{% comment %} - Thread metadata: counters, tags etc -{% endcomment %} -{% if is_opening %} -
- {% if is_opening and need_open_link %} - {{ thread.get_reply_count }} {% trans 'messages' %}, - {{ thread.get_images_count }} {% trans 'images' %}. - {% endif %} - - {% autoescape off %} - {{ thread.get_tag_url_list }} - {% endautoescape %} - -
-{% endif %} -
diff --git a/boards/templatetags/board.py b/boards/templatetags/board.py --- a/boards/templatetags/board.py +++ b/boards/templatetags/board.py @@ -43,7 +43,6 @@ def image_actions(*args, **kwargs): action['link'] % image_link, action['name'])for action in actions]) -# TODO Use get_view of a post instead of this @register.inclusion_tag('boards/post.html', name='post_view') def post_view(post, moderator=False, need_open_link=False, truncated=False, reply_link=False, **kwargs): @@ -53,87 +52,27 @@ def post_view(post, moderator=False, nee thread = post.get_thread() is_opening = post.is_opening() - can_bump = thread.can_bump() if is_opening: opening_post_id = post.id else: opening_post_id = thread.get_opening_post_id() + css_class = 'post' + if thread.archived: + css_class += ' archive_post' + elif not thread.can_bump(): + css_class += ' dead_post' + return { 'post': post, 'moderator': moderator, 'is_opening': is_opening, 'thread': thread, - 'bumpable': can_bump, + 'css_class': css_class, 'need_open_link': need_open_link, 'truncated': truncated, 'opening_post_id': opening_post_id, 'reply_link': reply_link, } - -# TODO Fix or remove this method -@register.filter(is_safe=True) -def truncate_lines(text, length): - if length <= 0: - return '' - - html4_singlets = ( - 'br', 'col', 'link', 'base', 'img', - 'param', 'area', 'hr', 'input' - ) - - # Count non-HTML chars/words and keep note of open tags - pos = 0 - end_text_pos = 0 - current_len = 0 - open_tags = [] - - while current_len <= length: - m = REGEX_LINES.search(text, pos) - if not m: - # Checked through whole string - break - pos = m.end(0) - if m.group(1): - # It's an actual non-HTML word or char - current_len += 1 - if current_len == length: - end_text_pos = m.start(0) - continue - # Check for tag - tag = REGEX_TAG.match(m.group(0)) - if not tag or current_len >= length: - # Don't worry about non tags or tags after our truncate point - continue - closing_tag, tagname, self_closing = tag.groups() - # Element names are always case-insensitive - tagname = tagname.lower() - if self_closing or tagname in html4_singlets: - pass - elif closing_tag: - # Check for match in open tags list - try: - i = open_tags.index(tagname) - except ValueError: - pass - else: - # SGML: An end tag closes, back to the matching start tag, - # all unclosed intervening start tags with omitted end tags - open_tags = open_tags[i + 1:] - else: - # Add it to the start of the open tags list - open_tags.insert(0, tagname) - - if current_len <= length: - return text - out = text[:end_text_pos] - - if not out.endswith(ELLIPSIZER): - out += ELLIPSIZER - # Close any tags still open - for tag in open_tags: - out += '' % tag - # Return string - return out