decidim-comments 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f56674cf1871898096ef02f63583abeb149286e0500056e747b74be60e2028ed
-  data.tar.gz: 8d6a096ed694a4a833c376c9a9c7fe1cf0b691dd571fd33bdc439796f025d3b1
+  metadata.gz: 24cf379816e56d8d02c96af8dfd596b8946c7098f2c672f305a97fb563861248
+  data.tar.gz: 361246cb66e6171732029b68e1a51edabf47bd1d605d26f698144fb148006eb3
 SHA512:
-  metadata.gz: 76c1112767d32925c6ebc0ee12e153f050b4814554aca1357aecfb905bdb734541d104d65208b5cfcdade9792a225cb83b1c1e5afd34a31984c9af2d35d3f604
-  data.tar.gz: 52718130d906ccc942afaff78dd4e75ba5274c6bf88bd8b3fd8aa4215c74afc005a09c7e6f0493340c56d1adca7ed2a48c782413ee13a561a157abd90f7cd549
+  metadata.gz: b649d92b1c7cff28097d16eaee1ab6e3d08b5600c72a180e9e83cf4556730f0a5b62223a23051d61fa160fea8b2925d9161da05e7b600e4439c973ea1fcb9a58
+  data.tar.gz: fef878987f09ba7d4156bc86b573d59db4c030d67f69cabca6f271ea66b1fe44288bef6e615cbf1cd423fb2e363dfa7d87a273b98fee46d7990209235b5d6467

data/app/cells/decidim/comments/comment/actions.erb

@@ -1,14 +1,13 @@
 <div class="comment__actions">
   <% if depth.zero? && has_replies_in_children? %>
-    <button class="button button__sm button__text-secondary comment__hide" data-controls="comment-<%= model.id %>-replies">
+    <button class="button button__sm button__text-secondary comment__hide" data-controls="comment-<%= model.id %>-replies" data-open="true" id="comment-<%= model.id %>-replies-trigger">
+      <span class="show-comment-replies font-normal"><%= t("decidim.components.comment.show_replies", count: replies.size) %></span>
       <%= icon "arrow-up-s-line" %>
-      <span class="hide-comment-replies font-normal"><%= t("decidim.components.comment.hide_replies") %></span>
-      <%= icon "arrow-down-s-line" %>
-      <span class="show-comment-replies font-normal"><%= t("decidim.components.comment.show_replies", count: replies.size, replies_count: replies.size ) %></span>
+      <span class="hide-comment-replies font-normal"><%= t("decidim.components.comment.hide_replies", count: replies.size) %></span>
     </button>
   <% end %>
   <% if can_reply? %>
-    <button class="button button__sm button__text-secondary" data-controls="panel-<%= reply_id %>">
+    <button class="button button__sm button__text-secondary" data-controls="panel-<%= reply_id %>" id="panel-<%= reply_id %>-trigger">
       <%= icon "chat-1-line" %>
       <span class="font-normal"><%= t("decidim.components.comment.reply") %></span>
       <%= icon "close-circle-line" %>

data/app/cells/decidim/comments/comment/show.erb

@@ -1,10 +1,12 @@
-<%= content_tag :div, id: "comment_#{model.id}", class: "comment relative", data: { comment_id: model.id } do %>
+<%= content_tag :div, id: "comment_#{model.id}", class: "comment relative", role: "comment", data: { comment_id: model.id, parent: parent_element_id } do %>
   <% if model.hidden? %>
     <%= render :moderation_data %>
   <% elsif model.deleted? %>
     <%= render :deletion_data %>
   <% else %>
     <div class="comment__header">
+      <div class="sr-only"><%= comment_label %></div>
+
       <span class="font-bold">
         <%== cell("decidim/author", author_presenter) %>
       </span>
@@ -18,7 +20,7 @@
       <% end %>
 
       <div class="relative ml-auto">
-        <button id="dropdown-trigger-<%= context_menu_id %>" data-component="dropdown" data-target="dropdown-menu-<%= context_menu_id %>">
+        <button id="dropdown-trigger-<%= context_menu_id %>" data-component="dropdown" data-target="dropdown-menu-<%= context_menu_id %>" aria-label="<%= t("decidim.components.comment.controls_label") %>">
           &#8230;
         </button>
 

data/app/cells/decidim/comments/comment_cell.rb

@@ -39,6 +39,24 @@ module Decidim
 
       private
 
+      def parent_element_id
+        return unless reply?
+
+        "comment_#{model.decidim_commentable_id}"
+      end
+
+      def comment_label
+        if reply?
+          t("decidim.components.comment.comment_label_reply", comment_id: model.id, parent_comment_id: model.decidim_commentable_id)
+        else
+          t("decidim.components.comment.comment_label", comment_id: model.id)
+        end
+      end
+
+      def reply?
+        model.decidim_commentable_type == model.class.name
+      end
+
       def cache_hash
         return @hash if defined?(@hash)
 

data/app/cells/decidim/comments/comment_thread/show.erb

@@ -1,3 +1,3 @@
-<div class="comment-thread">
+<div class="comment-thread" role="region">
   <%= cell("decidim/comments/comment", model, root_depth: model.depth, order:) %>
 </div>

data/app/cells/decidim/comments/comments/order_control.erb

@@ -5,7 +5,8 @@
         t("decidim.components.comment_order_selector.order.#{order_value}"),
         decidim_comments.comments_path(commentable_gid: model.to_signed_global_id.to_s, order: order_value, reload: 1),
         class: "button button__sm button__text-secondary only:m-auto comment-order-by__item inline-block #{order_value == order ? "underline font-bold" : ""}",
-        remote: true
+        remote: true,
+        aria: { controls: threads_node_id }
       ) %>
     </div>
   <% end %>

data/app/cells/decidim/comments/comments/show.erb

@@ -16,7 +16,7 @@
       </div>
       <%= single_comment_warning %>
       <%= blocked_comments_warning %>
-      <div class="comment-threads">
+      <div class="comment-threads" id="<%= threads_node_id %>" aria-live="polite">
         <%= comments_loading %>
         <% comments.each do |comment| %>
           <%= cell("decidim/comments/comment_thread", comment, order:) %>

data/app/cells/decidim/comments/comments/user_comments_blocked_warning.erb

@@ -1,10 +1,10 @@
 <%# We cannot use the AnnouncementCell directly here as the link is escaped and it would not work %>
 <div class="flash warning" data-announcement="">
-  <span class="flash__message">
+  <div class="flash__message">
     <% if comment_permissions? %>
       <p><%= blocked_comments_for_unauthorized_user_warning_link %></p>
     <% else %>
       <p><%= t("decidim.components.comments.blocked_comments_for_user_warning") %></p>
     <% end %>
-  </span>
+  </div>
 </div>

data/app/cells/decidim/comments/comments_cell.rb

@@ -30,7 +30,7 @@ module Decidim
 
       def blocked_comments_warning
         return unless comments_blocked?
-        return unless user_comments_blocked?
+        return if user_comments_blocked?
 
         render :blocked_comments_warning
       end
@@ -88,6 +88,10 @@ module Decidim
         "comments-for-#{commentable_type.demodulize}-#{model.id}"
       end
 
+      def threads_node_id
+        "#{node_id}-threads"
+      end
+
       def commentable_type
         model.commentable_type
       end

data/app/events/decidim/comments/comment_event.rb

@@ -14,6 +14,10 @@ module Decidim
           comment.formatted_body(override_translation)
         end
 
+        def hidden_resource?
+          super || (comment.respond_to?(:hidden?) && comment.hidden?)
+        end
+
         def author
           comment.normalized_author
         end

data/app/packs/src/decidim/comments/comments.component.test.js

@@ -344,9 +344,9 @@ describe("CommentsComponent", () => {
               ${generateCommentForm("Dummy", 123)}
             </div>
             <div class="flash primary loading-comments hidden">
-              <span class="flash__message">
+              <div class="flash__message">
                 Loading comments ...
-              </span>
+              </div>
             </div>
         </div>
       </div>

data/config/locales/ar.yml

@@ -69,7 +69,6 @@ ar:
         deleted_user: مشارك محذوف
         edit: تعديل
         edited: تم التعديل
-        hide_replies: إخفاء الردود
         moderated_at: تمت مراجعة التعليق على %{date}
         reply: الرد
         report:

data/config/locales/bg.yml

@@ -4,4 +4,173 @@ bg:
     models:
       decidim/comments/comment_by_followed_user_event: Коментар
       decidim/comments/comment_created_event: Коментар
+      decidim/comments/comment_upvoted_event: Коментарът е одобрен
       decidim/comments/reply_created_event: Отговор на коментар
+      decidim/comments/user_group_mentioned_event: Споменаване
+      decidim/comments/user_mentioned_event: Споменаване
+  activerecord:
+    models:
+      decidim/comments/comment:
+        one: Коментар
+        other: Коментари
+      decidim/comments/comment_vote:
+        one: Глас
+        other: Гласове
+  decidim:
+    comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Коментарите са активирани
+            end_time: Коментарите са активирани до
+            start_time: Коментарите са активирани от
+      comments:
+        create:
+          error: Възникна проблем при създаването на коментара.
+        delete:
+          error: Коментарът не може да бъде изтрит.
+        update:
+          error: Възникна проблем при актуализирането на коментара.
+      comments_title: Коментар
+      last_activity:
+        new_comment: 'Нов коментар:'
+      votes:
+        create:
+          error: Възникна проблем с гласуването за коментара.
+    components:
+      add_comment_form:
+        account_message: <a href="%{sign_in_url}">Влезте в профила си</a> или <a href="%{sign_up_url}">се регистрирайте</a>, за да добавите Вашия коментар.
+        form:
+          body:
+            label: Коментар
+            placeholder: Какво мислите за това?
+          form_error: Текстът е задължителен и не може да е по-дълъг от %{length} символа.
+          submit_reply: Публикуване на отговор
+          submit_root_comment: Публикуване на коментар
+          user_group_id:
+            label: Коментирайте като
+        opinion:
+          label: Вашето мнение по тази тема
+          negative: Негативно
+          negative_selected: Вашето мнение по тази тема е негативно
+          neutral: Неутрално
+          neutral_selected: Вашето мнение по тази тема е неутрално
+          positive: Позитивно
+          positive_selected: Вашето мнение по тази тема е позитивно
+        remaining_characters: "Оставащи символи: %{count}"
+        remaining_characters_1: "%{count} оставащ символ"
+        title: Добавете Вашия коментар
+      comment:
+        alignment:
+          against: Против
+          in_favor: Подкрепям
+        cancel_reply: Отказ от отговор
+        comment_label: Коментар %{comment_id}
+        comment_label_reply: Коментар %{comment_id} (отговор на коментар %{parent_comment_id})
+        confirm_destroy: Сигурни ли сте, че искате да изтриете този коментар?
+        controls_label: Контроли за коментари
+        delete: Изтрий
+        deleted_at: Коментарът е изтрит на %{date}
+        deleted_user: Изтрит участник
+        edit: Редактирай
+        edited: Редактирано
+        hide_replies:
+          one: Скриване на отговора
+          other: Скриване на %{count} отговора
+        moderated_at: Коментарът е модериран на %{date}
+        reply: Отговори
+        report:
+          action: Доклад
+          already_reported: Това съдържание вече е докладвано и ще бъде прегледано от администратор.
+          close: Затвори
+          description: Това съдържание неподходящо ли е?
+          details: Допълнителни коментари
+          reasons:
+            does_not_belong: Съдържа незаконна дейност, заплахи за самоубийство, лична информация или нещо друго, което смятате, че не принадлежи на %{organization_name}.
+            offensive: Съдържа расизъм, сексизъм, злословия, лични атаки, заплахи за смърт, заявки за самоубийство или всякаква форма на омраза.
+            spam: Съдържа примамка за кликване, реклама, измами или скриптове.
+          title: Докладване за неподходящо съдържание
+        show_replies:
+          one: Показване на отговора
+          other: Показване на %{count} отговора
+        single_comment_link_title: Вземете линка
+      comment_order_selector:
+        order:
+          best_rated: С най-висока оценка
+          most_discussed: Най-обсъждани
+          older: По-старо
+          recent: Скорошни
+        title: 'Подреди по:'
+      comments:
+        blocked_comments_for_unauthorized_user_warning: Трябва да сте верифицирани, за да коментирате в този момент, но можете да прочетете предишните.
+        blocked_comments_for_user_warning: Понастоящем не можете да коментирате, но можете да прочетете предходните коментари.
+        blocked_comments_warning: Коментарите в момента са деактивирани, но можете да прочетете предишните.
+        comment_details_title: Детайли за коментара
+        loading: Коментарите се зареждат...
+        single_comment_warning: <a href="%{url}">Вижте всички коментари</a>
+        single_comment_warning_title: Виждате единичен коментар
+        title:
+          one: "%{count} коментар"
+          other: "%{count} коментари"
+      down_vote_button:
+        text: Не съм съгласен с този коментар
+      edit_comment_modal_form:
+        close: Затвори
+        form:
+          body:
+            label: Коментар
+            placeholder: Какво мислите за това?
+          submit: Изпрати
+        title: Редактирайте Вашия коментар
+      up_vote_button:
+        text: Съгласен съм с този коментар
+    events:
+      comments:
+        comment_by_followed_user:
+          email_intro: "%{author_name} остави коментар в %{resource_title}. Можете да го прочетете на тази страница:"
+          email_outro: Получихте това известие, защото следвате %{author_name}. Можете да спрете да следвате този потребител от страницата на неговия профил.
+          email_subject: Има нов коментар от %{author_name} в(ъв) %{resource_title}
+          notification_title: Има нов коментар от <a href="%{author_path}">%{author_name} %{author_nickname}</a> в(ъв) <a href="%{resource_path}">%{resource_title}</a>.
+        comment_by_followed_user_group:
+          email_intro: 'Групата %{author_name} остави коментар в(ъв) %{resource_title}. Можете да го прочетете на следната страница:'
+          email_outro: Получавате това известие, защото следвате %{author_name}. Можете да спрете да следвате тази група от страницата на профила ѝ.
+          email_subject: Има нов коментар от %{author_name} в(ъв) %{resource_title}
+          notification_title: Има нов коментар от <a href="%{author_path}">%{author_name} %{author_nickname}</a> в(ъв) <a href="%{resource_path}">%{resource_title}</a>.
+        comment_created:
+          email_intro: "%{resource_title} получи коментар. Можете да прочетете коментара на тази страница:"
+          email_outro: Получавате това известие, защото следвате „%{resource_title}“ или неговия автор. Можете да прекратите следването от предходната връзка.
+          email_subject: Има нов коментар от %{author_name} по %{resource_title}
+          notification_title: Има нов коментар от <a href="%{author_path}">%{author_name} %{author_nickname}</a> по <a href="%{resource_path}">%{resource_title}</a>
+        comment_downvoted:
+          email_intro: Вашият коментар в „%{resource_title}“ беше гласуван против. Вече има общо %{upvotes} гласа за и %{downvotes} гласа против.
+          email_outro: Получихте това известие, защото вие сте авторът на този коментар.
+          email_subject: Вашият коментар в „%{resource_title}“ беше гласуван против.
+          notification_title: Вашият <a href="%{resource_path}">коментар</a> в „%{resource_title}“ беше гласуван против. Вече има общо %{upvotes} гласа за и %{downvotes} гласа против.
+        comment_upvoted:
+          email_intro: Коментарът ви в „%{resource_title}“ беше гласуван в подкрепа. Вече има общо %{upvotes} гласа за и %{downvotes} гласа против.
+          email_outro: Получихте това известие, защото вие сте авторът на този коментар.
+          email_subject: Коментарът ви в „%{resource_title}“ беше гласуван в подкрепа.
+          notification_title: Вашият <a href="%{resource_path}">коментар</a> в „%{resource_title}“ получи положителен глас. Вече има общо %{upvotes} гласа за и %{downvotes} гласа против.
+        reply_created:
+          email_intro: "%{author_name} отговори на вашия коментар в %{resource_title}. Можете да го прочетете на тази страница:"
+          email_outro: Получавате това известие, защото някой отговори на коментара Ви.
+          email_subject: "%{author_name} отговори на коментара Ви по %{resource_title}"
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> отговори на коментара Ви по <a href="%{resource_path}">%{resource_title}</a>
+        user_group_mentioned:
+          email_intro: Група, към която принадлежите, беше спомената
+          email_outro: Получавате това известие, защото сте член на групата %{group_name}, която беше спомената в(ъв) %{resource_title}.
+          email_subject: Бяхте споменати в(ъв) %{resource_title} като член на %{group_name}
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> Ви спомена в(ъв) <a href="%{resource_path}">%{resource_title}</a> като член на <a href="%{group_path}">%{group_name} %{group_nickname}</a>
+        user_mentioned:
+          email_intro: Бяхте споменати
+          email_outro: Получавате това известие, защото бяхте споменати в(ъв) %{resource_title}.
+          email_subject: Бяхте споменати в(ъв) %{resource_title}
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> Ви спомена в(ъв) <a href="%{resource_path}">%{resource_title}</a>
+    metrics:
+      comments:
+        description: Брой коментари генерирани от участници
+        object: коментари
+        title: Коментари
+  errors:
+    messages:
+      cannot_have_comments: не може да има коментари

data/config/locales/ca.yml

@@ -65,13 +65,18 @@ ca:
           against: En contra
           in_favor: A favor
         cancel_reply: Cancel·lar resposta
+        comment_label: Comentari %{comment_id}
+        comment_label_reply: Comentari %{comment_id} (respon al comentari %{parent_comment_id})
         confirm_destroy: Segur que vols esborrar aquest comentari?
+        controls_label: Controls de comentaris
         delete: Esborrar
         deleted_at: Comentari esborrat el %{date}
         deleted_user: Participant eliminada
         edit: Editar
         edited: Editat
-        hide_replies: Oculta les respostes
+        hide_replies:
+          one: Amagar resposta
+          other: Amagar %{count} respostes
         moderated_at: Comentari moderat el %{date}
         reply: Respondre
         report:

data/config/locales/cs.yml

@@ -69,13 +69,15 @@ cs:
           against: Proti
           in_favor: Ve prospěch
         cancel_reply: Zrušit odpověď
+        comment_label: Komentář %{comment_id}
+        comment_label_reply: Komentář %{comment_id} (odpověď na komentář %{parent_comment_id})
         confirm_destroy: Opravdu chcete odstranit tento komentář?
+        controls_label: Ovládání komentářů
         delete: Smazat
         deleted_at: Komentář byl smazán dne %{date}
         deleted_user: Vymazaný účastník
         edit: Upravit
         edited: Upraveno
-        hide_replies: Skrýt odpovědi
         moderated_at: Komentář moderován dne %{date}
         reply: Odpověď
         report:

data/config/locales/de.yml

@@ -65,13 +65,18 @@ de:
           against: Gegen
           in_favor: Zugunsten
         cancel_reply: Antwort abbrechen
+        comment_label: Kommentar %{comment_id}
+        comment_label_reply: Kommentar %{comment_id} (Antwort auf Kommentar %{parent_comment_id})
         confirm_destroy: Sind Sie sich sicher, dass Sie diesen Kommentar löschen möchten?
+        controls_label: Kommentarsteuerung
         delete: Löschen
         deleted_at: Kommentar gelöscht am %{date}
         deleted_user: Gelöschter Benutzer
         edit: Bearbeiten
         edited: Bearbeitet
-        hide_replies: Antworten verbergen
+        hide_replies:
+          one: Antwort verbergen
+          other: '%{count} Antworten verbergen'
         moderated_at: Kommentar moderiert am %{date}
         reply: Antworten
         report:

data/config/locales/el.yml

@@ -65,7 +65,6 @@ el:
         deleted_user: Διαγραμμένος συμμετέχων
         edit: Επεξεργασία
         edited: Επεξεργασμένο
-        hide_replies: Απόκρυψη απαντήσεων
         moderated_at: Σχόλιο διαχειρίστηκε στις %{date}
         reply: Απάντηση
         report:

data/config/locales/en.yml

@@ -65,13 +65,18 @@ en:
           against: Against
           in_favor: In favor
         cancel_reply: Cancel reply
+        comment_label: Comment %{comment_id}
+        comment_label_reply: Comment %{comment_id} (reply to comment %{parent_comment_id})
         confirm_destroy: Are you sure you want to delete this comment?
+        controls_label: Comment controls
         delete: Delete
         deleted_at: Comment deleted on %{date}
         deleted_user: Deleted participant
         edit: Edit
         edited: Edited
-        hide_replies: Hide replies
+        hide_replies:
+          one: Hide reply
+          other: Hide %{count} replies
         moderated_at: Comment moderated on %{date}
         reply: Reply
         report:

data/config/locales/es-MX.yml

@@ -65,13 +65,18 @@ es-MX:
           against: En contra
           in_favor: A favor
         cancel_reply: Cancelar respuesta
+        comment_label: Comentario %{comment_id}
+        comment_label_reply: Comentario %{comment_id} (responder al comentario %{parent_comment_id})
         confirm_destroy: '¿Seguro que quieres eliminar este comentario?'
+        controls_label: Controles de comentarios
         delete: Eliminar
         deleted_at: Comentario eliminado el %{date}
         deleted_user: Usuario eliminado
         edit: Editar
         edited: Editado
-        hide_replies: Ocultar respuestas
+        hide_replies:
+          one: Ocultar respuesta
+          other: Ocultar %{count} respuestas
         moderated_at: Comentario moderado el %{date}
         reply: Respuesta
         report:

data/config/locales/es-PY.yml

@@ -65,13 +65,18 @@ es-PY:
           against: En contra
           in_favor: A favor
         cancel_reply: Cancelar respuesta
+        comment_label: Comentario %{comment_id}
+        comment_label_reply: Comentario %{comment_id} (responder al comentario %{parent_comment_id})
         confirm_destroy: '¿Seguro que quieres eliminar este comentario?'
+        controls_label: Controles de comentarios
         delete: Eliminar
         deleted_at: Comentario eliminado el %{date}
         deleted_user: Usuario eliminado
         edit: Editar
         edited: Editado
-        hide_replies: Ocultar respuestas
+        hide_replies:
+          one: Ocultar respuesta
+          other: Ocultar %{count} respuestas
         moderated_at: Comentario moderado el %{date}
         reply: Respuesta
         report:

data/config/locales/es.yml

@@ -44,7 +44,7 @@ es:
           body:
             label: Comentario
             placeholder: '¿Qué piensas sobre ésto?'
-          form_error: El texto es necesario y no puede ser más largo de %{length}.
+          form_error: El texto es necesario y no puede ser más largo de %{length} caracteres.
           submit_reply: Publicar respuesta
           submit_root_comment: Publicar comentario
           user_group_id:
@@ -65,13 +65,18 @@ es:
           against: En contra
           in_favor: A favor
         cancel_reply: Cancelar respuesta
+        comment_label: Comentario %{comment_id}
+        comment_label_reply: Comentario %{comment_id} (responder al comentario %{parent_comment_id})
         confirm_destroy: '¿Seguro que quieres eliminar este comentario?'
+        controls_label: Controles de comentarios
         delete: Eliminar
         deleted_at: Comentario eliminado el %{date}
         deleted_user: Participante eliminada
         edit: Editar
         edited: Editado
-        hide_replies: Ocultar respuestas
+        hide_replies:
+          one: Ocultar respuesta
+          other: Ocultar %{count} respuestas
         moderated_at: Comentario moderado el %{date}
         reply: Respuesta
         report:

data/config/locales/eu.yml

@@ -65,13 +65,15 @@ eu:
           against: Aurka
           in_favor: Alde
         cancel_reply: Ezeztatu erantzuna
+        comment_label: Iruzkindu %{comment_id}
+        comment_label_reply: Iruzkindu %{comment_id} (erantzun %{parent_comment_id} iruzkinei)
         confirm_destroy: Ziur zaude iruzkin hau ezabatu nahi duzula?
+        controls_label: Iruzkindu kontrolak
         delete: Ezabatu
         deleted_at: Iruzkina ezabatu da data honetan %{date}
         deleted_user: Parte-hartzailea ezabatua
         edit: Editatu
         edited: Editatuta
-        hide_replies: Ezkutatu erantzunak
         moderated_at: Iruzkina %{date}-an moderatu egin da
         reply: Erantzuna
         report:

data/config/locales/fi-plain.yml

@@ -65,13 +65,18 @@ fi-pl:
           against: Vastaan
           in_favor: Puolesta
         cancel_reply: Peruuta vastaus
+        comment_label: Kommentti %{comment_id}
+        comment_label_reply: Kommentti %{comment_id} (vastauksena kommenttiin %{parent_comment_id})
         confirm_destroy: Haluatko varmasti poistaa tämän kommentin?
+        controls_label: Kommenttien hallinta
         delete: Poista
         deleted_at: Kommentti poistettu %{date}
         deleted_user: Poistettu käyttäjä
         edit: Muokkaa
         edited: Muokattu
-        hide_replies: Piilota vastaukset
+        hide_replies:
+          one: Piilota vastaus
+          other: Piilota %{count} vastausta
         moderated_at: Kommentti moderoitu %{date}
         reply: Vastaa
         report:

data/config/locales/fi.yml

@@ -65,13 +65,18 @@ fi:
           against: Vastaan
           in_favor: Puolesta
         cancel_reply: Peruuta vastaus
+        comment_label: Kommentti %{comment_id}
+        comment_label_reply: Kommentti %{comment_id} (vastauksena kommenttiin %{parent_comment_id})
         confirm_destroy: Haluatko varmasti poistaa tämän kommentin?
+        controls_label: Kommenttien hallinta
         delete: Poista
         deleted_at: Kommentti poistettu %{date}
         deleted_user: Poistettu käyttäjä
         edit: Muokkaa
         edited: Muokattu
-        hide_replies: Piilota vastaukset
+        hide_replies:
+          one: Piilota vastaus
+          other: Piilota %{count} vastausta
         moderated_at: Kommentti moderoitu %{date}
         reply: Vastaa
         report:

data/config/locales/fr-CA.yml

@@ -65,13 +65,18 @@ fr-CA:
           against: Contre
           in_favor: Pour
         cancel_reply: Annuler la réponse
+        comment_label: Commentaire %{comment_id}
+        comment_label_reply: Commentaire %{comment_id} (réponse au commentaire %{parent_comment_id})
         confirm_destroy: Êtes-vous sûr de vouloir supprimer ce commentaire?
+        controls_label: Contrôles du commentaire
         delete: Supprimer
         deleted_at: Commentaire supprimé le %{date}
         deleted_user: Utilisateur supprimé
         edit: Modifier
         edited: Modifié
-        hide_replies: Cacher les réponses
+        hide_replies:
+          one: Masquer la réponse
+          other: Masquer {count} réponses
         moderated_at: Commentaire modéré le %{date}
         reply: Répondre
         report:

data/config/locales/fr.yml

@@ -65,13 +65,18 @@ fr:
           against: Contre
           in_favor: Pour
         cancel_reply: Annuler la réponse
+        comment_label: Commentaire %{comment_id}
+        comment_label_reply: Commentaire %{comment_id} (réponse au commentaire %{parent_comment_id})
         confirm_destroy: Êtes-vous sûr de vouloir supprimer ce commentaire ?
+        controls_label: Contrôles du commentaire
         delete: Supprimer
         deleted_at: Commentaire supprimé le %{date}
         deleted_user: Utilisateur supprimé
         edit: Modifier
         edited: Modifié
-        hide_replies: Cacher les réponses
+        hide_replies:
+          one: Masquer la réponse
+          other: Masquer {count} réponses
         moderated_at: Commentaire modéré le %{date}
         reply: Répondre
         report:

data/config/locales/gl.yml

@@ -60,7 +60,6 @@ gl:
         deleted_user: Usuario eliminado
         edit: Editar
         edited: Editado
-        hide_replies: Ocultar respostas
         moderated_at: Comentario moderado o %{date}
         reply: Responder
         report:

data/config/locales/hu.yml

@@ -70,7 +70,6 @@ hu:
         deleted_user: Törölt felhasználó
         edit: Szerkesztés
         edited: Szerkesztve
-        hide_replies: Válaszok elrejtése
         moderated_at: Hozzászólás moderálva %{date}
         reply: Válasz
         report:

data/config/locales/it.yml

@@ -60,7 +60,6 @@ it:
         deleted_user: Utente cancellato
         edit: Modifica
         edited: Modificato
-        hide_replies: Nascondi risposte
         reply: Rispondi
         report:
           action: Report

data/config/locales/ja.yml

@@ -63,13 +63,17 @@ ja:
           against: 反対
           in_favor: 賛成
         cancel_reply: 返信をキャンセル
+        comment_label: コメント %{comment_id}
+        comment_label_reply: コメント %{comment_id} (コメント %{parent_comment_id} への返信)
         confirm_destroy: コメントを削除してもよろしいですか？
+        controls_label: コメントコントロール
         delete: 削除
         deleted_at: '%{date} にコメントが削除されました'
         deleted_user: 退会者
         edit: 編集
         edited: 編集済み
-        hide_replies: 返信を非表示
+        hide_replies:
+          other: '%{count} 件の返信を非表示'
         moderated_at: '%{date} にモデレートされたコメント'
         reply: 返信
         report:

data/config/locales/lb.yml

@@ -54,7 +54,6 @@ lb:
         deleted_user: Gelöschter Benutzer
         edit: Bearbeiten
         edited: Bearbeitet
-        hide_replies: Antworten verbergen
         reply: Antworten
         report:
           action: Melden

data/config/locales/lt.yml

@@ -74,7 +74,6 @@ lt:
         deleted_user: Ištrintas dalyvis
         edit: Redaguoti
         edited: Redaguota
-        hide_replies: Paslėpti atsakymus
         moderated_at: Komentaras moderuotas %{date}
         reply: Atsakyti
         report:

data/config/locales/lv.yml

@@ -40,7 +40,6 @@ lv:
           against: Pret
           in_favor: Par
         deleted_user: Dzēsts dalībnieks
-        hide_replies: Slēpt atbildes
         reply: Atbildēt
         report:
           action: Ziņot

data/config/locales/nl.yml

@@ -61,7 +61,6 @@ nl:
         deleted_user: Verwijderde deelnemer
         edit: Bewerk
         edited: Bewerkt
-        hide_replies: Antwoorden verbergen
         moderated_at: Reactie gemodereerd op %{date}
         reply: Antwoord
         report:

data/config/locales/no.yml

@@ -60,7 +60,6 @@
         deleted_user: Slettet deltaker
         edit: Rediger
         edited: Redigert
-        hide_replies: Skjul svar
         reply: Svar
         report:
           action: Rapport

data/config/locales/pl.yml

@@ -69,13 +69,15 @@ pl:
           against: Negatywny
           in_favor: Pozytywny
         cancel_reply: Anuluj odpowiedź
+        comment_label: Komentarz %{comment_id}
+        comment_label_reply: Komentarz %{comment_id} (odpowiedź na komentarz %{parent_comment_id})
         confirm_destroy: Czy na pewno chcesz usunąć ten komentarz?
+        controls_label: Kontrolki komentarzy
         delete: Usuń
         deleted_at: Komentarz usunięty %{date}
         deleted_user: Usunięty użytkownik
         edit: Edytuj
         edited: Edytowany
-        hide_replies: Ukryj odpowiedzi
         moderated_at: Komentarz moderowany dnia %{date}
         reply: Odpowiedz
         report:

data/config/locales/pt-BR.yml

@@ -55,7 +55,6 @@ pt-BR:
         deleted_user: Usuário excluído
         edit: Editar
         edited: Editado
-        hide_replies: Ocultar respostas
         moderated_at: Comentário moderado em %{date}
         reply: Resposta
         report:

data/config/locales/pt.yml

@@ -60,7 +60,6 @@ pt:
         deleted_user: Participante eliminado
         edit: Editar
         edited: Editado
-        hide_replies: Ocultar respostas
         reply: Responder
         report:
           action: Reportar

data/config/locales/ro-RO.yml

@@ -73,7 +73,6 @@ ro:
         deleted_user: Participant șters
         edit: Actualizare
         edited: Actualizat
-        hide_replies: Ascundeți răspunsurile
         moderated_at: Comentariu moderat pe %{date}
         reply: Răspunde
         report:

data/config/locales/sk.yml

@@ -42,7 +42,6 @@ sk:
           against: Proti
           in_favor: Za
         deleted_user: Zmazaný účastník
-        hide_replies: Skryť odpovede
         reply: Odpovedať
         report:
           action: Nahlásiť

data/config/locales/sq-AL.yml

@@ -29,7 +29,6 @@ sq:
         deleted_at: Komenti u fshi në datën %{date}
         edit: Përpuno
         edited: Ndryshuar
-        hide_replies: Fshih përgjigjet
         moderated_at: Komenti u moderua në datën %{date}
         reply: Përgjigju
         report:

data/config/locales/sr-CS.yml

@@ -2,8 +2,6 @@
 sr:
   decidim:
     components:
-      comment:
-        hide_replies: Sakrij odgovore
       comments:
         comment_details_title: Detalji o komentaru
         single_comment_warning_title: Vidite samo jedan komentar

data/config/locales/sv.yml

@@ -63,7 +63,6 @@ sv:
         deleted_user: Raderad deltagare
         edit: Redigera
         edited: Redigerad
-        hide_replies: Göm svar
         moderated_at: Kommentar modererad den %{date}
         reply: Svara
         report:

data/config/locales/tr-TR.yml

@@ -41,8 +41,10 @@ tr:
         alignment:
           against: Karşısında
           in_favor: Lehine
+        comment_label: Yorum %{comment_id}
+        comment_label_reply: Yorum %{comment_id} (Yoruma Yanıt %{parent_comment_id})
+        controls_label: Yorum Kontrolü
         deleted_user: Silinmiş katılımcı
-        hide_replies: Yanıtları gizle
         reply: Cevapla
         report:
           action: Rapor

data/config/locales/zh-CN.yml

@@ -36,7 +36,6 @@ zh-CN:
           against: 反对的
           in_favor: 优惠的
         deleted_user: 删除参与者
-        hide_replies: 隐藏回复
         reply: 答复
         report:
           action: 报告

data/config/locales/zh-TW.yml

@@ -63,7 +63,6 @@ zh-TW:
         deleted_user: 已刪除的參與者
         edit: 編輯
         edited: 已編輯
-        hide_replies: 隱藏答覆
         moderated_at: 評論在%{date} 被審核
         reply: 回覆
         report:

data/lib/decidim/comments/test/factories.rb

@@ -40,6 +40,12 @@ FactoryBot.define do
       end
       root_commentable { build(:dummy_resource, skip_injection:) }
     end
+
+    trait :moderated do
+      after(:create) do |comment, evaluator|
+        create(:moderation, reportable: comment, hidden_at: 2.days.ago, skip_injection: evaluator.skip_injection)
+      end
+    end
   end
 
   factory :comment_vote, class: "Decidim::Comments::CommentVote" do

data/lib/decidim/comments/test/shared_examples/comment_event.rb

@@ -42,4 +42,37 @@ shared_examples_for "a comment event" do
       expect(subject.resource_text).to eq comment.formatted_body
     end
   end
+
+  describe "hidden_resource?" do
+    context "when comment is not moderated" do
+      it "returns false" do
+        expect(subject.hidden_resource?).to be false
+      end
+    end
+
+    context "when comment is moderated" do
+      let(:comment) { create(:comment, :moderated) }
+
+      it "returns true" do
+        expect(subject.hidden_resource?).to be true
+      end
+    end
+
+    context "when resource is not moderated" do
+      it "returns false" do
+        expect(subject.hidden_resource?).to be false
+      end
+    end
+
+    context "when resource is moderated" do
+      before do
+        create(:moderation, reportable: resource, hidden_at: 2.days.ago)
+        resource.reload
+      end
+
+      it "returns true" do
+        expect(subject.hidden_resource?).to be true
+      end
+    end
+  end
 end

data/lib/decidim/comments/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.28.1"
+      "0.28.2"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -306,7 +306,7 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -321,8 +321,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Decidim comments module
 test_files: []