From c642cadfc9220b894536398b264dadec1f155957 Mon Sep 17 00:00:00 2001 From: Dmitrii Faiazov <82709517+scientia-ac-labore@users.noreply.github.com> Date: Mon, 15 Aug 2022 19:53:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1leared=20up=20the=20message=20when=20a=20?= =?UTF-8?q?comment=20is=20hidden=20=20(#18199)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix message understanding when a comment is hidden and add i18n * Fix naming --- app/views/comments/_comment_proper.html.erb | 6 ++++-- config/locales/views/comments/en.yml | 2 ++ config/locales/views/comments/fr.yml | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/comments/_comment_proper.html.erb b/app/views/comments/_comment_proper.html.erb index 27a2dba68..c621d8258 100644 --- a/app/views/comments/_comment_proper.html.erb +++ b/app/views/comments/_comment_proper.html.erb @@ -7,7 +7,9 @@
<% if comment.deleted %>
- Comment deleted + + <%= t("views.comments.delete.comment_deleted") %> +
<% else %> <%= render partial: "comments/comment_quality_marker", locals: { @@ -35,7 +37,7 @@ <% if should_be_hidden?(comment, @root_comment) %> <% end %> <% end %> diff --git a/config/locales/views/comments/en.yml b/config/locales/views/comments/en.yml index 0a55dc6fd..62afafef4 100644 --- a/config/locales/views/comments/en.yml +++ b/config/locales/views/comments/en.yml @@ -28,6 +28,7 @@ en: submit: Delete edit: Edit cancel: Dismiss + comment_deleted: Comment deleted collapse: Collapse edit: Editing comment edited: @@ -37,6 +38,7 @@ en: hidden: text_html: Some comments have been hidden by the post's author - %{info} info: find out more + comment_hidden: Comment hidden by post author hider: description_html: Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's %{permalink}. hide_child: Hide child comments as well diff --git a/config/locales/views/comments/fr.yml b/config/locales/views/comments/fr.yml index 00f267fce..e71077662 100644 --- a/config/locales/views/comments/fr.yml +++ b/config/locales/views/comments/fr.yml @@ -28,6 +28,7 @@ fr: submit: Delete edit: Edit cancel: Dismiss + comment_deleted: Comment deleted collapse: Collapse edit: Editing comment edited: @@ -37,6 +38,7 @@ fr: hidden: text_html: Some comments have been hidden by the post's author - %{info} info: find out more + comment_hidden: Comment hidden by post author hider: description_html: Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's %{permalink}. hide_child: Hide child comments as well