decidim-debates 0.27.7 → 0.28.0.rc4

data/config/locales/tr-TR.yml

@@ -48,7 +48,7 @@ tr:
         confirm_destroy: Emin misiniz?
         destroy: Sil
         edit: Düzenle
-        new: Yeni %{name}
+        new: Yeni Tartışma
         title: Eylemler
       admin:
         debate_closes:
@@ -78,9 +78,6 @@ tr:
             success: Tartışma başarıyla güncellendi.
         exports:
           comments: Yorumlar
-        models:
-          debate:
-            name: tartışma
       admin_log:
         debate:
           close: "%{user_name}, %{space_name} alanındaki %{resource_name} tartışmasını kapattı"
@@ -93,10 +90,8 @@ tr:
           invalid: Tartışmayı kapatırken bir sorun oluştu.
           success: Tartışma başarıyla sonuçlandı.
         close_debate_modal:
-          close: Kapat
           description: Bu tartışmanın özeti veya sonucu nedir?
           send: Tartışmayı kapat
-        closed: Kapalı
         count:
           debates_count:
             one: "%{count} tartışma"
@@ -104,11 +99,6 @@ tr:
         create:
           invalid: Tartışmayı oluştururken bir sorun oluştu.
           success: Tartışma başarıyla oluşturuldu.
-        debate:
-          participate: Katıl
-        debates:
-          empty: Henüz herhangi bir tartışma yok.
-          empty_filters: Bu kritere uyan bir tartışma yok.
         edit:
           back: Geri
           save: Değişiklikleri kaydet
@@ -122,18 +112,11 @@ tr:
           my_debates: Tartışmalarım
           official: Resmi
           origin: Orijin
-          scope: Kapsam
           search: Arama
           state: Statü
           state_values:
             closed: Kapalı
             open: Açık
-          user_groups: Gruplar
-        filters_small_view:
-          close_modal: Pencereyi kapat
-          filter: Filtrele
-          filter_by: Şuna göre filtrele
-          unfold: Aç
         form:
           select_a_category: Lütfen bir kategori seçin
         index:
@@ -149,30 +132,17 @@ tr:
           recent: En yeni
           updated: Yeni güncellenmiş
         show:
-          back: Listeye geri dön
           close_debate: Tartışmayı kapat
-          date: Tarih
           debate_closed: Kapalı
           debate_conclusions_are: 'Tartışma bu sonuçlarla %{date} tarihinde kapatıldı:'
           edit_conclusions: Sonuçları düzenleyin
           edit_debate: Tartışmayı düzenle
           groups_count: Gruplar
-          last_comment_by: Son yorum
-          no_comments_yet: Henüz yorum yok
           open: Açık tartışma
           participants_count: Katılımcılar
         update:
           invalid: Bu tartışmayı güncellerken bir sorun oluştu.
           success: Tartışma başarıyla güncellendi.
-        versions:
-          debates:
-            back_to_resource: Tartışmaya geri dön
-          index:
-            title: Sürümler
-        versions_list:
-          back_to_resource: Tartışmaya geri dön
-      last_activity:
-        new_debate_at_html: "<span> %{link}</span> linkinde yeni tartışma"
       models:
         debate:
           fields:
@@ -185,11 +155,11 @@ tr:
         create_debate_event:
           space_followers:
             email_intro: |-
-              Merhaba 
-              %{participatory_space_title} katılımcı alanında yeni bir "%{resource_title}" tartışma başlığı oluşturuldu. İnceleyerek katkıda bulunabilirsiniz. 
-            email_outro: Bu bildirimi %{participatory_space_title} katılımcılık Başlıklı alanını takip ettiğiniz için aldınız. Bildirim almayı önceki bağlantı linkini izleyerek durdurabilirsiniz.
-            email_subject: '%{participatory_space_title} başlıpı ile ilgili yeni tartışma "%{resource_title}"'
-            notification_title: <a href="%{resource_path}">%{resource_title</a> tartışması <a href="%{participatory_space_url}">%{participatory_space_title</a> tarihinde oluşturuldu.
+              Merhaba,
+              %{space_title} katılımcı alanda yeni bir "%{resource_title}" tartışması oluşturuldu, inceleyin ve katkıda bulunun:
+            email_outro: '%{space_title} katılımcı alanı takip ettiğiniz için bu bildirimi aldınız. Önceki bağlantıyı takip ederek bildirim almayı durdurabilirsiniz.'
+            email_subject: '%{space_title} üzerinde yeni tartışma "%{resource_title}"'
+            notification_title: <a href="%{resource_path}">%{resource_title} </a> tartışması <a href="%{space_path}">%{space_title} </a> adresinde oluşturuldu.
           user_followers:
             email_intro: |-
               Merhaba,
@@ -206,7 +176,6 @@ tr:
           email_intro: 'Artık %{participatory_space_title} içinde yeni tartışmalar başlatabilirsiniz! Bu sayfaya katılmaya başlayın:'
           email_outro: Bu bildirimi, %{participatory_space_title} adlı kişiyi takip ettiğiniz için aldınız. Önceki bağlantıyı izleyerek bildirim almayı durdurabilirsiniz.
           email_subject: Tartışmalar artık %{participatory_space_title} içinde mevcut
-          notification_title: Artık <a href="%{participatory_space_url}">%{participatory_space_title} </a> ’de <a href="%{resource_path}"> yeni tartışmalar </a> başlatabilirsiniz
         debate_closed:
           affected_user:
             email_intro: '"%{resource_title}" tartışması kapatıldı. Sonuçları sayfasından okuyabilirsiniz:'
@@ -229,7 +198,6 @@ tr:
           name: Tartışmalar
           next_level_in: Bir sonraki seviyeye ulaşmak için %{score} tartışmaya katılın!
           unearned_another: Bu katılımcı henüz bir tartışmada yer almadı.
-          unearned_own: Henüz herhangi bir tartışmaya katılamadınız.
     metrics:
       debates:
         description: Oluşturulan tartışmaların sayısı

data/config/locales/uk.yml

@@ -40,7 +40,6 @@ uk:
         confirm_destroy: Ви впевнені?
         destroy: Видалити
         edit: Редагувати
-        new: Додати %{name}
         title: Дії
       admin:
         debates:
@@ -60,9 +59,6 @@ uk:
           update:
             invalid: При спробі оновити обговорення сталася помилка.
             success: Обговорення успішно оновлено.
-        models:
-          debate:
-            name: Обговорення
       admin_log:
         debate:
           create: "%{user_name} започаткував обговорення %{resource_name} у просторі %{space_name}"
@@ -77,8 +73,6 @@ uk:
         create:
           invalid: При спробі започаткувати обговорення сталася помилка.
           success: Обговорення успішно започатковано.
-        debate:
-          participate: Взяти участь
         filters:
           all: Усі
           category: Категорія
@@ -86,11 +80,6 @@ uk:
           official: Службове
           origin: Джерело
           search: Шукати
-        filters_small_view:
-          close_modal: Закрити віконце
-          filter: Відібрати
-          filter_by: 'Відібрати за ознакою:'
-          unfold: Розгорнути
         form:
           select_a_category: Будь ласка, виберіть категорію
         index:
@@ -109,6 +98,9 @@ uk:
     events:
       debates:
         create_debate_event:
+          space_followers:
+            email_outro: Ви отримали це сповіщення, тому що ви стежите за простором співучасті %{space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
+            notification_title: <a href="%{space_path}">%{space_title} </a> розпочав обговорення у <a href="%{resource_path}">%{resource_title}</a>.
           user_followers:
             email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
         creation_disabled:
@@ -120,4 +112,3 @@ uk:
           email_intro: 'Тепер в %{participatory_space_title} з''явилась можливість започатковувати нові обговорення! Почніть брати участь зі сторінки:'
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{participatory_space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
           email_subject: В %{participatory_space_title} почалось обговорення
-          notification_title: Тепер ви можете започатковувати <a href="%{resource_path}">нові обговорення</a> в <a href="%{participatory_space_url}">%{participatory_space_title}</a>

data/config/locales/zh-CN.yml

@@ -47,7 +47,6 @@ zh-CN:
         confirm_destroy: 您确定吗？
         destroy: 删除
         edit: 编辑
-        new: 新建 %{name}
         title: 行动
       admin:
         debate_closes:
@@ -71,9 +70,6 @@ zh-CN:
           update:
             invalid: 在更新这次辩论时遇到了问题。
             success: 辩论已成功更新。
-        models:
-          debate:
-            name: B. 辩论
       admin_log:
         debate:
           close: "%{user_name} 关闭了 %{resource_name} 场内的 %{space_name} 个辩论"
@@ -86,18 +82,14 @@ zh-CN:
           invalid: 辩论结束时遇到问题。
           success: 辩论已成功结束。
         close_debate_modal:
-          close: 关闭
           description: 这次辩论的总结或结束是什么？
           send: 结束辩论
-        closed: 已关闭
         count:
           debates_count:
             other: "%{count} 次辩论"
         create:
           invalid: 有一个问题是如何建立辩论。
           success: 辩论成功创建。
-        debate:
-          participate: 参与
         edit:
           back: 后退
           save: 保存更改
@@ -111,18 +103,11 @@ zh-CN:
           my_debates: 我的辩论
           official: 官方的
           origin: 始发地
-          scope: 范围
           search: 搜索
           state: 状态
           state_values:
             closed: 已关闭
             open: 打开
-          user_groups: 群組
-        filters_small_view:
-          close_modal: 关闭模式
-          filter: 筛选器
-          filter_by: 筛选方式
-          unfold: 展开...
         index:
           new_debate: 新的辩论
         new:
@@ -136,29 +121,16 @@ zh-CN:
           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: 尚无评论
           participants_count: 参加者
         update:
           invalid: 有人在更新辩论时遇到问题。
           success: 辩论已成功更新。
-        versions:
-          debates:
-            back_to_resource: 回到辩论
-          index:
-            title: 版本
-        versions_list:
-          back_to_resource: 回到辩论
-      last_activity:
-        new_debate_at_html: "<span>在 %{link}进行新的辩论</span>"
       models:
         debate:
           fields:
@@ -169,6 +141,13 @@ zh-CN:
     events:
       debates:
         create_debate_event:
+          space_followers:
+            email_intro: |-
+              您好，
+              在参与性的 %{space_title} 空间上创建了一个新的辩论"%{resource_title}"。查看它并做出贡献：
+            email_outro: 您收到此通知是因为您正在关注 %{space_title} 个参与性空间。您可以停止收到跟随上一个链接的通知。
+            email_subject: 在%{resource_title}上的新辩论 " %{space_title}
+            notification_title: <a href="%{resource_path}">%{resource_title}</a> 辩论是在 <a href="%{space_path}">%{space_title}</a> 创建的。
           user_followers:
             email_intro: |-
               你好，
@@ -207,7 +186,6 @@ zh-CN:
           name: 辩论
           next_level_in: 参加更多的 %{score} 次辩论，以达到下一级！
           unearned_another: 这位与会者尚未参加任何辩论。
-          unearned_own: 你还没有参与任何辩论。
     metrics:
       debates:
         description: 创建的辩论数

data/config/locales/zh-TW.yml

@@ -51,7 +51,6 @@ zh-TW:
         confirm_destroy: 您確定嗎？
         destroy: 刪除
         edit: 編輯
-        new: 新增 %{name}
         title: 操作
       admin:
         debate_closes:
@@ -81,9 +80,6 @@ zh-TW:
             success: 辯論已成功更新
         exports:
           comments: 評論
-        models:
-          debate:
-            name: 辯論
       admin_log:
         debate:
           close: "%{user_name} 在 %{space_name} 空間關閉了 %{resource_name} 辯論。"
@@ -96,18 +92,14 @@ zh-TW:
           invalid: 關閉辯論時出現問題
           success: 辯論成功關閉
         close_debate_modal:
-          close: 關閉
           description: 這場辯論的總結或結論是什麼？
           send: 關閉辯論
-        closed: 關閉
         count:
           debates_count:
             other: "%{count} 場辯論"
         create:
           invalid: 建立辯論時出現問題。
           success: 辯論建立成功。
-        debate:
-          participate: 參與
         edit:
           back: 返回
           save: 保存更改
@@ -122,18 +114,11 @@ zh-TW:
           official: 官方
           origin: 起源
           participants: 參與者
-          scope: 範圍
           search: 搜尋
           state: 狀態
           state_values:
             closed: 關閉
             open: 開啟
-          user_groups: 群組
-        filters_small_view:
-          close_modal: 關閉視窗
-          filter: 篩選
-          filter_by: 篩選條件
-          unfold: 展開
         form:
           select_a_category: 請選擇一個類別
         index:
@@ -149,31 +134,20 @@ zh-TW:
           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>"
+        debate_updated: '辯論已更新:'
+        new_debate: '新辯論:'
       models:
         debate:
           fields:
@@ -184,6 +158,13 @@ zh-TW:
     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: |-
               嗨，

data/lib/decidim/debates/component.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:debates) do |component|
   component.engine = Decidim::Debates::Engine
   component.admin_engine = Decidim::Debates::AdminEngine
   component.icon = "media/images/decidim_debates.svg"
+  component.icon_key = "discuss-line"
   component.permissions_class_name = "Decidim::Debates::Permissions"
 
   component.query_type = "Decidim::Debates::DebatesType"
@@ -14,7 +13,7 @@ Decidim.register_component(:debates) do |component|
   component.newsletter_participant_entities = ["Decidim::Debates::Debate"]
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Debates::Debate.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Debates::Debate.where(component: instance).any?
   end
 
   component.settings(:global) do |settings|
@@ -68,91 +67,8 @@ Decidim.register_component(:debates) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "user@example.org"
-    )
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name,
-      manifest_name: :debates,
-      published_at: Time.current,
-      participatory_space: participatory_space
-    }
-
-    component = Decidim.traceability.perform_action!(
-      "publish",
-      Decidim::Component,
-      admin_user,
-      visibility: "all"
-    ) do
-      Decidim::Component.create!(params)
-    end
-
-    5.times do |x|
-      finite = x != 2
-      if finite
-        start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample
-        end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
-      else
-        start_time = nil
-        end_time = nil
-      end
-      params = {
-        component: component,
-        category: participatory_space.categories.sample,
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        start_time: start_time,
-        end_time: end_time,
-        author: component.organization
-      }
-
-      debate = Decidim.traceability.create!(
-        Decidim::Debates::Debate,
-        admin_user,
-        params,
-        visibility: "all"
-      )
-
-      Decidim::Comments::Seed.comments_for(debate)
-    end
-
-    closed_debate = Decidim::Debates::Debate.last
-    closed_debate.conclusions = Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(sentence_count: 3)
-    end
-    closed_debate.closed_at = Time.current
-    closed_debate.save!
-
-    params = {
-      component: component,
-      category: participatory_space.categories.sample,
-      title: Decidim::Faker::Localized.sentence(word_count: 2),
-      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(sentence_count: 3)
-      end,
-      instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(sentence_count: 3)
-      end,
-      author: user
-    }
+    require "decidim/debates/seeds"
 
-    Decidim.traceability.create!(
-      Decidim::Debates::Debate,
-      user,
-      params,
-      visibility: "all"
-    )
+    Decidim::Debates::Seeds.new(participatory_space:).call
   end
 end

data/lib/decidim/debates/engine.rb

@@ -13,13 +13,19 @@ module Decidim
           member do
             post :close
           end
-          resources :versions, only: [:show, :index]
-          resource :widget, only: :show, path: "embed"
+          resources :versions, only: [:show]
         end
-        root to: "debates#index"
+        scope "/debates" do
+          root to: "debates#index"
+        end
+        get "/", to: redirect("debates", status: 301)
+      end
+
+      initializer "decidim_debates.register_icons" do
+        Decidim.icons.register(name: "Decidim::Debates::Debate", icon: "discuss-line", description: "Debate", category: "activity", engine: :debates)
       end
 
-      initializer "decidim_changes" do
+      initializer "decidim_debates.settings_changes" do
         config.to_prepare do
           Decidim::SettingsChange.subscribe "debates" do |changes|
             Decidim::Debates::SettingsChangeJob.perform_later(
@@ -31,12 +37,12 @@ module Decidim
         end
       end
 
-      initializer "decidim_meetings.add_cells_view_paths" do
+      initializer "decidim_debates.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Debates::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Debates::Engine.root}/app/views") # for partials
       end
 
-      initializer "decidim.debates.commented_debates_badge" do
+      initializer "decidim_debates.commented_debates_badge" do
         Decidim::Gamification.register_badge(:commented_debates) do |badge|
           badge.levels = [1, 5, 10, 30, 50]
 
@@ -45,7 +51,7 @@ module Decidim
           badge.reset = lambda do |user|
             debates = Decidim::Comments::Comment.where(
               author: user,
-              decidim_root_commentable_type: "Decidim::Debates::Debate"\
+              decidim_root_commentable_type: "Decidim::Debates::Debate"
             )
             debates.pluck(:decidim_root_commentable_id).uniq.count
           end
@@ -101,6 +107,22 @@ module Decidim
       initializer "decidim_debates.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_debates.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:debates) do |transfer|
+            transfer.move_records(Decidim::Debates::Debate, :decidim_author_id)
+          end
+        end
+      end
+
+      initializer "decidim_debates.moderation_content" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.admin.block_user:after") do |_event_name, data|
+            Decidim::Debates::HideAllCreatedByAuthorJob.perform_later(**data)
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/debates/seeds.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require "decidim/components/namer"
+
+module Decidim
+  module Debates
+    class Seeds
+      attr_reader :participatory_space
+
+      def initialize(participatory_space:)
+        @participatory_space = participatory_space
+      end
+
+      def call
+        admin_user = Decidim::User.find_by(
+          organization: participatory_space.organization,
+          email: "admin@example.org"
+        )
+
+        user = Decidim::User.find_by(
+          organization: participatory_space.organization,
+          email: "user@example.org"
+        )
+
+        params = {
+          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name,
+          manifest_name: :debates,
+          published_at: Time.current,
+          participatory_space:
+        }
+
+        component = Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Component,
+          admin_user,
+          visibility: "all"
+        ) do
+          Decidim::Component.create!(params)
+        end
+
+        5.times do |x|
+          finite = x != 2
+          if finite
+            start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample
+            end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
+          else
+            start_time = nil
+            end_time = nil
+          end
+          params = {
+            component:,
+            category: participatory_space.categories.sample,
+            title: Decidim::Faker::Localized.sentence(word_count: 2),
+            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
+            end,
+            instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
+            end,
+            start_time:,
+            end_time:,
+            author: component.organization
+          }
+
+          debate = Decidim.traceability.create!(
+            Decidim::Debates::Debate,
+            admin_user,
+            params,
+            visibility: "all"
+          )
+
+          Decidim::Comments::Seed.comments_for(debate)
+        end
+
+        closed_debate = Decidim::Debates::Debate.last
+        closed_debate.conclusions = Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
+        end
+        closed_debate.closed_at = Time.current
+        closed_debate.save!
+
+        params = {
+          component:,
+          category: participatory_space.categories.sample,
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
+          end,
+          instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
+          end,
+          author: user
+        }
+
+        Decidim.traceability.create!(
+          Decidim::Debates::Debate,
+          user,
+          params,
+          visibility: "all"
+        )
+      end
+    end
+  end
+end