decidim-comments 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b3b1d43c2cc461e99009bcc30c168382b996b92811ce6309aa5b42f56caaff7
-  data.tar.gz: aabe481592164317440bb4d865c7bc50b9d24baaf244386aa2fda2802cd481b1
+  metadata.gz: 24cf379816e56d8d02c96af8dfd596b8946c7098f2c672f305a97fb563861248
+  data.tar.gz: 361246cb66e6171732029b68e1a51edabf47bd1d605d26f698144fb148006eb3
 SHA512:
-  metadata.gz: e174a71860cbd31fea5cee3dc7b93d59463396f46147d530f81e5b69569c6d3990b41055eb069405260ae952ed88d852b45c39e4f9fea7e6635d580e9fabcc50
-  data.tar.gz: 7181c8c9c711e14d7edf86ad680dc002c75e33fda2c160dbd30c3d15bb49f13216d921b431ab6c7957d8feb69e7b27c3d92c875367e630ae58b283b9ad7f38ff
+  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>
 
@@ -30,20 +32,20 @@
               </li>
             <% end %>
             <li>
-              <%= link_to "#{commentable_path("commentId" => model.id)}#comment_#{model.id}", target: "_blank", data: { "external-link": "false" }, class: "dropdown__item", title: t("decidim.components.comment.single_comment_link_title") do %>
+              <%= link_to "#{commentable_path("commentId" => model.id)}#comment_#{model.id}", target: "_blank", data: { "external-link": "text-only" }, class: "dropdown__item", title: t("decidim.components.comment.single_comment_link_title") do %>
                 <%= icon "share-line" %>
                 <span><%= t("decidim.components.comment.single_comment_link_title") %></span>
               <% end %>
             </li>
             <% if model.authored_by?(current_user) %>
               <li>
-                <button type="button" class="dropdown__item" data-dialog-open="<%= "editCommentModal#{model.id}" %>" title="<%= t("decidim.components.comment.edit") %>" aria-controls="<%= "editCommentModal#{model.id}" %>" aria-haspopup="dialog" tabindex="2">
+                <button type="button" class="dropdown__item" data-dialog-open="<%= "editCommentModal#{model.id}" %>" title="<%= t("decidim.components.comment.edit") %>" aria-controls="<%= "editCommentModal#{model.id}" %>" aria-haspopup="dialog">
                   <%= icon "edit-line" %>
                   <span><%= t("decidim.components.comment.edit") %></span>
                 </button>
               </li>
               <li>
-                <%= link_to comment_path, remote: true, method: :delete, class: "dropdown__item", data: { confirm: t("decidim.components.comment.confirm_destroy") }, tabindex: 3 do %>
+                <%= link_to comment_path, remote: true, method: :delete, class: "dropdown__item", data: { confirm: t("decidim.components.comment.confirm_destroy") } do %>
                   <%= icon "delete-bin-line" %>
                   <span><%= t("decidim.components.comment.delete") %></span>
                 <% end %>

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)
 
@@ -47,6 +65,8 @@ module Decidim
         hash.push(model.must_render_translation?(current_organization) ? 1 : 0)
         hash.push(model.authored_by?(current_user) ? 1 : 0)
         hash.push(model.reported_by?(current_user) ? 1 : 0)
+        hash.push(model.up_votes_count)
+        hash.push(model.down_votes_count)
         hash.push(model.cache_key_with_version)
         hash.push(model.author.cache_key_with_version)
         @hash = hash.join(Decidim.cache_key_separator)
@@ -137,11 +157,11 @@ module Decidim
       end
 
       def up_votes_count
-        model.up_votes.count
+        model.up_votes_count
       end
 
       def down_votes_count
-        model.down_votes.count
+        model.down_votes_count
       end
 
       def root_depth
@@ -157,11 +177,11 @@ module Decidim
       end
 
       def voted_up?
-        model.up_voted_by?(current_user)
+        @up_voted ||= model.up_voted_by?(current_user)
       end
 
       def voted_down?
-        model.down_voted_by?(current_user)
+        @down_voted ||= model.down_voted_by?(current_user)
       end
 
       def nested?

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/models/decidim/comments/comment.rb

@@ -122,14 +122,14 @@ module Decidim
       #
       # Returns a bool value to indicate if the condition is truthy or not
       def up_voted_by?(user)
-        up_votes.any? { |vote| vote.author == user }
+        up_votes.exists?(author: user)
       end
 
       # Public: Check if the user has downvoted the comment
       #
       # Returns a bool value to indicate if the condition is truthy or not
       def down_voted_by?(user)
-        down_votes.any? { |vote| vote.author == user }
+        down_votes.exists?(author: user)
       end
 
       # Public: Overrides the `reported_content_url` Reportable concern method.

data/app/models/decidim/comments/comment_vote.rb

@@ -14,12 +14,22 @@ module Decidim
       validates :weight, inclusion: { in: [-1, 1] }
       validate :author_and_comment_same_organization
 
+      after_create :update_comment_votes_count
+      after_destroy :update_comment_votes_count
+
       def self.export_serializer
         Decidim::Comments::CommentVoteSerializer
       end
 
       private
 
+      def update_comment_votes_count
+        up_votes_count = self.class.where(decidim_comment_id: comment.id, weight: 1).count
+        down_votes_count = self.class.where(decidim_comment_id: comment.id, weight: -1).count
+
+        comment.update(up_votes_count:, down_votes_count:)
+      end
+
       # Private: check if the comment and the author have the same organization
       def author_and_comment_same_organization
         return unless author.present? && comment.present?

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

@@ -18,8 +18,8 @@ window.Rails = Rails;
 // Fake timers for testing polling
 jest.useFakeTimers();
 
-import { createCharacterCounter } from "../../../../../../decidim-core/app/packs/src/decidim/input_character_counter";
-import Configuration from "../../../../../../decidim-core/app/packs/src/decidim/configuration";
+import { createCharacterCounter } from "src/decidim/input_character_counter";
+import Configuration from "src/decidim/configuration";
 // Component is loaded with require because using import loads it before $ has been mocked
 // so tests are not able to check the spied behaviours
 const CommentsComponent = require("./comments.component_for_testing.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/app/packs/src/decidim/comments/comments.component_for_testing.js

@@ -1,4 +1,5 @@
 /* eslint no-undef: 0 */
+/* eslint-disable no-relative-import-paths/no-relative-import-paths */
 
 import CommentsComponent from "./comments.component"
 

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:
@@ -123,27 +128,27 @@ ca:
       comments:
         comment_by_followed_user:
           email_intro: "%{author_name} ha deixat un comentari a %{resource_title}. Podeu llegir-lo en aquesta pàgina:"
-          email_outro: Has rebut aquesta notificació perquè estàs seguint %{author_name}. Pots deixar de seguir a aquesta participant des de la seva pàgina de perfil.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint el comentari "%{author_name}". Pots deixar de seguir a aquesta participant des de la seva pàgina de perfil.
           email_subject: Hi ha un nou comentari de %{author_name} en %{resource_title}
           notification_title: Hi ha un nou comentari per <a href="%{author_path}">%{author_name} %{author_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>.
         comment_by_followed_user_group:
           email_intro: '%{author_name} ha deixat un comentari a%{resource_title}. Pots llegir-lo en aquesta pàgina:'
-          email_outro: Reps aquesta notificació perquè segueixes a %{author_name}. Pots deixar de seguir aquest grup des de la seva pàgina de perfil.
+          email_outro: Reps aquesta notificació perquè segueixes a "%{author_name}". Pots deixar de seguir aquest grup des de la seva pàgina de perfil.
           email_subject: Hi ha un nou comentari de %{author_name} en %{resource_title}
           notification_title: Hi ha un nou comentari per <a href="%{author_path}">%{author_name} %{author_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "S'ha comentat %{resource_title}. Pots llegir el comentari d'aquesta pàgina:"
-          email_outro: Has rebut aquesta notificació perquè estàs seguint "%{resource_title}" o la seva autora. Pots deixar de seguir-la des de l'enllaç anterior.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint el comentari "%{resource_title}" o la seva autora. Pots deixar de seguir-la des de l'enllaç anterior.
           email_subject: Hi ha un nou comentari de %{author_name} a %{resource_title}
           notification_title: Hi ha un nou comentari de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: El teu comentari a "%{resource_title}" ha rebut un vot negatiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
-          email_outro: Has rebut aquesta notificació perquè ets autora d'aquest comentari.
+          email_outro: Has rebut aquesta notificació perquè vas fer aquest comentari.
           email_subject: El teu comentari a "%{resource_title}" ha rebut un vot negatiu.
           notification_title: El teu <a href="%{resource_path}">comentari</a> a "%{resource_title}" ha rebut un vot negatiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
         comment_upvoted:
           email_intro: El teu comentari a "%{resource_title}" ha rebut un vot positiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
-          email_outro: Has rebut aquesta notificació perquè ets autora d'aquest comentari.
+          email_outro: Has rebut aquesta notificació perquè vas fer aquest comentari.
           email_subject: El teu comentari a "%{resource_title}" ha rebut un vot positiu.
           notification_title: El teu <a href="%{resource_path}">comentari</a> a "%{resource_title}" ha rebut un vot positiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
         reply_created:
@@ -153,12 +158,12 @@ ca:
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respost el teu comentari a <a href="%{resource_path}">%{resource_title}</a>
         user_group_mentioned:
           email_intro: Un grup al qual pertanys ha estat esmentat
-          email_outro: Has rebut aquesta notificació perquè formes part del grup %{group_name} que ha estat esmentat a %{resource_title}.
+          email_outro: Has rebut aquesta notificació perquè formes part del grup "%{group_name}" que ha estat esmentat a %{resource_title}.
           email_subject: T'han esmentat a %{resource_title} com a membre de %{group_name}
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> t'ha esmentat com a membre de <a href="%{group_path}">%{group_name} %{group_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Has estat esmentada
-          email_outro: Has rebut aquesta notificació perquè has estat esmentada a %{resource_title}.
+          email_outro: Has rebut aquesta notificació perquè t'han esmentat al comentari "%{resource_title}".
           email_subject: Has estat esmentada a %{resource_title}
           notification_title: Has estat esmentada a <a href="%{resource_path}">%{resource_title}</a> per <a href="%{author_path}">%{author_name} %{author_nickname}</a>
     metrics:

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: