Small fixes to the archive. 'open' link in the archived threads list

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,383 +1,388 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-06 21:37+0200\n"
+"POT-Creation-Date: 2014-01-06 23:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 
 #: authors.py:5
 msgid "author"
 msgstr "автор"
 
 #: authors.py:6
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:7
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:8
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:72
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:74
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:75
 msgid "Image"
 msgstr "Изображение"
 
 #: forms.py:78
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:89
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:98
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:109
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
 #: forms.py:136
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
 #: forms.py:149
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
 #: forms.py:163 templates/boards/tags.html:6 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
 #: forms.py:171
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
 #: forms.py:199 forms.py:220
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
 #: forms.py:226
 msgid "Theme"
 msgstr "Тема"
 
 #: forms.py:231
 msgid "Enable moderation panel"
 msgstr "Включить панель модерации"
 
 #: forms.py:246
 msgid "No such user found"
 msgstr "Данный пользователь не найден"
 
 #: forms.py:260
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/archive.html:45 templates/boards/posting_general.html:64
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/archive.html:77 templates/boards/post.html:37
+#: templates/boards/archive.html:75
+msgid "Open"
+msgstr "Открыть"
+
+#: templates/boards/archive.html:81 templates/boards/post.html:37
 #: templates/boards/posting_general.html:103 templates/boards/thread.html:69
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/boards/archive.html:81 templates/boards/post.html:40
+#: templates/boards/archive.html:85 templates/boards/post.html:40
 #: templates/boards/posting_general.html:107 templates/boards/thread.html:72
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
-#: templates/boards/archive.html:90 templates/boards/post.html:53
+#: templates/boards/archive.html:94 templates/boards/post.html:53
 #: templates/boards/posting_general.html:116
 #: templates/boards/posting_general.html:180 templates/boards/thread.html:81
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/archive.html:99 templates/boards/posting_general.html:125
+#: templates/boards/archive.html:103 templates/boards/posting_general.html:125
 #: templates/boards/thread.html:138 templates/boards/thread_gallery.html:58
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/archive.html:124 templates/boards/posting_general.html:203
+#: templates/boards/archive.html:104 templates/boards/thread.html:137
+#: templates/boards/thread_gallery.html:57
+msgid "replies"
+msgstr "ответов"
+
+#: templates/boards/archive.html:129 templates/boards/posting_general.html:203
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/archive.html:129 templates/boards/posting_general.html:208
+#: templates/boards/archive.html:134 templates/boards/posting_general.html:208
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/archive.html:138 templates/boards/posting_general.html:235
+#: templates/boards/archive.html:143 templates/boards/posting_general.html:235
 msgid "Pages:"
 msgstr "Страницы: "
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:25
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:27
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:29
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:14
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:31
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:36
 msgid "Tag management"
 msgstr "Управление тегами"
 
 #: templates/boards/base.html:38
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:50 templates/boards/login.html:6
 #: templates/boards/login.html.py:21
 msgid "Login"
 msgstr "Вход"
 
 #: templates/boards/base.html:51
 msgid "Archive"
 msgstr "Архив"
 
 #: templates/boards/base.html:53
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:55
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/login.html:15
 msgid "User ID"
 msgstr "ID пользователя"
 
 #: templates/boards/login.html:24
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
 #: templates/boards/posting_general.html:97
 msgid "Reply"
 msgstr "Ответ"
 
 #: templates/boards/posting_general.html:142
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
 #: templates/boards/posting_general.html:214
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/posting_general.html:218 templates/boards/thread.html:115
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/posting_general.html:222
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/posting_general.html:225 templates/boards/thread.html:119
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/settings.html:14
 msgid "User:"
 msgstr "Пользователь:"
 
 #: templates/boards/settings.html:16
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:19
 msgid "Posts:"
 msgstr "Сообщений:"
 
 #: templates/boards/settings.html:20
 msgid "First access:"
 msgstr "Первый доступ:"
 
 #: templates/boards/settings.html:22
 msgid "Last access:"
 msgstr "Последний доступ: "
 
 #: templates/boards/settings.html:31
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/tags.html:24
 msgid "threads"
 msgstr "тем"
 
 #: templates/boards/tags.html:37
 msgid "No tags found."
 msgstr "Теги не найдены."
 
 #: templates/boards/thread.html:19 templates/boards/thread_gallery.html:20
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
 #: templates/boards/thread.html:20 templates/boards/thread_gallery.html:21
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
 #: templates/boards/thread.html:28
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread.html:109
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:137 templates/boards/thread_gallery.html:57
-msgid "replies"
-msgstr "ответов"
-
 #: templates/boards/thread.html:139 templates/boards/thread_gallery.html:59
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: 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 "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:18
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
 #~ msgid "Formatting"
 #~ msgstr "Форматирование"
 
 #~ msgid "quote"
 #~ msgstr "цитата"
 
 #~ msgid "italic"
 #~ msgstr "курсив"
 
 #~ msgid "bold"
 #~ msgstr "полужирный"
 
 #~ msgid "spoiler"
 #~ msgstr "спойлер"
 
 #~ msgid "comment"
 #~ msgstr "комментарий"
 
 #~ msgid "Tag: "
 #~ msgstr "Тег: "
 
 #~ msgid "Remove"
 #~ msgstr "Удалить"
 
 #~ msgid "Add"
 #~ msgstr "Добавить"
 
 #~ msgid "Basic markdown syntax."
 #~ msgstr "Базовый синтаксис markdown."
 
 #~ msgid "Example: "
 #~ msgstr "Пример: "
 
 #~ msgid "tags"
 #~ msgstr "тегов"
 
 #~ msgid "Get!"
 #~ msgstr "Гет!"
 
 #~ msgid "View"
 #~ msgstr "Просмотр"
 
 #~ msgid "gets"
 #~ msgstr "гетов"

boards/templates/boards/archive.html

@@ -1,153 +1,145 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load board %}
 {% load static %}
 
 {% block head %}
     <title>Neboard</title>
 
     {% if prev_page %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=prev_page %}
             {% else %}
                 {% url "index" page=prev_page %}
             {% endif %}
         " />
     {% endif %}
     {% if next_page %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=next_page %}
             {% else %}
                 {% url "index" page=next_page %}
             {% endif %}
         " />
     {% endif %}
 
 {% endblock %}
 
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
     {% if threads %}
         {% if prev_page %}
             <div class="page_link">
-                <a href="
-            {% if tag %}
-                {% url "tag" tag_name=tag page=prev_page %}
-            {% else %}
-                {% url "index" page=prev_page %}
-            {% endif %}
-                ">{% trans "Previous page" %}</a>
+                <a href="{% url "archive" page=prev_page %}">{% trans "Previous page" %}</a>
             </div>
         {% endif %}
 
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
             <div class="post archive_post" id="{{ thread.op.id }}">
             {% if thread.op.image %}
                 <div class="image">
                     <a class="thumb"
                        href="{{ thread.op.image.url }}"><img
                             src="{{ thread.op.image.url_200x150 }}"
                             alt="{{ thread.op.id }}"
                             width="{{ thread.op.image_pre_width }}"
                             height="{{ thread.op.image_pre_height }}"
                             data-width="{{ thread.op.image_width }}"
                             data-height="{{ thread.op.image_height }}"/>
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ thread.op.title }}</span>
                     <a class="post_id" href="{% url 'thread' thread.op.id %}"
                     > ({{ thread.op.id }})</a>
                     [{{ thread.op.pub_time }}] — [{{ thread.thread.bump_time }}]
 
+                    [<a class="link" href="
+                    {% url 'thread' thread.op.id %}">{% trans "Open" %}</a>]
+
                     {% if moderator %}
                         <span class="moderator_info">
                             [<a href="
                             {% url 'delete' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Delete' %}</a>]
                             ({{ thread.op.poster_ip }})
                             [<a href="
                             {% url 'ban' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Ban IP' %}</a>]
                         </span>
                     {% endif %}
                 </div>
                 {% autoescape off %}
                     {{ thread.op.text.rendered|truncatewords_html:50 }}
                 {% endautoescape %}
 		{% if thread.op.is_referenced %}
 		    <div class="refmap">
 			{% trans "Replies" %}:
 			{% for ref_post in thread.op.get_sorted_referenced_posts %}
 			<a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                     >{% if not forloop.last %},{% endif %}
 			{% endfor %}
 		    </div>
 		{% endif %}
             </div>
             <div class="metadata">
-                {{ thread.thread.get_images_count }} {% trans 'images' %}.
+                {{ thread.thread.get_images_count }} {% trans 'images' %},
+                {{ thread.thread.get_reply_count }} {% trans 'replies' %}.
                 {% if thread.thread.tags %}
                     <span class="tags">
                         {% for tag in thread.thread.get_tags %}
                             <a class="tag" href="
                                     {% url 'tag' tag_name=tag.name %}">
                                 #{{ tag.name }}</a
                                     >{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </span>
                 {% endif %}
             </div>
             </div>
         </div>
         {% endcache %}
         {% endfor %}
 
         {% if next_page %}
             <div class="page_link">
-                <a href="
-            {% if tag %}
-                {% url "tag" tag_name=tag page=next_page %}
-            {% else %}
-                {% url "index" page=next_page %}
-            {% endif %}
-                ">{% trans "Next page" %}</a>
+                <a href="{% url "archive" page=next_page %}">{% trans "Next page" %}</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         <b><a href="{% url "authors" %}">Neboard</a> 1.5 Aker</b>
         {% trans "Pages:" %}[
         {% for page in pages %}
             <a
                 {% ifequal page current_page %}
                     class="current_page"
                 {% endifequal %}
                 href="
                 {% url "archive" page=page %}
             ">{{ page }}</a>
             {% if not forloop.last %},{% endif %}
         {% endfor %}
         ]
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}