diff --git a/Web/Presenters/templates/Group/Suggested.xml b/Web/Presenters/templates/Group/Suggested.xml index bd6649d9..93ec7025 100644 --- a/Web/Presenters/templates/Group/Suggested.xml +++ b/Web/Presenters/templates/Group/Suggested.xml @@ -11,7 +11,7 @@ {if $count < 1} {include "../components/error.xml", title => "", description => $type == "my" ? tr("no_suggested_posts_by_you") : tr("no_suggested_posts_by_people")} {else} -

{if $type == "my"}{tr("x_suggested_posts_in_group_by_you", $count)}{else}{tr("x_suggested_posts_in_group", $count)}{/if}

+

{if $type == "my"}{tr("suggested_posts_in_group_by_you", $count)}{else}{tr("suggested_posts_in_group", $count)}{/if}

{foreach $posts as $post} {include "../components/post/microblogpost.xml", post => $post, commentSection => false, suggestion => true, forceNoCommentsLink => true, forceNoPinLink => true, forceNoLike => true, forceNoShareLink => true} {/foreach} diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml index 4a588c13..5d89b1bf 100644 --- a/Web/Presenters/templates/Group/View.xml +++ b/Web/Presenters/templates/Group/View.xml @@ -92,11 +92,11 @@
- {tr("show_suggested_posts", $suggestedPostsCountByUser)} + {tr("suggested_by_you", $suggestedPostsCountByUser)}
- {tr("show_suggested_posts_everyone", $suggestedPostsCountByEveryone)} + {tr("suggested_by_everyone", $suggestedPostsCountByEveryone)}
{presenter "openvk!Wall->wallEmbedded", -$club->getId()} diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js index 3f230a28..27284ab9 100644 --- a/Web/static/js/al_wall.js +++ b/Web/static/js/al_wall.js @@ -301,7 +301,7 @@ $(document).on("click", "#publish_post", async (e) => { } NewNotification(tr("suggestion_succefully_published"), tr("suggestion_press_to_go"), null, () => {window.location.assign("/wall" + post.id)}); - document.getElementById("cound").innerHTML = tr("x_suggested_posts_in_group", post.new_count) + document.getElementById("cound").innerHTML = tr("suggested_posts_in_group", post.new_count) e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode.outerHTML = "" }), Function.noop]); @@ -342,5 +342,5 @@ $(document).on("click", "#decline_post", async (e) => { NewNotification(tr("suggestion_succefully_declined"), "", null); e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode.outerHTML = "" - document.getElementById("cound").innerHTML = tr("x_suggested_posts_in_group", post) + document.getElementById("cound").innerHTML = tr("suggested_posts_in_group", post) }) \ No newline at end of file diff --git a/locales/en.strings b/locales/en.strings index e7f616ac..55290b2a 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -302,8 +302,19 @@ "group_limited_post" = "Suggestions"; "group_closed_post" = "Closed"; "suggest_new" = "Suggest post"; -"show_suggested_posts" = "$1 suggested posts by you"; -"show_suggested_posts_everyone" = "$1 suggested posts"; + +"suggested_by_you_zero" = "$1 suggested posts by you"; +"suggested_by_you_one" = "One suggested post by you"; +"suggested_by_you_few" = "$1 suggested posts by you"; +"suggested_by_you_many" = "$1 suggested posts by you"; +"suggested_by_you_other" = "$1 suggested posts by you"; + +"suggested_by_everyone_zero" = "$1 suggested posts"; +"suggested_by_everyone_one" = "One suggested post"; +"suggested_by_everyone_few" = "$1 suggested posts"; +"suggested_by_everyone_many" = "$1 suggested posts"; +"suggested_by_everyone_other" = "$1 suggested posts"; + "group_hide_from_global_feed" = "Don't display posts in the global feed"; "suggested_posts_by_you" = "Suggested posts by you"; "suggested_posts_by_everyone" = "Suggested posts"; @@ -316,8 +327,17 @@ "decline_suggested" = "Decline"; "publishing_suggested_post" = "Publishing suggested post"; -"x_suggested_posts_in_group" = "This group has $1 suggested posts"; -"x_suggested_posts_in_group_by_you" = "You suggested $1 posts to this group"; +"suggested_posts_in_group_zero" = "You've looked at all the suggested posts, congratulations!"; +"suggested_posts_in_group_one" = "This group has one suggested post"; +"suggested_posts_in_group_few" = "This group has $1 suggested posts"; +"suggested_posts_in_group_many" = "This group has $1 suggested posts"; +"suggested_posts_in_group_other" = "This group has $1 suggested posts"; + +"suggested_posts_in_group_by_you_zero" = "You haven't suggested any posts to this group"; +"suggested_posts_in_group_by_you_one" = "You suggested one post to this group"; +"suggested_posts_in_group_by_you_few" = "You suggested $1 posts to this group"; +"suggested_posts_in_group_by_you_many" = "You suggested $1 posts to this group"; +"suggested_posts_in_group_by_you_other" = "You suggested $1 posts to this group"; "suggestion_succefully_published" = "Post successfully published"; "suggestion_succefully_declined" = "Post successfully declined"; diff --git a/locales/ru.strings b/locales/ru.strings index 47a76942..ae98c60f 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -287,8 +287,18 @@ "group_limited_post" = "Предложка"; "group_closed_post" = "Закрытая"; "suggest_new" = "Предложить новость"; -"show_suggested_posts" = "$1 предложенных вами записей"; -"show_suggested_posts_everyone" = "$1 предложенных записей"; +"suggested_by_you_zero" = "$1 предложенных вами записей"; +"suggested_by_you_one" = "Одна предложенная вами запись"; +"suggested_by_you_few" = "$1 предложенные вами записи"; +"suggested_by_you_many" = "$1 предложенных вами записей"; +"suggested_by_you_other" = "$1 предложенных вами записей"; + +"suggested_by_everyone_zero" = "$1 предложенных записей"; +"suggested_by_everyone_one" = "Одна предложенная запись"; +"suggested_by_everyone_few" = "$1 предложенные записи"; +"suggested_by_everyone_many" = "$1 предложенных записей"; +"suggested_by_everyone_other" = "$1 предложенных записей"; + "group_hide_from_global_feed" = "Не отображать публикации в глобальной ленте"; "suggested_posts_by_you" = "Предложенные вами записи"; "suggested_posts_by_everyone" = "Предложенные записи"; @@ -301,8 +311,17 @@ "decline_suggested" = "Отклонить"; "publishing_suggested_post" = "Публикация предложенной записи"; -"x_suggested_posts_in_group" = "В эту группу предложили $1 записей"; -"x_suggested_posts_in_group_by_you" = "Вы предложили в эту группу $1 записей"; +"suggested_posts_in_group_zero" = "Вы посмотрели всю предложку, поздравляю!"; +"suggested_posts_in_group_one" = "В эту группу предложили одну запись"; +"suggested_posts_in_group_few" = "В эту группу предложили $1 записи"; +"suggested_posts_in_group_many" = "В эту группу предложили $1 записей"; +"suggested_posts_in_group_other" = "В эту группу предложили $1 записей"; + +"suggested_posts_in_group_by_you_zero" = "Вы не предлагали в эту группу никаких записей"; +"suggested_posts_in_group_by_you_one" = "Вы предложили в эту группу одну запись"; +"suggested_posts_in_group_by_you_few" = "Вы предложили в эту группу $1 записи"; +"suggested_posts_in_group_by_you_many" = "Вы предложили в эту группу $1 записей"; +"suggested_posts_in_group_by_you_other" = "Вы предложили в эту группу $1 записей"; "suggestion_succefully_published" = "Запись успешно опубликована"; "suggestion_succefully_declined" = "Запись успешно отклонена";