From 26ddfada059bd7a388b05c855bc67ea38075a03e Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Thu, 16 Dec 2021 19:51:04 +0200 Subject: [PATCH] Discussions: Change text of count of messages in the topics --- Web/Presenters/templates/Topics/Topic.xml | 3 ++- Web/Presenters/templates/components/comments.xml | 2 +- locales/en.strings | 4 ++++ locales/ru.strings | 6 ++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Web/Presenters/templates/Topics/Topic.xml b/Web/Presenters/templates/Topics/Topic.xml index 42912659..dddeabc4 100644 --- a/Web/Presenters/templates/Topics/Topic.xml +++ b/Web/Presenters/templates/Topics/Topic.xml @@ -23,6 +23,7 @@
- {include "../components/comments.xml", comments => $comments, count => $count, page => $page, model => "topics", club => $club, readOnly => $topic->isClosed(), parent => $topic} +

{tr("topic_messages_count", $count)}

+ {include "../components/comments.xml", comments => $comments, count => $count, page => $page, model => "topics", club => $club, readOnly => $topic->isClosed(), showTitle => false, parent => $topic}
{/block} diff --git a/Web/Presenters/templates/components/comments.xml b/Web/Presenters/templates/components/comments.xml index d0d0e84f..41d9b05c 100644 --- a/Web/Presenters/templates/components/comments.xml +++ b/Web/Presenters/templates/components/comments.xml @@ -1,4 +1,4 @@ -

{_"comments"} ({$count})

+

{_"comments"} ({$count})

{var commentsURL = "/al_comments.pl/create/$model/" . $parent->getId()} diff --git a/locales/en.strings b/locales/en.strings index a21b929d..ac3c26fb 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -608,6 +608,10 @@ "messages_one" = "One message"; "messages_other" = "$1 messages"; +"topic_messages_count_zero" = "Topic has no messages"; +"topic_messages_count_one" = "There are one message in the topic"; +"topic_messages_count_other" = "There are $1 messages in the topic"; + "replied" = "replied"; "create_topic" = "Create a topic"; diff --git a/locales/ru.strings b/locales/ru.strings index 0385fc86..b09db677 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -635,6 +635,12 @@ "messages_many" = "$1 сообщений"; "messages_other" = "$1 сообщений"; +"topic_messages_count_zero" = "В теме нет сообщений"; +"topic_messages_count_one" = "В теме одно сообщение"; +"topic_messages_count_few" = "В теме $1 сообщения"; +"topic_messages_count_many" = "В теме $1 сообщений"; +"topic_messages_count_other" = "В теме $1 сообщений"; + "replied" = "ответил"; "create_topic" = "Создать тему";