decidim-comments 0.21.0 → 0.22.0

data/config/locales/sl.yml

@@ -0,0 +1,4 @@
+sl:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Komentar

data/config/locales/sr-CS.yml

@@ -0,0 +1,20 @@
+sr:
+  decidim:
+    components:
+      comment:
+        hide_replies: Sakrij odgovore
+        show_replies: Prikaži %{replies_count} odgovora
+        single_comment_link_title: Nabavi vezu ka jednom komentaru
+      comments:
+        comment_details_title: Detalji o komentaru
+        single_comment_warning: Možete videti ostale komentare <a href="%{url}">ovde</a>.
+        single_comment_warning_title: Vidite samo jedan komentar
+    events:
+      comments:
+        comment_by_followed_user_group:
+          email_intro: 'Grupa %{author_name} je ostavila komentar na %{resource_title}. Možete ga pročitati na ovoj strani:'
+        user_group_mentioned:
+          email_intro: Grupa kojoj pripadate je pomenuta
+          email_outro: Dobili ste ovo obaveštenje jer ste član grupe %{group_name} koja je pomenuta u %{resource_title}.
+          email_subject: Pomenuti ste u %{resource_title} kao član grupe %{group_name}
+          notification_title: Pomenuti ste u <a href="%{resource_path}">%{resource_title}</a> od strane <a href="%{author_path}">%{author_name}%{author_nickname}</a> kao član <a href="%{group_path}">%{group_name}%{group_nickname}</a>

data/config/locales/sv.yml

@@ -3,7 +3,8 @@ sv:
     models:
       decidim/comments/comment_by_followed_user_event: Kommentar
       decidim/comments/comment_created_event: Kommentar
-      decidim/comments/reply_created_event: Svarskommentar
+      decidim/comments/reply_created_event: Svar till en kommentar
+      decidim/comments/user_group_mentioned_event: Nämn
       decidim/comments/user_mentioned_event: Nämn
   activerecord:
     models:
@@ -16,6 +17,7 @@ sv:
   decidim:
     comments:
       comments: Kommentarer
+      comments_count: Antal kommentarer
       last_activity:
         new_comment_at_html: "<span>Ny kommentar på %{link}</span>"
       votes:
@@ -42,6 +44,7 @@ sv:
           against: Mot
           in_favor: För
         deleted_user: Raderad deltagare
+        hide_replies: Göm svar
         reply: Svara
         report:
           action: Rapportera
@@ -53,7 +56,9 @@ sv:
             does_not_belong: Innehåller olaglig aktivitet, självmordshot, personlig information eller något annat du tycker inte hör hemma på %{organization_name}.
             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 ett problem
+          title: Rapportera olämpligt innehåll
+        show_replies: Visa %{replies_count} svar
+        single_comment_link_title: Få länk till enstaka kommentar
       comment_order_selector:
         order:
           best_rated: Bästa betyg
@@ -66,8 +71,15 @@ sv:
       comments:
         blocked_comments_for_user_warning: Du kan inte kommentera just nu, men du kan läsa tidigare kommentarer.
         blocked_comments_warning: Kommentarer är inaktiverade just nu, men du kan läsa de föregående.
+        comment_details_title: Kommentarsdetaljer
         loading: Laddar kommentarer...
+        single_comment_warning: Läs återstående <a href="%{url}">kommentarer</a>.
+        single_comment_warning_title: Du visar en enda kommentar
         title: "%{count} kommentarer"
+      down_vote_button:
+        text: Jag håller inte med om denna kommentar
+      up_vote_button:
+        text: Jag instämmer i denna kommentar
     events:
       comments:
         comment_by_followed_user:
@@ -75,9 +87,14 @@ sv:
           email_outro: Du har fått den här notisen eftersom du följer %{author_name}. Du kan avfölja den här användaren från deras profilsida.
           email_subject: Det finns en ny kommentar av %{author_name} i %{resource_title}
           notification_title: Det finns en ny kommentar av <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>.
+        comment_by_followed_user_group:
+          email_intro: 'Gruppen %{author_name} har lämnat en kommentar i %{resource_title}. Du kan läsa den på denna sida:'
+          email_outro: Du har fått det här meddelandet eftersom du följer %{author_name}. Du kan sluta följa den här gruppen från dess profilsida.
+          email_subject: Det finns en ny kommentar av %{author_name} i %{resource_title}
+          notification_title: Det finns en ny kommentar av <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} har kommenterats. Du kan läsa kommentaren på den här sidan:"
-          email_outro: Du har fått den här meddelandet eftersom du följer "%{resource_title}" eller dess författare. Du kan avfölja det från föregående länk.
+          email_outro: Du har fått det här meddelandet eftersom du följer "%{resource_title}" eller dess författare. Du kan avfölja det från föregående länk.
           email_subject: Det finns en ny kommentar från %{author_name} i %{resource_title}
           notification_title: Det finns en ny kommentar från <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>
         reply_created:
@@ -85,6 +102,11 @@ sv:
           email_outro: Du har fått denna notis eftersom din kommentar blev besvarad.
           email_subject: "%{author_name} har svarat din kommentar i %{resource_title}"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> har svarat din kommentar i <a href="%{resource_path}">%{resource_title}</a>
+        user_group_mentioned:
+          email_intro: En grupp som du tillhör har nämnts
+          email_outro: Du har fått det här meddelandet eftersom du är medlem i gruppen %{group_name} som har nämnts i %{resource_title}.
+          email_subject: Du har nämnts i %{resource_title} som en medlem i %{group_name}
+          notification_title: Du har nämnts i <a href="%{resource_path}">%{resource_title}</a> av <a href="%{author_path}">%{author_name} %{author_nickname}</a> som medlem av <a href="%{group_path}">%{group_name} %{group_nickname}</a>
         user_mentioned:
           email_intro: Du har nämnts
           email_outro: Du har fått denna notis eftersom du har nämnts i %{resource_title}.

data/config/locales/tr-TR.yml

@@ -4,6 +4,7 @@ tr:
       decidim/comments/comment_by_followed_user_event: Yorum Yap
       decidim/comments/comment_created_event: Yorum Yap
       decidim/comments/reply_created_event: Yorum cevabı
+      decidim/comments/user_group_mentioned_event: Anma
       decidim/comments/user_mentioned_event: Anma
   activerecord:
     models:
@@ -53,7 +54,6 @@ tr:
             does_not_belong: Yasadışı faaliyet, intihar tehditleri, kişisel bilgiler veya %{organization_name}ait olmadığını düşündüğünüz başka bir şey içerir.
             offensive: Irkçılık, cinsiyetçilik, hakaretler, kişisel saldırılar, ölüm tehditleri, intihar talepleri veya herhangi bir nefret söylemi içerir.
             spam: Clickbait, reklam, dolandırıcılık veya script botları içerir.
-          title: Sorun bildir
       comment_order_selector:
         order:
           best_rated: En çok oy alan
@@ -75,6 +75,9 @@ tr:
           email_outro: '%{author_name}takip ettiğiniz için bu bildirimi aldınız. Bu kullanıcıyı profil sayfasından takip edebilirsiniz.'
           email_subject: '%{author_name} %{resource_title}tarafından yeni bir yorum var'
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> tarafından <a href="%{resource_path}">%{resource_title}</a>yeni bir yorum var.
+        comment_by_followed_user_group:
+          email_subject: '%{author_name} %{resource_title}tarafından yeni bir yorum var'
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> tarafından <a href="%{resource_path}">%{resource_title}</a>yeni bir yorum var.
         comment_created:
           email_intro: "%{resource_title} yorum yapıldı. Bu sayfadaki yorumu okuyabilirsiniz:"
           email_outro: '"%{resource_title}" veya yazarı takip ettiğiniz için bu bildirimi aldınız. Bunu önceki linkten takip edebilirsiniz.'

data/config/locales/uk.yml

@@ -4,6 +4,7 @@ uk:
       decidim/comments/comment_by_followed_user_event: Коментар
       decidim/comments/comment_created_event: Коментар
       decidim/comments/reply_created_event: Відповідь на коментар
+      decidim/comments/user_group_mentioned_event: Згадка
       decidim/comments/user_mentioned_event: Згадка
   activerecord:
     models:
@@ -55,7 +56,6 @@ uk:
             does_not_belong: Містить незаконну діяльність, загрози самогубства, особисті відомості чи ще щось, неприпустиме, на вашу думку, для %{organization_name}.
             offensive: Містить расизм, сексизм, образи, особисті напади, погрози вбивства, заяви про самогубство або будь-які ненависницькі висловлювання.
             spam: Містить клацоловки (маніпулятивно-сенсаційні заголовки), рекламу, афери або лохотрони.
-          title: Поскаржитись на ускладнення
       comment_order_selector:
         order:
           best_rated: З найкращим рейтингом
@@ -76,6 +76,9 @@ uk:
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_name}. Ви можете припинити стежити за ним на сторінці його профілю.
           email_subject: У %{resource_title} з'явився новий коментар від %{author_name}
           notification_title: У <a href="%{resource_path}">%{resource_title}</a> з'явився новий коментар від <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+        comment_by_followed_user_group:
+          email_subject: У %{resource_title} з'явився новий коментар від %{author_name}
+          notification_title: У <a href="%{resource_path}">%{resource_title}</a> з'явився новий коментар від <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         comment_created:
           email_intro: "%{resource_title} прокоментували. Ви можете прочитати коментар на сторінці:"
           email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{resource_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.

data/db/migrate/20200320105911_index_foreign_keys_in_decidim_comments_comments.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimCommentsComments < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_comments_comments, :decidim_user_group_id
+  end
+end

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

@@ -12,10 +12,16 @@ shared_context "when it's a comment event" do
 
   let(:comment) { create :comment }
   let(:comment_author) { comment.author }
+  let(:normalized_comment_author) { comment.author }
   let(:comment_author_name) { decidim_html_escape comment.author.name }
 
   let(:extra) { { comment_id: comment.id } }
   let(:resource_title) { decidim_html_escape resource.title }
+  let(:user_group) do
+    user_group = create(:user_group, :verified, organization: organization, users: [comment_author])
+    comment.update!(user_group: user_group)
+    user_group
+  end
 end
 
 shared_examples_for "a comment event" do
@@ -23,7 +29,11 @@ shared_examples_for "a comment event" do
 
   describe "author" do
     it "returns the comment author" do
-      expect(subject.author).to eq(comment_author)
+      if defined? user_group_author
+        expect(subject.author).to eq(user_group_author)
+      else
+        expect(subject.author).to eq(comment_author)
+      end
     end
   end
 

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

@@ -16,7 +16,8 @@ RSpec.shared_context "when creating a comment" do
       "comment" => {
         "body" => body,
         "alignment" => alignment,
-        "user_group_id" => user_group_id
+        "user_group_id" => user_group_id,
+        "commentable" => commentable
       }
     }
   end
@@ -27,5 +28,5 @@ RSpec.shared_context "when creating a comment" do
       current_organization: organization
     )
   end
-  let(:command) { described_class.new(form, author, commentable) }
+  let(:command) { described_class.new(form, author) }
 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.21.0"
+      "0.22.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-09-01 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.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -101,9 +101,11 @@ files:
 - app/commands/decidim/comments/create_comment.rb
 - app/commands/decidim/comments/vote_comment.rb
 - app/events/decidim/comments/comment_by_followed_user_event.rb
+- app/events/decidim/comments/comment_by_followed_user_group_event.rb
 - app/events/decidim/comments/comment_created_event.rb
 - app/events/decidim/comments/comment_event.rb
 - app/events/decidim/comments/reply_created_event.rb
+- app/events/decidim/comments/user_group_mentioned_event.rb
 - app/events/decidim/comments/user_mentioned_event.rb
 - app/forms/decidim/comments/comment_form.rb
 - app/frontend/application/apollo_client.ts
@@ -165,9 +167,11 @@ files:
 - app/types/decidim/comments/commentable_type.rb
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
 - config/locales/el.yml
@@ -176,22 +180,35 @@ files:
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
 - config/locales/is-IS.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/lt-LT.yml
+- config/locales/lv-LV.yml
+- config/locales/mt-MT.yml
 - config/locales/nl.yml
 - config/locales/no.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -206,6 +223,7 @@ files:
 - db/migrate/20181003080320_fix_user_groups_ids_in_comments.rb
 - db/migrate/20181016142511_make_authors_polymorphic_for_comments.rb
 - db/migrate/20181019092928_make_author_polymorphic_for_comment_votes.rb
+- db/migrate/20200320105911_index_foreign_keys_in_decidim_comments_comments.rb
 - db/seeds.rb
 - lib/decidim/comments.rb
 - lib/decidim/comments/admin.rb