decidim-comments 0.27.0 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c6e52bf2d6fb82ec3a0ef63c1a19166171b0f36b11c50348147eb83df09e2a
-  data.tar.gz: e1830e662a9498d68f8104382506b74b47a59124ffdf2519fc3de6a4b58753ea
+  metadata.gz: c33bb43a97ef32ce38b5ee6db581b98f6128d146dfcbf1f44beb9d3a77650a29
+  data.tar.gz: 5ae194dd99009f8f73d1bbf6f037c24ab99367b770f18c07e4717b3defbdcd0c
 SHA512:
-  metadata.gz: 1d9c728231a9257cd5d2d61757df644fe9297c72c3ecdf6d5a34387ae212876ee2596b1946100ffaaafdd7662ec82bc4aefab408ceca6be36a537995756409ca
-  data.tar.gz: f874636ccc380e12d2f844c0e4b15a02e60e5f2416ffd20bdaa215965dcea80dc460ecdc3c5cf4aedae8afa93d32f92bf983a6d3e335637507921dd261ad1aa0
+  metadata.gz: 8be83a46d1b5e25a503dcbdc5008cdc66626ee308ab5e79f275ce8636520b69518db1168eb647f25313aca72d368a69f3430224d7a0d989e8ca894fb96beb98b
+  data.tar.gz: 9e3e0874809a1d523a1bfbdd34768997ae591bb82dda1b7f22dace5fd248d1cfea76630f52a861bd40d1e881ab19a2e8f43657753fe490e7911a7a045f0baa4e

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

@@ -56,8 +56,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
@@ -81,6 +79,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
@@ -131,6 +133,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/app/packs/src/decidim/comments/comments.component.js

@@ -43,7 +43,10 @@ export default class CommentsComponent {
       this.mounted = true;
       this._initializeComments(this.$element);
       if (!this.singleComment) {
-        this._fetchComments();
+        $(".add-comment textarea", this.$element).prop("disabled", true);
+        this._fetchComments(() => {
+          $(".add-comment textarea", this.$element).prop("disabled", false);
+        });
       }
 
       $(".order-by__dropdown .is-submenu-item a", this.$element).on("click.decidim-comments", () => this._onInitOrder());
@@ -215,10 +218,11 @@ export default class CommentsComponent {
    * Sends an ajax request based on current
    * params to get comments for the component
    * @private
+   * @param {Function} successCallback A callback that is called after a
+   *   successful fetch
    * @returns {Void} - Returns nothing
    */
-  _fetchComments() {
-    $(".add-comment textarea", this.$element).prop("disabled", true);
+  _fetchComments(successCallback = null) {
     Rails.ajax({
       url: this.commentsUrl,
       type: "GET",
@@ -231,7 +235,9 @@ export default class CommentsComponent {
         ...(this.lastCommentId && { "after": this.lastCommentId })
       }),
       success: () => {
-        $(".add-comment textarea", this.$element).prop("disabled", false);
+        if (successCallback) {
+          successCallback();
+        }
         this._pollComments();
       }
     });

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

@@ -418,6 +418,21 @@ describe("CommentsComponent", () => {
     expect(window.setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 1000);
   });
 
+  it("does not disable the textarea when polling comments normally", () => {
+    Rails.ajax.mockImplementationOnce((options) => options.success());
+
+    subject.mountComponent();
+
+    // Delay the success call 2s after the polling has happened to test that
+    // the textarea is still enabled when the polling is happening.
+    Rails.ajax.mockImplementationOnce((options) => {
+      setTimeout(options.success(), 2000);
+    });
+    jest.advanceTimersByTime(1500);
+
+    expect($(`${selector} .add-comment textarea`).prop("disabled")).toBeFalsy();
+  });
+
   describe("when mounted", () => {
     beforeEach(() => {
       spyOnAddComment("on");

data/config/locales/eu.yml

@@ -4,14 +4,15 @@ 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/reply_created_event: Iruzkinaren erantzuna
-      decidim/comments/user_group_mentioned_event: Aipatu
-      decidim/comments/user_mentioned_event: Aipatu
+      decidim/comments/user_group_mentioned_event: Aipamena
+      decidim/comments/user_mentioned_event: Aipamena
   activerecord:
     models:
       decidim/comments/comment:
         one: Iruzkina
-        other: Oharrak
+        other: Iruzkinak
       decidim/comments/comment_vote:
         one: Bozkatu
         other: Botoak
@@ -21,7 +22,7 @@ eu:
         shared:
           availability_fields:
             enabled: Iruzkinak gaituta
-            end_time: Iruzkinak noiz arte aktibatuta
+            end_time: Iruzkinak gaituta daude
             start_time: Iruzkinak noiztik aktibatuta
       comments:
         create:
@@ -37,7 +38,7 @@ eu:
       view: Bistaratu
       votes:
         create:
-          error: Erroreak gertatu dira iruzkina bozkatzean.
+          error: Arazo bat dago iruzkina bozkatzeko.
     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.
@@ -67,10 +68,11 @@ eu:
         confirm_destroy: Ziur zaude iruzkin hau ezabatu nahi duzula?
         delete: Ezabatu
         deleted_at: Iruzkina ezabatu da data honetan %{date}
-        deleted_user: Erabiltzaile ezabatua
+        deleted_user: Parte hartzaile ezabatua
         edit: Editatu
         edited: Editatuta
         hide_replies: Ezkutatu erantzunak
+        moderated_at: Iruzkina %{date}-an moderatu egin da
         reply: Erantzuna
         report:
           action: Salatu
@@ -84,7 +86,7 @@ eu:
             spam: Bertan badago clickbait-ik, publizitaterik edo iruzurrik.
           title: Jakinarazi eduki desegokia
         show_replies: Erakutsi %{replies_count} erantzun
-        single_comment_link_title: Lortu lotura
+        single_comment_link_title: Lortu esteka
       comment_order_selector:
         order:
           best_rated: Balorazio hoberenak
@@ -102,6 +104,9 @@ eu:
         loading: Iruzkinak kargatzen...
         single_comment_warning: <a href="%{url}">k erakusten ditu iruzkin guztiak</a>
         single_comment_warning_title: Iruzkin bakar bat ikusten ari zara
+        title:
+          one: "%{count} iruzkin"
+          other: "%{count} iruzkin"
       down_vote_button:
         text: Ez nago ados iruzkin honekin
       edit_comment_modal_form:
@@ -117,15 +122,15 @@ eu:
     events:
       comments:
         comment_by_followed_user:
-          email_intro: "%{author_name} iruzkin bat utzi du %{resource_title}helbidean. Orri honetan irakur dezakezu:"
-          email_outro: Jakinarazpena jaso duzu %{author_name}jarraituz gero. Erabiltzaile hau bere profileko orrialdetik jarrai dezakezu.
+          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. Erabiltzaile horri profil-orrialdetik ez jarraitu.
           email_subject: '%{author_name} %{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.
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a>-en iruzkin berri bat dagon <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} %{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} 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.
         comment_created:
           email_intro: "%{resource_title} iruzkindu da. Orri honetan iruzkina irakur dezakezu:"
           email_outro: Jakinarazpen hau jaso duzu "%{resource_title}" edo bere egilea jarraitzen duzulako. Aurreko esteka estekan jarrai dezakezu.
@@ -135,26 +140,26 @@ eu:
           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.
           email_subject: Zure iruzkina hemen "%{resource_title}" negatiboki bozkatu da.
-          notification_title: Zure iruzkina <a href="%{resource_path}">comentario</a> hemen "%{resource_title}" negatiboki bozkatu da. Orain guztira %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu.
+          notification_title: Zure <a href="%{resource_path}">iruzkina</a> hemen "%{resource_title}" negatiboki bozkatu da. Orain guztira %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu.
         comment_upvoted:
           email_intro: Zure iruzkina hemen "%{resource_title}" positiboki bozkatu da. Orain guztira %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu.
           email_outro: Jakinarazpen hau jaso duzu iruzkin honen egilea zarelako.
           email_subject: Zure iruzkina hemen "%{resource_title}" positiboki bozkatu da.
-          notification_title: Zure iruzkina hemen <a href="%{resource_path}">comentario</a> en "%{resource_title}" positiboki bozkatu da. Orain guztira %{upvotes} botos positibo eta %{downvotes} boto negatibo dituzu.
+          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_outro: Jakinarazpen hau jaso duzu zure iruzkina erantzun delako.
-          email_subject: "%{author_name} zure iruzkina erantzun du %{resource_title} zenbakian"
+          email_subject: "%{author_name}-k zure iruzkina erantzun du %{resource_title} zenbakian"
           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: Zu barne zauden talde bat aipatu da
-          email_outro: Jakinarazpen hau jaso duzu hemen %{resource_title} aipatu den %{group_name} taldearen kidea zarelako.
+          email_intro: Zure talde bat aipatu dute
+          email_outro: '%{resource_title}-an aipatutako %{group_name} taldeko kidea zarelako jaso duzu jakinarazpen hau.'
           email_subject: Hemen %{resource_title} aipatu zaituzte %{group_name} taldearen kide gisa
           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: Esan zaizu
+          email_intro: Aipatu zaituzte
           email_outro: Jakinarazpena jaso duzu %{resource_title} delakoan aipatu duzulako.
-          email_subject: '%{resource_title} aipatu zaituzte'
+          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.
     metrics:
       comments:

data/config/locales/gn-PY.yml

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

data/config/locales/ka-GE.yml

@@ -0,0 +1 @@
+ka:

data/config/locales/lo-LA.yml

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

data/config/locales/pl.yml

@@ -21,6 +21,10 @@ pl:
         other: Głosy
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            start_time: Komentowanie możliwe od
       comments:
         create:
           error: Wystąpił błąd podczas tworzenia komentarza.

data/config/locales/ro-RO.yml

@@ -4,6 +4,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ă
@@ -73,6 +74,7 @@ ro:
         edit: Editează
         edited: Editat
         hide_replies: Ascunde răspunsurile
+        moderated_at: Comentariu moderat pe %{date}
         reply: Răspunde
         report:
           action: Raportează

data/config/locales/sv.yml

@@ -4,6 +4,7 @@ sv:
     models:
       decidim/comments/comment_by_followed_user_event: Kommentar
       decidim/comments/comment_created_event: Kommentar
+      decidim/comments/comment_upvoted_event: Kommentar uppröstad
       decidim/comments/reply_created_event: Svar till en kommentar
       decidim/comments/user_group_mentioned_event: Nämn
       decidim/comments/user_mentioned_event: Nämn
@@ -71,6 +72,7 @@ sv:
         edit: Redigera
         edited: Redigerad
         hide_replies: Göm svar
+        moderated_at: Kommentar modererad den %{date}
         reply: Svara
         report:
           action: Rapportera

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.27.0"
+      "0.27.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.2
 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: 2023-02-13 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.0
+        version: 0.27.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.2
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.2
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -197,6 +197,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
@@ -205,10 +206,12 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
+- config/locales/ka-GE.yml
 - config/locales/ko-KR.yml
 - 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
@@ -305,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Decidim comments module