diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo index 7f99ec6192b01f21ac1915631c69e75925f972bb..27519bd3dc9ef4da79d74dbe0f6cb1c1d3388b00 GIT binary patch literal 7402 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 l?sxHoP\n" "Language-Team: LANGUAGE \n" @@ -266,35 +266,38 @@ msgid "feed" msgstr "" #: templates/boards/feed.html:45 -#| msgid "No threads exist. Create the first one!" msgid "No posts exist. Create the first one!" msgstr "Нет сообщений. Создайте первое!" -#: templates/boards/post.html:24 +#: templates/boards/post.html:25 msgid "Open" msgstr "Открыть" -#: templates/boards/post.html:26 templates/boards/post.html.py:30 +#: templates/boards/post.html:27 templates/boards/post.html.py:38 msgid "Reply" msgstr "Ответить" -#: templates/boards/post.html:35 +#: templates/boards/post.html:33 +msgid " in " +msgstr " в " + +#: templates/boards/post.html:43 msgid "Edit" msgstr "Изменить" -#: templates/boards/post.html:37 +#: templates/boards/post.html:45 msgid "Edit thread" msgstr "Изменить тему" -#: templates/boards/post.html:69 +#: templates/boards/post.html:77 msgid "Replies" msgstr "Ответы" -#: templates/boards/post.html:81 templates/boards/thread.html:26 +#: templates/boards/post.html:89 templates/boards/thread.html:26 msgid "messages" msgstr "сообщений" -#: templates/boards/post.html:82 templates/boards/thread.html:27 +#: templates/boards/post.html:90 templates/boards/thread.html:27 msgid "images" msgstr "изображений" diff --git a/boards/models/post/__init__.py b/boards/models/post/__init__.py --- a/boards/models/post/__init__.py +++ b/boards/models/post/__init__.py @@ -49,6 +49,7 @@ PARAMETER_POST = 'post' PARAMETER_OP_ID = 'opening_post_id' PARAMETER_NEED_OPEN_LINK = 'need_open_link' PARAMETER_REPLY_LINK = 'reply_link' +PARAMETER_NEED_OP_DATA = 'need_op_data' REFMAP_STR = '>>{}' @@ -259,6 +260,7 @@ class Post(models.Model, Viewable): PARAMETER_TRUNCATED: truncated, PARAMETER_OP_ID: opening_post_id, PARAMETER_REPLY_LINK: reply_link, + PARAMETER_NEED_OP_DATA: kwargs.get(PARAMETER_NEED_OP_DATA) }) def get_search_view(self, *args, **kwargs): diff --git a/boards/templates/boards/feed.html b/boards/templates/boards/feed.html --- a/boards/templates/boards/feed.html +++ b/boards/templates/boards/feed.html @@ -32,7 +32,7 @@ {% endif %} {% for post in posts %} - {% post_view post moderator=moderator truncated=True %} + {% post_view post moderator=moderator truncated=True need_op_data=True %} {% endfor %} {% if next_page_link %} 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 @@ -18,11 +18,19 @@ — {% endif %} {% endif %} - {% if is_opening and need_open_link %} - {% if thread.archived %} - {% trans "Open" %} - {% else %} - {% trans "Reply" %} + {% if is_opening %} + {% if need_open_link %} + {% if thread.archived %} + {% trans "Open" %} + {% else %} + {% trans "Reply" %} + {% endif %} + {% endif %} + {% else %} + {% if need_op_data %} + {% with thread.get_opening_post as op %} + {% trans " in " %}>>{{ op.id }} + {% endwith %} {% endif %} {% endif %} {% if reply_link and not thread.archived %}