decidim-debates 0.26.4 → 0.26.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b39f308f936b2245c903a844e8f1e2d6a6f5bfd92ec3b402bf0b2202d1c562de
-  data.tar.gz: 716023302bbd71ba8a23e037eeac6970fbea5aa40f99e5eb5a25fa75d73aba8a
+  metadata.gz: c0bca3a5f4858f1ce57bc1563e38c590ca9192051b4d1f1e7ccd521cd7a3e01b
+  data.tar.gz: dd0737e391a18e28f72ff37776ece47021ca228082f3ed92d8c8aea73f3eb9bf
 SHA512:
-  metadata.gz: 15ecaa1b25440d4a5546f1fcb67a4fc3fefa9532e90f6f9fdd3ef7c8d4241f6125ef54cd67ed01f27c3dfd941c1ca3f5f09aa12c2169f5a3aff451f499601537
-  data.tar.gz: 37167abbb0de6193e61021c1e3e06c0d9c41484b617e82012c559aeda930f459f596a0833e8b747b459c22c8ba366440327fc9c1cf45a12422cd8742a47f6385
+  metadata.gz: a8e0add1b8530a4dcc2cd4480649657cea8c62641ee658a26258bda720d1710e71514718263fc21a62d5045603d1ae627e459353f4d47b16761f669d6b360c98
+  data.tar.gz: 3b58ee2a378b1d7cd159a510bb0ef5ce39f6a3b7a614fb499f5654dd73b6505acdb44d8ab2a8936fabc9911cde720172dc926ff951d1236dbd67644384eed786

data/app/helpers/decidim/debates/application_helper.rb

@@ -15,14 +15,23 @@ module Decidim
       # If the debate is official or the rich text editor is enabled on the
       # frontend, the debate description is considered as safe content.
       def safe_content?
-        debate&.official? || rich_text_editor_in_public_views?
+        rich_text_editor_in_public_views? || safe_content_admin?
+      end
+
+      # For admin entered content, the debate body can contain certain extra
+      # tags, such as iframes.
+      def safe_content_admin?
+        debate&.official?
       end
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_debate_description(debate)
-        description = present(debate).description(strip_tags: !safe_content?, links: true)
-
-        safe_content? ? decidim_sanitize_editor(description) : simple_format(description)
+        sanitized = render_sanitized_content(debate, :description)
+        if safe_content?
+          Decidim::ContentProcessor.render_without_format(sanitized).html_safe
+        else
+          Decidim::ContentProcessor.render(sanitized, "div")
+        end
       end
 
       # Returns :text_area or :editor based on current_component settings.

data/app/presenters/decidim/debates/debate_presenter.rb

@@ -8,6 +8,7 @@ module Decidim
     class DebatePresenter < Decidim::ResourcePresenter
       include Decidim::TranslationsHelper
       include Decidim::ResourceHelper
+      include Decidim::SanitizeHelper
       include ActionView::Helpers::DateHelper
 
       def debate
@@ -30,16 +31,10 @@ module Decidim
         super debate.title, links, html_escape, all_locales
       end
 
-      def description(strip_tags: false, links: false, all_locales: false)
+      def description(strip_tags: false, extras: true, links: false, all_locales: false)
         return unless debate
 
-        handle_locales(debate.description, all_locales) do |content|
-          content = strip_tags(content) if strip_tags
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
-          content = renderer.render(links: links).html_safe
-          content = Decidim::ContentRenderers::LinkRenderer.new(content).render if links
-          content
-        end
+        content_handle_locale(debate.description, all_locales, extras, links, strip_tags)
       end
 
       def last_comment_at

data/app/views/decidim/debates/debates/show.html.erb

@@ -108,12 +108,12 @@ edit_link(
 
       <% if translated_attribute(debate.instructions).present? %>
         <div class="callout secondary">
-          <%= decidim_sanitize_editor(simple_format(translated_attribute(debate.instructions), {}, sanitize: false)) %>
+          <%= decidim_sanitize_editor_admin(simple_format(translated_attribute(debate.instructions), {}, sanitize: false)) %>
         </div>
       <% end %>
       <% if translated_attribute(debate.information_updates).present? %>
         <div class="callout success">
-          <%= decidim_sanitize_editor(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)) %>
+          <%= decidim_sanitize_editor_admin(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)) %>
         </div>
       <% end %>
 

data/config/locales/ca.yml

@@ -48,7 +48,7 @@ ca:
     debates:
       actions:
         close: Tanca
-        confirm_destroy: N'estàs segura?
+        confirm_destroy: Segur?
         destroy: Suprimeix
         edit: Edita
         new: Nou %{name}

data/config/locales/eu.yml

@@ -6,22 +6,24 @@ eu:
         closed_at: Amaiera-data
         conclusions: Ondorioak
         decidim_category_id: Kategoria
-        description: deskribapena
-        end_time: Amaitzen du
+        description: Deskribapena
+        end_time: Bukaera-data
         information_updates: Informazioaren eguneratzeak
         instructions: Parte hartzeko argibideak
+        scope_id: Eremua
         start_time: Hasi da
         title: Izenburua
         user_group_id: Sortu eztabaida gisa
     models:
       decidim/debates/close_debate_event: Eztabaida itxita
-      decidim/debates/create_debate_event: Debate
-      decidim/debates/creation_disabled_event: Debateak desgaituta daude
+      decidim/debates/create_debate_event: Eztabaida
+      decidim/debates/creation_disabled_event: Eztabaidak desgaituta daude
+      decidim/debates/creation_enabled_event: Eztabaidak sortzea gaituta
   activerecord:
     models:
       decidim/debates/debate:
-        one: Debate
-        other: eztabaidak
+        one: Eztabaida
+        other: Eztabaidak
   decidim:
     components:
       debates:
@@ -29,24 +31,25 @@ eu:
           comment: Iruzkina
           create: Sortu
           endorse: Atxiki
-        name: eztabaidak
+        name: Eztabaidak
         settings:
           global:
-            announcement: Anuntzio
+            announcement: Iragarpena
             comments_enabled: Iruzkinak gaituta
-            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 defektuz)
+            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsitako konfigurazioari eutsi nahi badiozu)
             scope_id: Eremua
             scopes_enabled: Esparruak gaituta
           step:
-            announcement: Anuntzio
+            announcement: Iragarpena
             comments_blocked: Iruzkinak blokeatuta
+            creation_enabled: Parte-hartzaileek eztabaidak sor ditzakete
             endorsements_blocked: Atxikimenduak blokeatuta
             endorsements_enabled: Atxikimenduak gaituta
     debates:
       actions:
         close: Itxi
         confirm_destroy: Ziur zaude?
-        destroy: ezabatu
+        destroy: Ezabatu
         edit: Editatu
         new: '%{name} berria'
         title: Ekintzak
@@ -57,10 +60,10 @@ eu:
             title: Itxi eztabaida
         debates:
           create:
-            invalid: Arazo bat izan da eztabaida sortzen ari den bitartean.
-            success: Debate sortu da behar bezala.
+            invalid: Arazo bat gertatu da eztabaida sortzean.
+            success: Eztabaida zuzen sortu da.
           destroy:
-            success: Debata zuzen ezabatu da.
+            success: Eztabaida zuzen ezabatu da.
           edit:
             title: Editatu eztabaida
             update: Eguneratu eztabaida
@@ -121,7 +124,7 @@ eu:
           official: Ofiziala
           origin: Origin
           scope: Eremua
-          search: Search
+          search: Bilatu
           state: Egoera
           state_values:
             closed: Itxita
@@ -208,7 +211,7 @@ eu:
           notification_title: Orain <a href="%{resource_path}">eztabaida berriak hasi ditzakezu</a> <a href="%{participatory_space_url}">%{participatory_space_title}</a>
         debate_closed:
           affected_user:
-            email_intro: '"%{resource_title}" eztabaida itrxi egin da. Ondorioak bere orrialdean irakur ditzakezu:'
+            email_intro: '"%{resource_title}" eztabaida itxi egin da. Ondorioak bere orrialdean irakur ditzakezu:'
             email_outro: Jakinarazpen hau jaso duzu "%{resource_title}" eztabaida jarraitzen ari zarelako. Aurreko loturan utzi ahal diozu jarraitzeari .
             email_subject: '"%{resource_title}" eztabaida itxi egin da'
             notification_title: <a href="%{resource_path}">%{resource_title}</a> eztabaida itxi egin da.

data/config/locales/fa-IR.yml

@@ -0,0 +1 @@
+fa:

data/config/locales/fi.yml

@@ -10,6 +10,7 @@ fi:
         end_time: Päättymisaika
         information_updates: Tietojen päivitykset
         instructions: Osallistumisohjeet
+        scope_id: Teema
         start_time: Alkamisaika
         title: Otsikko
         user_group_id: Luo keskustelu käyttäjänä

data/config/locales/fr-CA.yml

@@ -10,7 +10,7 @@ fr-CA:
         end_time: Prend fin à
         information_updates: Informations mises à jour
         instructions: Instructions pour participer
-        scope_id: Périmètre d'application
+        scope_id: Secteur
         start_time: Commence à
         title: Titre
         user_group_id: Créer un débat en tant que

data/config/locales/fr.yml

@@ -10,7 +10,7 @@ fr:
         end_time: Prend fin à
         information_updates: Informations mises à jour
         instructions: Instructions pour participer
-        scope_id: Périmètre d'application
+        scope_id: Secteur
         start_time: Commence à
         title: Titre
         user_group_id: Créer un débat en tant que

data/config/locales/hu.yml

@@ -10,6 +10,7 @@ hu:
         end_time: Lejár ekkor
         information_updates: Információ frissítések
         instructions: Útmutató a részvételhez
+        scope_id: Hatókör
         start_time: Kezdődik
         title: Cím
         user_group_id: Vita létrehozása

data/config/locales/ka-GE.yml

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

data/config/locales/kaa.yml

@@ -0,0 +1 @@
+kaa:

data/config/locales/ro-RO.yml

@@ -10,6 +10,7 @@ ro:
         end_time: Se termină la
         information_updates: Actualizări informații
         instructions: Instrucţiuni de participare
+        scope_id: Domeniu de interes
         start_time: Începe la
         title: Titlu
         user_group_id: Creați o dezbatere în calitate de

data/config/locales/sv.yml

@@ -10,6 +10,7 @@ sv:
         end_time: Slutar vid
         information_updates: Informationsuppdateringar
         instructions: Deltagaranvisningar
+        scope_id: Omfång
         start_time: Börjar vid
         title: Titel
         user_group_id: Skapa debatt som

data/config/locales/zh-TW.yml

@@ -1 +1,239 @@
 zh-TW:
+  activemodel:
+    attributes:
+      debate:
+        category_id: 類別
+        closed_at: 關閉於
+        conclusions: 結論
+        decidim_category_id: 類別
+        description: 說明
+        end_time: 結束於
+        information_updates: 資訊更新
+        instructions: 參加指南
+        scope_id: 範圍
+        start_time: 開始於
+        title: 標題
+        user_group_id: 建立辯論為
+    models:
+      decidim/debates/close_debate_event: 辯論功能已關閉
+      decidim/debates/create_debate_event: 辯論
+      decidim/debates/creation_disabled_event: 辯論功能已禁用
+      decidim/debates/creation_enabled_event: 辯論創建已啟用
+  activerecord:
+    models:
+      decidim/debates/debate:
+        other: 辯論
+  decidim:
+    components:
+      debates:
+        actions:
+          comment: 留言
+          create: 建立
+          endorse: 連署
+        name: 辯論
+        settings:
+          global:
+            announcement: 公告
+            comments_enabled: 啟用評論功能
+            comments_max_length: 評論字數最大長度(若要使用預設值請輸入0)
+            scope_id: 範圍
+            scopes_enabled: 啟用範圍
+          step:
+            announcement: 公告
+            comments_blocked: 留言已封鎖
+            creation_enabled: 參與者可以建立辯論
+            endorsements_blocked: 連署已封鎖
+            endorsements_enabled: 連署已封鎖
+    debates:
+      actions:
+        close: 關閉
+        confirm_destroy: 您確定嗎？
+        destroy: 刪除
+        edit: 編輯
+        new: 新增 %{name}
+        title: 操作
+      admin:
+        debate_closes:
+          edit:
+            close: 關閉
+            title: 關閉辯論
+        debates:
+          create:
+            invalid: 建立辯論時出現問題。
+            success: 辯論建立成功。
+          destroy:
+            success: 辯論已成功刪除。
+          edit:
+            title: 編輯辯論
+            update: 更新辯論
+          form:
+            debate_type: 辯論類型
+            finite: 有限期 (設定開始和結束時間)
+            open: 開放式 (沒有開始或結束時間)
+          index:
+            title: 辯論
+          new:
+            create: 建立辯論
+            title: 新辯論
+          update:
+            invalid: 更新此辯論時發生問題。
+            success: 辯論已成功更新
+        exports:
+          comments: 評論
+        models:
+          debate:
+            name: 辯論
+      admin_log:
+        debate:
+          close: "%{user_name} 在 %{space_name} 空間關閉了 %{resource_name} 辯論。"
+          create: "%{user_name} 在%{space_name} 空間中創建了%{resource_name} 辯論"
+          update: "%{user_name} 更新了 %{space_name} 空間中的 %{resource_name} 辯論"
+      debate_m:
+        commented_time_ago: 在 %{time} 前評論
+      debates:
+        close:
+          invalid: 關閉辯論時出現問題
+          success: 辯論成功關閉
+        close_debate_modal:
+          close: 關閉
+          description: 這場辯論的總結或結論是什麼？
+          send: 關閉辯論
+        closed: 關閉
+        count:
+          debates_count:
+            other: "%{count} 場辯論"
+        create:
+          invalid: 建立辯論時出現問題。
+          success: 辯論建立成功。
+        debate:
+          participate: 參與
+        edit:
+          back: 返回
+          save: 保存更改
+          title: 編輯辯論
+        filters:
+          activity: 我的活動
+          all: 全部
+          category: 類別
+          category_prompt: 選擇一個類別
+          citizens: 公民
+          commented: 已回應
+          my_debates: 我的辯論
+          official: 官方
+          origin: 起源
+          scope: 範圍
+          search: 搜尋
+          state: 狀態
+          state_values:
+            closed: 關閉
+            open: 開啟
+          user_groups: 群組
+        filters_small_view:
+          close_modal: 關閉視窗
+          filter: 篩選
+          filter_by: 篩選條件
+          unfold: 展開
+        form:
+          select_a_category: 請選擇一個類別
+        index:
+          new_debate: 新辯論
+        new:
+          back: 返回
+          create: 建立
+          title: 新辯論
+        orders:
+          commented: 最多評論
+          label: 依序排列辯論
+          random: 隨機順序
+          recent: 最近
+          updated: 最近更新
+        show:
+          back: 返回列表
+          close_debate: 關閉辯論
+          date: 日期
+          debate_closed: 關閉
+          debate_conclusions_are: '此辯論已於 %{date} 結束，以下是總結結論：'
+          edit_conclusions: 修改結論
+          edit_debate: 編輯辯論
+          groups_count: 群組
+          last_comment_by: 最後評論
+          no_comments_yet: 尚無留言
+          open: 開放性辯論
+          participants_count: 參與者
+        update:
+          invalid: 更新此辯論時發生問題。
+          success: 辯論已成功更新
+        versions:
+          debates:
+            back_to_resource: 返回辯論
+          index:
+            title: 版本
+        versions_list:
+          back_to_resource: 返回辯論
+      last_activity:
+        debate_updated_at_html: "<span>辯論已更新，連結網址為 %{link}</span>"
+        new_debate_at_html: "<span>新的辯論，連結網址為 %{link}</span>"
+      models:
+        debate:
+          fields:
+            end_time: 結束日期
+            official_debate: 正式辯論
+            start_time: 開始日期
+            title: 標題
+    events:
+      debates:
+        create_debate_event:
+          space_followers:
+            email_intro: |-
+              你好，
+              一個新的辯論「%{resource_title}」已經在 %{space_title} 參與空間中建立，請查看並參與：
+            email_outro: 您收到此通知，是因為您正在追蹤 %{space_title} 參與空間。您可以按照上述連結停止接收通知。
+            email_subject: '%{space_title} 參與空間上有新辯論主題%{resource_title}'
+            notification_title: 在<a href="%{space_path}">%{space_title}</a>上建立了辯論主題<a href="%{resource_path}">%{resource_title}</a>。
+          user_followers:
+            email_intro: |-
+              嗨，
+              你正在追蹤的 %{author_name} %{author_nickname} 創建了一個新辯論主題 "%{resource_title}"。點擊下方連結查看並參與辯論：
+            email_outro: 您收到此通知，是因為您正在關注 %{author_nickname}。您可以使用上面的連結停止接收通知。
+            email_subject: 新辯論主題「%{resource_title}」，由 %{author_nickname} 建立
+            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> 建立了 <a href="%{resource_path}">%{resource_title}</a> 辯論。
+        creation_disabled:
+          email_intro: '在 %{participatory_space_title} 中不再開放建立辯論。您仍可在此頁面參與開放辯論：'
+          email_outro: 你收到此通知是因為你正在追蹤 %{participatory_space_title}。你可以透過前面的連結停止接收通知。
+          email_subject: 在 %{participatory_space_title} 中已停用辯論建立
+          notification_title: 辯論建立現在在<a href="%{participatory_space_url}">%{participatory_space_title}</a>已被停用
+        creation_enabled:
+          email_intro: '現在您可以在 %{participatory_space_title} 開始新的辯論！在此頁面開始參與：'
+          email_outro: 你收到此通知是因為你正在追蹤 %{participatory_space_title}。你可以透過前面的連結停止接收通知。
+          email_subject: 在 %{participatory_space_title} 現在可以開始新的辯論！
+          notification_title: 您現在可以在<a href="%{participatory_space_url}">%{participatory_space_title}</a>中<a href="%{resource_path}">開始新的辯論</a>。
+        debate_closed:
+          affected_user:
+            email_intro: '在 "%{resource_title}" 辯論中已經關閉。您可以在其頁面上閱讀結論：'
+            email_outro: 您收到此通知是因為您正在追蹤「%{resource_title}」辯論。您可以透過上方的連結取消追蹤。
+            email_subject: '%{resource_title} 辯論已結束'
+            notification_title: 這個<a href="%{resource_path}">%{resource_title}</a>辯論已經結束。
+          follower:
+            email_intro: '在 "%{resource_title}" 辯論中已經關閉。您可以在其頁面上閱讀結論：'
+            email_outro: 您收到此通知是因為您正在追蹤「%{resource_title}」辯論。您可以透過上方的連結取消追蹤。
+            email_subject: '%{resource_title} 辯論已結束'
+            notification_title: 這個<a href="%{resource_path}">%{resource_title}</a>辯論已經結束。
+    gamification:
+      badges:
+        commented_debates:
+          conditions:
+            - 選擇一個開放辯論加入
+          description: 當你在不同辯論中發表評論時，會被授予此徽章。
+          description_another: 此參與者已參與了 %{score} 個辯論。
+          description_own: 您已經參與了 %{score} 場辯論
+          name: 辯論
+          next_level_in: 再參與 %{score} 個辯論，即可達成下一等級！
+          unearned_another: 這位參與者尚未參與任何辯論。
+          unearned_own: 您尚未參與任何辯論。
+    metrics:
+      debates:
+        description: 建立的辯論次數
+        object: 辯論
+        title: 辯論
+    statistics:
+      debates_count: 辯論

data/lib/decidim/debates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.26.4"
+      "0.26.7"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.26.7
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,56 +19,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -179,6 +179,7 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
+- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -196,6 +197,8 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
+- config/locales/ka-GE.yml
+- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml