decidim-comments 0.26.3 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e65e556105c975a512cf38512249fa956e3d3cf26c3e78b5cda7af52b98383e3
-  data.tar.gz: 03d678132d3530bdbf4ee57633da83cfd245c31e6bac7b1a131baa5ca7466fb6
+  metadata.gz: f0afed8636ad281b3e5cb440eb37b2080d40cb4386a9561125d209887feadba1
+  data.tar.gz: 6fb8da27ed3e66447361539cdafa40123e2835152d450f5fc5602ea35b5a29d7
 SHA512:
-  metadata.gz: 0e9b996fe98034ccf8c532c285b418e13fbd83ddb5be3e6f6000215d298138442c43f4e0461b47dbcb27bfad2e64cb63b330a08583baa915578e1d5908224120
-  data.tar.gz: 62c58afe19b0d2afc75f1d0771cc5d484c250ea94e3dd242a8a6897f0f8dd0c92b654972311a0e58e12e2c2a75c9e267d40a7bb85c612eab964ee77ba37f85b3
+  metadata.gz: 3de3452f8cbaa4b35f624a9ea896a0a3d9c7a0788eadd77e7c7e053c37b3947f586b456dfef2c7bda7785eb395b7fe9233d919b9873e0523c6ae101b3ba91581
+  data.tar.gz: 5498dd2599639550040190fe261fec3e790a078be78deb46c699e77f60782bec7e3d366e57856ad3d8d7d374727a96eab8cc6454e618e5547fcfc3d82a6356f7

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

@@ -53,8 +53,6 @@ module Decidim
       validate :body_length
       validate :commentable_can_have_comments
 
-      delegate :organization, to: :commentable
-
       scope :not_deleted, -> { where(deleted_at: nil) }
 
       translatable_fields :body
@@ -78,6 +76,10 @@ module Decidim
         where(alignment: -1)
       end
 
+      def organization
+        commentable&.organization || participatory_space&.organization
+      end
+
       def visible?
         participatory_space.try(:visible?) && component.try(:published?)
       end
@@ -128,6 +130,8 @@ module Decidim
 
       # Public: Overrides the `reported_content_url` Reportable concern method.
       def reported_content_url
+        return unless root_commentable
+
         url_params = { anchor: "comment_#{id}" }
 
         if root_commentable&.respond_to?(:polymorphic_resource_url)

data/config/locales/gn-PY.yml

@@ -0,0 +1 @@
+gn:

data/config/locales/lo-LA.yml

@@ -0,0 +1 @@
+lo:

data/config/locales/ro-RO.yml

@@ -3,6 +3,7 @@ ro:
     models:
       decidim/comments/comment_by_followed_user_event: Comentariu
       decidim/comments/comment_created_event: Comentează
+      decidim/comments/comment_upvoted_event: Comentariu votat
       decidim/comments/reply_created_event: Răspuns la comentariu
       decidim/comments/user_group_mentioned_event: Menționează
       decidim/comments/user_mentioned_event: Menționează
@@ -72,6 +73,7 @@ ro:
         edit: Editează
         edited: Editat
         hide_replies: Ascunde răspunsurile
+        moderated_at: Comentariu moderat pe %{date}
         reply: Răspunde
         report:
           action: Raportează

data/lib/decidim/comments/markdown.rb

@@ -50,6 +50,18 @@ module Decidim
 
         "<p>#{text}</p>"
       end
+
+      # Prevents underscores to be replaced with <em> tags in comments, such as
+      # https://github.com/org/module_with_underscores or within words such as
+      # "Look for comment_maximum_length in the code". The `no_intra_emphasis`
+      # option for Redcarpet does not apparently work for this renderer.
+      #
+      # Related issues:
+      # https://github.com/vmg/redcarpet/issues/402
+      # https://github.com/vmg/redcarpet/issues/427
+      def emphasis(text)
+        "_#{text}_"
+      end
     end
   end
 end

data/lib/decidim/comments/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.26.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-11-15 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.26.3
+        version: 0.26.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.4
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -196,6 +196,7 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -208,6 +209,7 @@ files:
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
+- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml