decidim-comments 0.27.4 → 0.27.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98316c17e51a4805c01a6e83a9e1a2ad76a5859b0013e9b78c569c49644da50c
-  data.tar.gz: 05ed7977b512e18df994f8b4a88665ed0889debfacb57f991486bc78b4962f44
+  metadata.gz: 818d04b7eefe94a674bd210a31011829ba09e6df1059695a345a2046b4147d70
+  data.tar.gz: 5de4aa55452b6912385a483e92295bcc0a713141485b43a9d97c6bac51a22065
 SHA512:
-  metadata.gz: 5af106aa754874a212337f353d8bdddde35e09f6894dd678cb85353de237e1cf681e9914b189fdddf1c8f7e8e4dd86fb7301879426641cc1b09de0aaa6d7f660
-  data.tar.gz: 828e037c123045bfa0bed0e39a65891a0f67eb39f712d03a74d11f512d533721b4fbf63c49d7b76e5686951c90c8cc241e58aca0e23a50b0958e519d0bb5117a
+  metadata.gz: 867ee377607aad693860a83d7a92d4fc3147e43ffbbcdf5c7c5c49d7ba53d65b9d4614d9ecbec287cde1d05c9aea577a707238745b0aa65327874625d9a2a91a
+  data.tar.gz: 5718f8b9a21de23c12d0727a633859d2a6daf4a76a727115b9bae2f20f73a3de52fd417a6c348ec4f6eeff7611b2abba41c9a18152130e0d94034a8c6b4023bc

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

@@ -47,6 +47,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)
@@ -146,11 +148,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
@@ -166,11 +168,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_form_cell.rb

@@ -84,13 +84,13 @@ module Decidim
       def component_comments_max_length
         return unless model.component&.settings.respond_to?(:comments_max_length)
 
-        model.component.settings.comments_max_length if model.component.settings.comments_max_length.positive?
+        model.component.settings.comments_max_length if model.component.settings.comments_max_length.to_i.positive?
       end
 
       def organization_comments_max_length
         return unless organization
 
-        organization.comments_max_length if organization.comments_max_length.positive?
+        organization.comments_max_length if organization.comments_max_length.to_i.positive?
       end
 
       def organization

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

@@ -29,6 +29,7 @@ module Decidim
       translatable_fields :body
 
       parent_item_foreign_key :decidim_commentable_id
+      parent_item_polymorphic_type_key :decidim_commentable_type
 
       belongs_to :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", polymorphic: true
       belongs_to :root_commentable, foreign_key: "decidim_root_commentable_id", foreign_type: "decidim_root_commentable_type", polymorphic: true, touch: true
@@ -121,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: up_votes_count, down_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/config/locales/bg.yml

@@ -5,3 +5,26 @@ bg:
       decidim/comments/comment_by_followed_user_event: Коментар
       decidim/comments/comment_created_event: Коментар
       decidim/comments/reply_created_event: Отговор на коментар
+  decidim:
+    comments:
+      comments:
+        delete:
+          error: Коментарът не можа да бъде изтрит.
+      comments_count: Брой коментари
+      last_activity:
+        new_comment_at_html: "<span>Нов коментар на %{link}</span>"
+      view: Преглед
+    components:
+      add_comment_form:
+        account_message: <a href="%{sign_in_url}">Влезте с Вашия профил</a> или <a href="%{sign_up_url}">се регистрирайте</a>, за да добавите коментара си.
+        form:
+          form_error: Текстът е задължителен и не може да е по-дълъг от %{length} символа.
+      comment:
+        report:
+          reasons:
+            does_not_belong: Съдържа незаконни дейности, заплахи за самоубийство, лична информация или нещо друго, което считате, че е неподходящо за %{organization_name}.
+      comment_thread:
+        title: Разговор с %{authorName}
+  errors:
+    messages:
+      cannot_have_comments: не може да има коментари

data/config/locales/ca.yml

@@ -125,27 +125,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:
@@ -155,12 +155,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/de.yml

@@ -65,7 +65,7 @@ de:
         alignment:
           against: Gegen
           in_favor: Zugunsten
-        confirm_destroy: Bist du sicher, dass du diesen Kommentar löschen willst?
+        confirm_destroy: Sind Sie sich sicher, dass Sie diesen Kommentar löschen möchten?
         delete: Löschen
         deleted_at: Kommentar gelöscht am %{date}
         deleted_user: Gelöschter Benutzer

data/config/locales/es.yml

@@ -125,7 +125,7 @@ es:
       comments:
         comment_by_followed_user:
           email_intro: "%{author_name} ha dejado un comentario en %{resource_title}. Puedes leerlo en esta página:"
-          email_outro: Has recibido esta notificación porque sigues "%{author_name}". Puedes dejar de seguir a esta participante desde su página de perfil.
+          email_outro: Has recibido esta notificación porque sigues a "%{author_name}". Puedes dejar de seguir a esta participante desde su página de perfil.
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
           notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>.
         comment_by_followed_user_group:
@@ -135,32 +135,32 @@ es:
           notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} ha sido comentado. Puedes leer el comentario en esta página:"
-          email_outro: Has recibido esta notificación porque está siguiendo "%{resource_title}" o su autora. Puedes dejar de seguirla desde el enlace anterior.
+          email_outro: Has recibido esta notificación porque estás siguiendo el comentario "%{resource_title}" o a su autora. Puedes dejar de seguirla desde el enlace anterior.
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
           notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Tu comentario en "%{resource_title}" ha sido votado negativamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
-          email_outro: Has recibido esta notificación porque eres la autora de este comentario.
+          email_outro: Has recibido esta notificación porque hiciste este comentario.
           email_subject: Su comentario en "%{resource_title}" ha sido votado negativamente.
           notification_title: Tu <a href="%{resource_path}">comentario</a> en "%{resource_title}" ha sido votado negativamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
         comment_upvoted:
           email_intro: Tu comentario en "%{resource_title}" ha sido votado postivamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
-          email_outro: Has recibido esta notificación porque eres la autora de este comentario.
+          email_outro: Has recibido esta notificación porque hiciste este comentario.
           email_subject: Tu comentario en "%{resource_title}" ha sido votado positivamente.
           notification_title: Tu <a href="%{resource_path}">comentario</a> en "%{resource_title}" ha sido votado positivamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
         reply_created:
           email_intro: "%{author_name} ha respondido a tu comentario en %{resource_title}. Puedes leerlo en esta página:"
-          email_outro: Has recibido esta notificación porque tu comentario fue respondido.
+          email_outro: Has recibido esta notificación porque han respondido a tu comentario.
           email_subject: "%{author_name} ha respondido a tu comentario en %{resource_title}"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respondido a tu comentario en <a href="%{resource_path}">%{resource_title}</a>
         user_group_mentioned:
           email_intro: Se ha mencionado un grupo al que perteneces
-          email_outro: Has recibido esta notificación porque formas parte del grupo %{group_name} que ha sido mencionado en %{resource_title}.
+          email_outro: Has recibido esta notificación porque formas parte del grupo "%{group_name}" que ha sido mencionado en "%{resource_title}".
           email_subject: Te han mencionado en %{resource_title} como miembro de %{group_name}
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> te ha mencionado en <a href="%{resource_path}">%{resource_title}</a> como miembro de <a href="%{group_path}">%{group_name} %{group_nickname}</a>
         user_mentioned:
           email_intro: Has sido mencionada
-          email_outro: Has recibido esta notificación porque has sido mencionada en %{resource_title}.
+          email_outro: Has recibido esta notificación porque te han mencionado en el comentario "%{resource_title}".
           email_subject: Has sido mencionada en %{resource_title}
           notification_title: Has sido mencionada en <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
     metrics:

data/config/locales/eu.yml

@@ -4,7 +4,7 @@ eu:
     models:
       decidim/comments/comment_by_followed_user_event: Iruzkina
       decidim/comments/comment_created_event: Iruzkina
-      decidim/comments/comment_upvoted_event: Iruzkina bozkatu da
+      decidim/comments/comment_upvoted_event: Iruzkina positiboki baloratua
       decidim/comments/reply_created_event: Iruzkinaren erantzuna
       decidim/comments/user_group_mentioned_event: Aipamena
       decidim/comments/user_mentioned_event: Aipamena
@@ -26,19 +26,19 @@ eu:
             start_time: Iruzkinak noiztik aktibatuta
       comments:
         create:
-          error: Arazoa gertatu da iruzkina sortzean.
+          error: Arazo bat egon da iruzkina sortzean.
         delete:
           error: Iruzkina ezin izan da ezabatu.
         update:
-          error: Arazoa gertatu da iruzkina eguneratzean.
+          error: Arazo bat ego da iruzkina eguneratzean.
       comments_count: Iruzkin kopurua
-      comments_title: Oharrak
+      comments_title: Iruzkinak
       last_activity:
-        new_comment_at_html: "<span>Iruzkin berria %{link}</span>"
+        new_comment_at_html: "<span>Beste iruzkin bat hemen: %{link}</span>"
       view: Bistaratu
       votes:
         create:
-          error: Arazo bat dago iruzkina bozkatzeko.
+          error: Arazo bat egon da iruzkina bozkatzean.
     components:
       add_comment_form:
         account_message: <a href="%{sign_in_url}">Hasi saioa zure kontuarekin</a> o <a href="%{sign_up_url}">erregistratu</a> zure iruzkina txertatzeko.
@@ -60,7 +60,7 @@ eu:
           positive_selected: Zure iritzia gai honi buruz positiboa da
         remaining_characters: "%{count} karaktere geratzen dira"
         remaining_characters_1: "karaktere %{count} geratzen da"
-        title: Egin hemen zure iruzkina
+        title: Gehitu zure iruzkina
       comment:
         alignment:
           against: Aurka
@@ -68,7 +68,7 @@ eu:
         confirm_destroy: Ziur zaude iruzkin hau ezabatu nahi duzula?
         delete: Ezabatu
         deleted_at: Iruzkina ezabatu da data honetan %{date}
-        deleted_user: Parte hartzaile ezabatua
+        deleted_user: Parte-hartzailea ezabatua
         edit: Editatu
         edited: Editatuta
         hide_replies: Ezkutatu erantzunak
@@ -91,7 +91,7 @@ eu:
         single_comment_link_title: Lortu esteka
       comment_order_selector:
         order:
-          best_rated: Balorazio hoberenak
+          best_rated: Balorazio onenak
           most_discussed: Eztabaidatuenak
           older: Zaharrenak
           recent: Berrienak
@@ -126,18 +126,18 @@ eu:
         comment_by_followed_user:
           email_intro: "%{author_name} egileak iruzkin bat utzi du %{resource_title} helbidean. Orri honetan irakur dezakezu:"
           email_outro: Jakinarazpen hau jaso duzu %{author_name} erabiltzailea jarraitzen duzulako. Nahi izatekotan erabiltzaile hori bere profil-orritik jarraitzeari utz diezaiokezu.
-          email_subject: '%{author_name} %{resource_title} iruzkin berri bat dago'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a>-en iruzkin berri bat dagon <a href="%{resource_path}">%{resource_title}</a>-an.
+          email_subject: '%{author_name} k beste iruzkin bat egin du hemen: %{resource_title}'
+          notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> k iruzkin berri bat egin du hemen: <a href="%{resource_path}">%{resource_title}</a>-an.'
         comment_by_followed_user_group:
           email_intro: '%{author_name} k iruzkin bat utzi du hemen %{resource_title}. Orrialde honetan irakur dezakezu:'
           email_outro: Jakinarazpena jaso duzu "%{author_name}" jarraitzen ari zarelako. Jarraitzeari utzi ahal diozu bere perfileko orrialdetik.
-          email_subject: '%{author_name} egileak iruzkin berri bat utzi du %{resource_title}-an'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a>egileak iruzkin berri bat utzi du <a href="%{resource_path}">%{resource_title}</a>-an.
+          email_subject: '%{author_name} egileak iruzkin berri bat utzi du hemen: %{resource_title}'
+          notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a>egileak iruzkin berri bat utzi du hemen: <a href="%{resource_path}">%{resource_title}</a>-an.'
         comment_created:
-          email_intro: "%{resource_title} iruzkindu da. Orri honetan iruzkina irakur dezakezu:"
+          email_intro: "%{resource_title} iruzkindu da. Orri honetan irakur dezakezu iruzkina:"
           email_outro: Jakinarazpen hau jaso duzu "%{resource_title}" edo bere egilea jarraitzen duzulako. Aurreko estekan jarrai dezakezu.
-          email_subject: '%{author_name} ren %{resource_title} iruzkin berri bat dago'
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <a href="%{resource_path}">%{resource_title}</a> </a> iruzkin berri bat dago
+          email_subject: '%{author_name} k beste iruzkin berri bat egin du hemen: %{resource_title}'
+          notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> k iruzkin berri bat egin du hemen: <a href="%{resource_path}">%{resource_title}</a></a>'
         comment_downvoted:
           email_intro: Zure iruzkina hemen "%{resource_title}" negatiboki bozkatu da. Orain %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu guztira.
           email_outro: Jakinarazpen hau jaso duzu iruzkin honen egilea zarelako.
@@ -149,9 +149,9 @@ eu:
           email_subject: Zure iruzkina hemen "%{resource_title}" positiboki bozkatu da.
           notification_title: Zure <a href="%{resource_path}">iruzkina </a> "%{resource_title}"-an positiboki bozkatu da. Orain guztira %{upvotes} botos positibo eta %{downvotes} boto negatibo dituzu.
         reply_created:
-          email_intro: "%{author_name} zure iruzkina erantzun du %{resource_title}zenbakian. Orri honetan irakur dezakezu:"
+          email_intro: "%{author_name} k zure iruzkina erantzun du hemen: %{resource_title}. Orri honetan irakur dezakezu:"
           email_outro: Jakinarazpen hau jaso duzu zure iruzkina erantzun delako.
-          email_subject: "%{author_name}-k zure iruzkina erantzun du %{resource_title} zenbakian"
+          email_subject: "%{author_name}-k zure iruzkina erantzun du hemen: %{resource_title}"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> -k zure iruzkinari erantzun dio <a href="%{resource_path}">%{resource_title}</a>
         user_group_mentioned:
           email_intro: Zure talde bat aipatu dute
@@ -160,14 +160,14 @@ eu:
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> k aipatu zaitu hemen <a href="%{resource_path}">%{resource_title}</a> <a href="%{group_path}">%{group_name} %{group_nickname}</a> taldearen kide gisa
         user_mentioned:
           email_intro: Aipatu zaituzte
-          email_outro: Jakinarazpena jaso duzu %{resource_title} delakoan aipatu zaituztelako.
-          email_subject: '%{resource_title} delakoan aipatu zaituzte'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> <a href="%{author_path}">%{author_name} %{author_nickname}</a> bidez aipatu zaituzte.
+          email_outro: 'Jakinarazpen hau jaso duzu hemen: %{resource_title} aipatu zaituztelako.'
+          email_subject: 'Hemen: %{resource_title} aipatu zaituzte'
+          notification_title: 'Hemen: <a href="%{group_path}">%{group_name} %{group_nickname}</a> egile honek: <a href="%{author_path}">%{author_name} %{author_nickname}</a> aipatu zaitu'
     metrics:
       comments:
         description: Erabiltzaileek sortutako iruzkin kopurua
         object: iruzkinak
-        title: Oharrak
+        title: Iruzkinak
   errors:
     messages:
       cannot_have_comments: ezin zaio iruzkinik egin

data/config/locales/he-IL.yml

@@ -0,0 +1 @@
+he:

data/config/locales/hu.yml

@@ -27,6 +27,8 @@ hu:
       comments:
         create:
           error: Hiba történt a hozzászólás létrehozása során.
+        delete:
+          error: A hozzászólás nem törölhető.
         update:
           error: Hiba történt a hozzászólás frissítése során.
       comments_count: Hozzászólások száma
@@ -45,7 +47,7 @@ hu:
             label: Megjegyzés
             placeholder: Mit gondolsz erről?
           form_error: Kötelező kitölteni, és nem lehet hosszabb, mint %{length} karakter.
-          submit: Elküld
+          submit: Küldés
           user_group_id:
             label: 'Megjegyzés mint:'
         opinion:

data/config/locales/ja.yml

@@ -88,10 +88,10 @@ ja:
         single_comment_link_title: リンク取得
       comment_order_selector:
         order:
-          best_rated: 最高評価
-          most_discussed: 最も議論されたもの
+          best_rated: 評価の高い順
+          most_discussed: 議論数の多い順
           older: 古い順
-          recent: 最近のもの
+          recent: 新しい順
         title: '並び順：'
       comment_thread:
         title: '%{authorName} との会話'
@@ -130,7 +130,7 @@ ja:
           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_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>

data/config/locales/lt.yml

@@ -89,6 +89,11 @@ lt:
             offensive: Pateikiamoje informacijoje yra rasizmo, seksizmo, keiksmažodžių, asmeninių atakų, grasinimų ar kitokios neapykantos kalbos.
             spam: Pateikiamoje informacijoje yra reklamos, antraščių mąsalo ar apgavysčių.
           title: Pranešti apie netinkamą turinį
+        show_replies:
+          one: Rodyti atsakymą
+          few: Rodyti %{count} atsakymus
+          many: Rodyti %{count} atsakymus
+          other: Rodyti %{count} atsakymus
         single_comment_link_title: Gauti nuorodą
       comment_order_selector:
         order:

data/config/locales/pl.yml

@@ -4,6 +4,7 @@ pl:
     models:
       decidim/comments/comment_by_followed_user_event: Komentarz
       decidim/comments/comment_created_event: Komentarz
+      decidim/comments/comment_upvoted_event: Polubiono komentarz
       decidim/comments/reply_created_event: Odpowiedź na komentarz
       decidim/comments/user_group_mentioned_event: Wzmianka
       decidim/comments/user_mentioned_event: Wzmianka
@@ -24,6 +25,8 @@ pl:
       admin:
         shared:
           availability_fields:
+            enabled: Komentarze włączone
+            end_time: Komentarze włączone do
             start_time: Komentowanie możliwe od
       comments:
         create:
@@ -73,6 +76,7 @@ pl:
         edit: Edytuj
         edited: Edytowany
         hide_replies: Ukryj odpowiedzi
+        moderated_at: Komentarz moderowany dnia %{date}
         reply: Odpowiedz
         report:
           action: Zgłoś
@@ -85,6 +89,11 @@ pl:
             offensive: Promuje rasizm, seksizm, nienawiść, ataki osobiste, groźby śmierci, groźby samobójcze jakąkolwiek formę mowy nienawiści.
             spam: Zawiera clickbaity, reklamy, oszustwa lub skrypty botów.
           title: Zgłoś niewłaściwą treść
+        show_replies:
+          one: Pokaż odpowiedź
+          few: Pokaż %{count} odpowiedzi
+          many: Pokaż %{count} odpowiedzi
+          other: Pokaż %{count} odpowiedzi
         single_comment_link_title: Pobierz link
       comment_order_selector:
         order:
@@ -101,6 +110,7 @@ pl:
         blocked_comments_warning: Komentarze są w tej chwili wyłączone, ale możesz przeczytać poprzednie.
         comment_details_title: Szczegóły komentarza
         loading: Ładowanie komentarzy ...
+        single_comment_warning: <a href="%{url}">Zobacz wszystkie komentarze</a>
         single_comment_warning_title: Wyświetlasz teraz pojedynczy komentarz
         title:
           one: "%{count} komentarz"

data/config/locales/pt-BR.yml

@@ -4,6 +4,7 @@ pt-BR:
     models:
       decidim/comments/comment_by_followed_user_event: Comente
       decidim/comments/comment_created_event: Comentário
+      decidim/comments/comment_upvoted_event: Comentário valorizado positivamente
       decidim/comments/reply_created_event: Resposta
       decidim/comments/user_group_mentioned_event: Mencionar
       decidim/comments/user_mentioned_event: Mencionar
@@ -65,6 +66,7 @@ pt-BR:
         edit: Editar
         edited: Editado
         hide_replies: Ocultar respostas
+        moderated_at: Comentário moderado em %{date}
         reply: Resposta
         report:
           action: Relatório

data/config/locales/ro-RO.yml

@@ -71,9 +71,9 @@ ro:
         delete: Șterge
         deleted_at: Comentariu șters la %{date}
         deleted_user: Participant șters
-        edit: Editează
-        edited: Editat
-        hide_replies: Ascunde răspunsurile
+        edit: Actualizare
+        edited: Actualizat
+        hide_replies: Ascundeți răspunsurile
         moderated_at: Comentariu moderat pe %{date}
         reply: Răspunde
         report:
@@ -139,7 +139,7 @@ ro:
           notification_title: Există un comentariu nou de la <a href="%{author_path}">%{author_name} %{author_nickname}</a> pentru <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} a primit un comentariu. Poți citi comentariul pe această pagină:"
-          email_outro: Ai primit această notificare deoarece urmărești „%{resource_title}” sau pe autorii săi. Poți anula abonarea de la link-ul anterior.
+          email_outro: Ați primit această notificare deoarece urmăriți „%{resource_title}” sau pe autorii săi. Puteți anula abonarea de la link-ul anterior.
           email_subject: Există un nou comentariu de la %{author_name} pentru %{resource_title}
           notification_title: Există un nou comentariu de la <a href="%{author_path}">%{author_name} %{author_nickname}</a> pentru <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:

data/config/locales/sq-AL.yml

@@ -0,0 +1,39 @@
+---
+sq:
+  decidim:
+    components:
+      add_comment_form:
+        form:
+          user_group_id:
+            label: Komento si
+        opinion:
+          label: Mendimi jot mbi këtë temë
+          negative: Negativ
+          negative_selected: Mendimi jot mbi këtë temë është negativ
+          neutral: Neutral
+          neutral_selected: Mendimi jot mbi këtë temë është neutral
+          positive: Pozitiv
+          positive_selected: Mendimi jot mbi këtë temë është pozitiv
+        remaining_characters: "%{count} karaktere të mbetura"
+        remaining_characters_1: "%{count} karakter i mbetur"
+        title: Shto komentin tënd
+      comment:
+        alignment:
+          against: Kundër
+          in_favor: Pro
+        confirm_destroy: A je i sigurt që do ta fshish këtë koment?
+        delete: Fshi
+        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:
+          action: Raporto
+          already_reported: Kjo përmbajtje është raportuar nga të tjerë dhe do rishikohet nga administratorët.
+          close: Mbyll
+          description: Përmbajtje e papërshtatshme?
+          details: Komente të tjera
+          reasons:
+            offensive: Përmban racizëm, seksizëm, ofendime, sulme personale, kërcënime me vdekje, shtyrje për vetëvrasje apo forma të tjera të gjuhës së urrejtjes.

data/config/locales/sv.yml

@@ -85,6 +85,9 @@ sv:
             offensive: Innehåller rasism, sexism, skällsord, personliga attacker, dödshot, uppmaningar att begå självmord eller någon form av hatpropaganda.
             spam: Innehåller clickbait, reklam, bedrägerier eller skriptrobotar.
           title: Rapportera olämpligt innehåll
+        show_replies:
+          one: Visa svar
+          other: Visa %{count} svar
         single_comment_link_title: Hämta länk
       comment_order_selector:
         order:

data/config/locales/th-TH.yml

@@ -0,0 +1 @@
+th:

data/db/migrate/20240304092558_add_comment_vote_counter_cache_to_comments.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddCommentVoteCounterCacheToComments < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_comments_comments, :up_votes_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_comments_comments, :down_votes_count, :integer, null: false, default: 0, index: true
+
+    # We cannot use the reset_counters as up_votes and down_votes are scoped associationws
+    reversible do |dir|
+      dir.up do
+        Decidim::Comments::Comment.reset_column_information
+        Decidim::Comments::Comment.find_each do |record|
+          # rubocop:disable Rails/SkipsModelValidations
+          record.class.update_counters(record.id, up_votes_count: record.up_votes.length)
+          record.class.update_counters(record.id, down_votes_count: record.down_votes.length)
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+      end
+    end
+  end
+end

data/decidim-comments.gemspec

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "decidim/comments/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.version = Decidim::Comments.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://github.com/decidim/decidim"
+  s.required_ruby_version = "~> 3.0.0"
+
+  s.name = "decidim-comments"
+  s.summary = "Decidim comments module"
+  s.description = "Pluggable comments system for some components."
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "decidim-core", Decidim::Comments.version
+  s.add_dependency "redcarpet", "~> 3.5", ">= 3.5.1"
+
+  s.add_development_dependency "decidim-admin", Decidim::Comments.version
+  s.add_development_dependency "decidim-dev", Decidim::Comments.version
+end

data/lib/decidim/api/comment_type.rb

@@ -58,7 +58,7 @@ module Decidim
       end
 
       def up_votes
-        object.up_votes.size
+        object.up_votes_count
       end
 
       def up_voted
@@ -66,7 +66,7 @@ module Decidim
       end
 
       def down_votes
-        object.down_votes.size
+        object.down_votes_count
       end
 
       def down_voted

data/lib/decidim/comments/comment_serializer.rb

@@ -33,7 +33,7 @@ module Decidim
 
       def root_commentable_url
         @root_commentable_url ||= if resource.root_commentable.respond_to?(:polymorphic_resource_url)
-                                    resource.root_commentable.polymorphic_resource_url
+                                    resource.root_commentable.polymorphic_resource_url({})
                                   else
                                     ResourceLocatorPresenter.new(resource.root_commentable).url
                                   end

data/lib/decidim/comments/comment_vote_serializer.rb

@@ -38,7 +38,7 @@ module Decidim
 
       def root_commentable_url
         @root_commentable_url ||= if resource.comment.root_commentable.respond_to?(:polymorphic_resource_url)
-                                    resource.comment.root_commentable.polymorphic_resource_url
+                                    resource.comment.root_commentable.polymorphic_resource_url({})
                                   else
                                     ResourceLocatorPresenter.new(resource.comment.root_commentable).url
                                   end

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

@@ -4,8 +4,11 @@ require "decidim/core/test/factories"
 
 FactoryBot.define do
   factory :comment, class: "Decidim::Comments::Comment" do
-    author { build(:user, organization: commentable.organization) }
-    commentable { build(:dummy_resource) }
+    transient do
+      skip_injection { false }
+    end
+    author { build(:user, organization: commentable.organization, skip_injection: skip_injection) }
+    commentable { build(:dummy_resource, skip_injection: skip_injection) }
     root_commentable { commentable }
     body { Decidim::Faker::Localized.paragraph }
     participatory_space { commentable.try(:participatory_space) }
@@ -25,22 +28,26 @@ FactoryBot.define do
     end
 
     trait :comment_on_comment do
-      author { build(:user, organization: root_commentable.organization) }
+      author { build(:user, organization: root_commentable.organization, skip_injection: skip_injection) }
       commentable do
         build(
           :comment,
           author: author,
           root_commentable: root_commentable,
-          commentable: root_commentable
+          commentable: root_commentable,
+          skip_injection: skip_injection
         )
       end
-      root_commentable { build(:dummy_resource) }
+      root_commentable { build(:dummy_resource, skip_injection: skip_injection) }
     end
   end
 
   factory :comment_vote, class: "Decidim::Comments::CommentVote" do
-    comment { build(:comment) }
-    author { build(:user, organization: comment.organization) }
+    transient do
+      skip_injection { false }
+    end
+    comment { build(:comment, skip_injection: skip_injection) }
+    author { build(:user, organization: comment.organization, skip_injection: skip_injection) }
     weight { [-1, 1].sample }
 
     trait :up_vote do

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

@@ -16,7 +16,7 @@ shared_context "when it's a comment event" do
   let(:comment_author_name) { decidim_html_escape comment.author.name }
 
   let(:extra) { { comment_id: comment.id } }
-  let(:resource_title) { decidim_html_escape(translated(resource.title)) }
+  let(:resource_title) { decidim_sanitize_translated(resource.title) }
   let(:user_group) do
     user_group = create(:user_group, :verified, organization: organization, users: [comment_author])
     comment.update!(user_group: user_group)

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

@@ -12,7 +12,7 @@ shared_examples_for "a comment voted event" do
   let(:comment_vote_author) { comment_vote.author }
 
   let(:extra) { { comment_id: comment.id, author_id: comment_vote_author.id, weight: weight, downvotes: 100, upvotes: 999 } }
-  let(:resource_title) { decidim_html_escape(translated(resource.title)) }
+  let(:resource_title) { decidim_sanitize_translated(resource.title) }
   let(:resource_text) { subject.resource_text }
 
   let(:verb) { weight.positive? ? "upvoted" : "downvoted" }

data/lib/decidim/comments/version.rb

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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.27.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2024-04-30 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.27.4
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -167,7 +167,6 @@ files:
 - app/views/decidim/comments/votes/create.js.erb
 - app/views/decidim/comments/votes/error.js.erb
 - config/assets.rb
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -200,6 +199,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -234,9 +234,11 @@ files:
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
+- config/locales/sq-AL.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/sw-KE.yml
+- config/locales/th-TH.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -261,7 +263,9 @@ files:
 - db/migrate/20200828101910_add_commentable_counter_cache_to_comments.rb
 - db/migrate/20210402124534_add_participatory_process_to_comments.rb
 - db/migrate/20210529095942_add_deleted_at_column_to_comments.rb
+- db/migrate/20240304092558_add_comment_vote_counter_cache_to_comments.rb
 - db/seeds.rb
+- decidim-comments.gemspec
 - lib/decidim/api/add_comment_type.rb
 - lib/decidim/api/comment_mutation_type.rb
 - lib/decidim/api/comment_type.rb
@@ -296,15 +300,15 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -312,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Decidim comments module
 test_files: []