decidim-debates 0.24.0.rc1 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 930be86713dd670ddc5dfe8862fc992df894bc53a4c7814a31fa21a5b25541e3
-  data.tar.gz: 9915b79fb351ed33f316cab345ceae9c4c504fbb4525ae69148dececa08071b2
+  metadata.gz: 7bc25e4e532fa9f612e4a14d89447196d433e9c47eb9b9f04fc774f6ec5e5d5f
+  data.tar.gz: 5f1c10ab866674026cec0456425a797cbf4a589020c7e59b961074dc0dcb9583
 SHA512:
-  metadata.gz: b36d28e1c95433ef7933715966d7639ecedd01158303edc908be41a601513b442025f7658da0337e42a20adec12f26d12e47d7a7b4e10bc545b744d836f98a2c
-  data.tar.gz: e96e78eec595f9d38c894faa24cadc991a1fc4d5e77cc04baf47094f0a4a6c9368e89995c2a2bf6635de24a19dbbbc70d7ed97ba746657811d3628080df80531
+  metadata.gz: 3d0b07d72887234f78e25684d6be2284c7a8c16fe898c8f1e54b74b4792dae5d630aa07f9b9f13d819466a2717f48d35438506bce6d29b1a421ef085941612cc
+  data.tar.gz: 8008c76bc9f58e4afbc30167890782fd56798dff98a52e5078708fc4866fc6f48b1c1250578b0f02fc44f203496ae161a79594827cab2a4e2e2836d51bd7d16a

data/app/cells/decidim/debates/debate_activity_cell.rb

@@ -2,13 +2,21 @@
 
 module Decidim
   module Debates
-    # A cell to display when Debate has been created.
+    # A cell to display when actions happen on a debate.
     class DebateActivityCell < ActivityCell
       def title
-        I18n.t(
-          "decidim.debates.last_activity.new_debate_at_html",
-          link: participatory_space_link
-        )
+        case action
+        when "update"
+          I18n.t(
+            "decidim.debates.last_activity.debate_updated_at_html",
+            link: participatory_space_link
+          )
+        else
+          I18n.t(
+            "decidim.debates.last_activity.new_debate_at_html",
+            link: participatory_space_link
+          )
+        end
       end
 
       def resource_link_text

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

@@ -13,6 +13,6 @@
     </button>
   </div>
   <div class="filters">
-    <%= render partial: "filters" %>
+    <%= render partial: "filters", locals: { type: :small } %>
   </div>
 </div>

data/config/locales/ca.yml

@@ -171,6 +171,7 @@ ca:
         versions_list:
           back_to_resource: Tornar al debat
       last_activity:
+        debate_updated_at_html: "<span>Debat actualitzat el %{link}</span>"
         new_debate_at_html: "<span>Nou debat a %{link}</span>"
       models:
         debate:

data/config/locales/cs.yml

@@ -175,6 +175,7 @@ cs:
         versions_list:
           back_to_resource: Přejít zpět k debatě
       last_activity:
+        debate_updated_at_html: "<span>Debata byla aktualizována na %{link}</span>"
         new_debate_at_html: "<span>Nová debata na %{link}</span>"
       models:
         debate:
@@ -197,7 +198,7 @@ cs:
             email_intro: |-
               Ahoj,
               %{author_name} %{author_nickname}, kterého sledujete, vytvořil novou debatu "%{resource_title}". Omrkněte ji a přispějte:
-            email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{author_nickname}. Na předchozím odkazu můžete přestat přijímat oznámení.
+            email_outro: Toto oznámení jste obdrželi, protože sledujete %{author_nickname}. Na předchozím odkazu můžete zrušit přijem oznámení.
             email_subject: Nová debata "%{resource_title}" od %{author_nickname}
             notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> vytvořil <a href="%{resource_path}">%{resource_title}</a> debatu.
         creation_disabled:

data/config/locales/de.yml

@@ -112,7 +112,7 @@ de:
           save: Änderungen speichern
           title: Debatte bearbeiten
         filters:
-          activity: Aktivität
+          activity: Meine Aktivität
           all: Alle
           category: Kategorie
           category_prompt: Wählen Sie eine Kategorie
@@ -171,6 +171,7 @@ de:
         versions_list:
           back_to_resource: Zurück zur Debatte
       last_activity:
+        debate_updated_at_html: "<span>Debatte aktualisiert unter %{link}</span>"
         new_debate_at_html: "<span>Neue Debatte bei %{link}</span>"
       models:
         debate:

data/config/locales/en.yml

@@ -172,6 +172,7 @@ en:
         versions_list:
           back_to_resource: Go back to debate
       last_activity:
+        debate_updated_at_html: "<span>Debate updated at %{link}</span>"
         new_debate_at_html: "<span>New debate at %{link}</span>"
       models:
         debate:

data/config/locales/es-MX.yml

@@ -65,6 +65,10 @@ es-MX:
           edit:
             title: Editar debate
             update: Actualizar debate
+          form:
+            debate_type: Tipo de debate
+            finite: Finito (con hora de inicio y final)
+            open: Abierto (no hay hora de inicio o final)
           index:
             title: Debates
           new:
@@ -73,6 +77,8 @@ es-MX:
           update:
             invalid: Ha habido un problema al actualizar este debate.
             success: Debate actualizado con éxito.
+        exports:
+          comments: Comentarios
         models:
           debate:
             name: Debate
@@ -152,6 +158,7 @@ es-MX:
           groups_count: Grupos
           last_comment_by: Último comentario de
           no_comments_yet: No hay comentarios todavía
+          open: Debate abierto
           participants_count: Participantes
         update:
           invalid: Se ha producido un error al actualizar este debate.
@@ -164,6 +171,7 @@ es-MX:
         versions_list:
           back_to_resource: Volver al debate
       last_activity:
+        debate_updated_at_html: "<span>Debate actualizado a las %{link}</span>"
         new_debate_at_html: "<span>Nuevo debate en %{link}</span>"
       models:
         debate:

data/config/locales/es-PY.yml

@@ -65,6 +65,10 @@ es-PY:
           edit:
             title: Editar debate
             update: Actualizar debate
+          form:
+            debate_type: Tipo de debate
+            finite: Finito (con hora de inicio y final)
+            open: Abierto (no hay hora de inicio o final)
           index:
             title: Debates
           new:
@@ -73,6 +77,8 @@ es-PY:
           update:
             invalid: Ha habido un problema al actualizar este debate.
             success: Debate actualizado con éxito.
+        exports:
+          comments: Comentarios
         models:
           debate:
             name: Debate
@@ -152,6 +158,7 @@ es-PY:
           groups_count: Grupos
           last_comment_by: Último comentario de
           no_comments_yet: No hay comentarios todavía
+          open: Debate abierto
           participants_count: Participantes
         update:
           invalid: Se ha producido un error al actualizar este debate.
@@ -164,6 +171,7 @@ es-PY:
         versions_list:
           back_to_resource: Volver al debate
       last_activity:
+        debate_updated_at_html: "<span>Debate actualizado a las %{link}</span>"
         new_debate_at_html: "<span>Nuevo debate en %{link}</span>"
       models:
         debate:

data/config/locales/es.yml

@@ -65,6 +65,10 @@ es:
           edit:
             title: Editar debate
             update: Actualizar debate
+          form:
+            debate_type: Tipo de debate
+            finite: Finito (con hora de inicio y final)
+            open: Abierto (no hay hora de inicio o final)
           index:
             title: Debates
           new:
@@ -73,6 +77,8 @@ es:
           update:
             invalid: Se ha producido un error al actualizar este debate.
             success: Debate actualizado correctamente.
+        exports:
+          comments: Comentarios
         models:
           debate:
             name: Debate
@@ -152,6 +158,7 @@ es:
           groups_count: Grupos
           last_comment_by: Último comentario de
           no_comments_yet: No hay comentarios todavía
+          open: Debate abierto
           participants_count: Participantes
         update:
           invalid: Se ha producido un error al actualizar este debate.
@@ -164,6 +171,7 @@ es:
         versions_list:
           back_to_resource: Volver al debate
       last_activity:
+        debate_updated_at_html: "<span>Debate actualizado a las %{link}</span>"
         new_debate_at_html: "<span>Nuevo debate en %{link}</span>"
       models:
         debate:

data/config/locales/fi-plain.yml

@@ -171,6 +171,7 @@ fi-pl:
         versions_list:
           back_to_resource: Takaisin keskusteluun
       last_activity:
+        debate_updated_at_html: "<span>Keskustelu päivitetty osoitteessa %{link}</span>"
         new_debate_at_html: "<span>Uusi keskustelu osoitteessa %{link}</span>"
       models:
         debate:

data/config/locales/fi.yml

@@ -171,6 +171,7 @@ fi:
         versions_list:
           back_to_resource: Takaisin keskusteluun
       last_activity:
+        debate_updated_at_html: "<span>Keskustelu päivitetty osoitteessa %{link}</span>"
         new_debate_at_html: "<span>Uusi keskustelu osoitteessa %{link}</span>"
       models:
         debate:

data/config/locales/fr-CA.yml

@@ -171,6 +171,7 @@ fr-CA:
         versions_list:
           back_to_resource: Revenir au débat
       last_activity:
+        debate_updated_at_html: "<span>Débat mis à jour à %{link}</span>"
         new_debate_at_html: "<span>Nouveau débat à %{link}</span>"
       models:
         debate:

data/config/locales/fr.yml

@@ -171,6 +171,7 @@ fr:
         versions_list:
           back_to_resource: Revenir au débat
       last_activity:
+        debate_updated_at_html: "<span>Débat mis à jour à %{link}</span>"
         new_debate_at_html: "<span>Nouveau débat à %{link}</span>"
       models:
         debate:

data/config/locales/gl.yml

@@ -98,6 +98,7 @@ gl:
           create: Crear
           title: Novo debate
       last_activity:
+        debate_updated_at_html: "<span>Debate actualizado en %{link}</span>"
         new_debate_at_html: "<span>Novo debate en %{link}</span>"
       models:
         debate:

data/config/locales/nl.yml

@@ -147,6 +147,7 @@ nl:
         versions_list:
           back_to_resource: Ga terug naar het debat
       last_activity:
+        debate_updated_at_html: "<span>Debat bijgewerkt op %{link}</span>"
         new_debate_at_html: "<span>Nieuw debat op %{link}</span>"
       models:
         debate:

data/config/locales/pl.yml

@@ -29,8 +29,8 @@ pl:
     components:
       debates:
         actions:
-          create: Utwórz
-          endorse: Rekomenduj
+          create: Tworzenie
+          endorse: Rekomendacje
         name: Debaty
         settings:
           global:
@@ -175,6 +175,7 @@ pl:
         versions_list:
           back_to_resource: Wróć do debaty
       last_activity:
+        debate_updated_at_html: "<span>Debata zaktualizowana o %{link}</span>"
         new_debate_at_html: "<span>Nowa debata pod adresem %{link}</span>"
       models:
         debate:
@@ -188,7 +189,6 @@ pl:
         create_debate_event:
           space_followers:
             email_intro: |-
-              Cześć,
               Nowa debata "%{resource_title}" została utworzona w przestrzeni partycypacyjnej %{space_title}, sprawdź ją i przyłącz się:
             email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz przestrzeń partycypacyjną %{space_title}. Możesz przestać otrzymywać powiadomienia po kliknięciu w poprzedni link.
             email_subject: Nowa debata "%{resource_title}" w %{space_title}

data/config/locales/ro-RO.yml

@@ -29,16 +29,21 @@ ro:
       debates:
         actions:
           create: Crează
+          endorse: Aprobare
         name: Dezbateri
         settings:
           global:
             announcement: Anunţ
             comments_enabled: Comentarii activate
             comments_max_length: Lungimea maximă a comentariilor (Leave 0 pentru valoarea implicită)
+            scope_id: Domeniu de interes
+            scopes_enabled: Domenii de interes activate
           step:
             announcement: Anunţ
             comments_blocked: Comentarii blocate
             creation_enabled: Crearea de dezbateri de către participanți este activată
+            endorsements_blocked: Aprobări blocate
+            endorsements_enabled: Aprobări activate
     debates:
       actions:
         close: Închide
@@ -48,6 +53,10 @@ ro:
         new: '%{name} nou'
         title: Acțiuni
       admin:
+        debate_closes:
+          edit:
+            close: Inchide
+            title: Închide dezbaterea
         debates:
           create:
             invalid: A existat o problemă la crearea dezbaterii.
@@ -57,6 +66,10 @@ ro:
           edit:
             title: Editare dezbatere
             update: Actualizează dezbaterea
+          form:
+            debate_type: Tip de dezbatere
+            finite: Finit (cu timp de început și sfârșit)
+            open: Deschis (fără timp de început sau sfârșit)
           index:
             title: Dezbateri
           new:
@@ -65,14 +78,27 @@ ro:
           update:
             invalid: A apărut o problemă la actualizarea acestei dezbateri.
             success: Dezbatere actualizata cu succes.
+        exports:
+          comments: Comentarii
         models:
           debate:
             name: Dezbatere
       admin_log:
         debate:
+          close: "%{user_name} a închis dezbaterea %{resource_name} cu privire la spațiul %{space_name}"
           create: "%{user_name} a creat dezbaterea %{resource_name} pentru spațiul %{space_name}"
           update: "%{user_name} a actualizat dezbaterea %{resource_name} cu privire la spațiul %{space_name}"
+      debate_m:
+        commented_time_ago: Comentat acum %{time}
       debates:
+        close:
+          invalid: A existat o problemă la închiderea dezbaterii.
+          success: Dezbatere închisă.
+        close_debate_modal:
+          close: Închide
+          description: Care este rezumatul sau concluzia acestei dezbateri?
+          send: Închide dezbaterea
+        closed: Închis
         count:
           debates_count:
             one: "%{count} dezbatere"
@@ -88,13 +114,22 @@ ro:
           save: Salvează modificările
           title: Editare dezbatere
         filters:
+          activity: Activitatea mea
           all: Toate
           category: Categorie
           category_prompt: Selectați o categorie
           citizens: Cetățeni
+          commented: Comentat
+          my_debates: Dezbaterile mele
           official: Oficial
           origin: Origine
+          scope: Domeniu de interes
           search: Caută
+          state: Stare
+          state_values:
+            closed: Inchide
+            open: Deschide
+          user_groups: Grupuri
         filters_small_view:
           close_modal: Închide fereastra
           filter: Filtrare
@@ -108,10 +143,25 @@ ro:
           back: Înapoi
           create: Crează
           title: Dezbatere nouă
+        orders:
+          commented: Cele mai comentate
+          label: Dezbateri de ordine
+          random: Ordine aleatorie
+          recent: Cele mai recente
+          updated: Actualizate recent
         show:
           back: Înapoi la listă
+          close_debate: Închide dezbaterea
           date: Data
+          debate_closed: Inchide
+          debate_conclusions_are: 'Dezbaterea s-a încheiat la %{date} cu următoarele concluzii:'
+          edit_conclusions: Editați concluziile
           edit_debate: Editare dezbatere
+          groups_count: Grupuri
+          last_comment_by: Ultimul comentariu din partea
+          no_comments_yet: Încă nu există comentarii
+          open: Dezbatere deschisă
+          participants_count: Participanţi
         update:
           invalid: A apărut o problemă la actualizarea dezbaterii.
           success: Dezbatere actualizata cu succes.
@@ -123,6 +173,7 @@ ro:
         versions_list:
           back_to_resource: Revenire la dezbatere
       last_activity:
+        debate_updated_at_html: "<span>Dezbatere actualizată la %{link}</span>"
         new_debate_at_html: "<span>Noua dezbatere la %{link}</span>"
       models:
         debate:

data/config/locales/sv.yml

@@ -35,6 +35,8 @@ sv:
             announcement: Meddelande
             comments_enabled: Kommentarer aktiverade
             comments_max_length: Maximal längd för kommentarer (Lämna 0 för standardvärde)
+            scope_id: Omfång
+            scopes_enabled: Omfång aktiverade
           step:
             announcement: Meddelande
             comments_blocked: Kommentarer blockerade
@@ -63,6 +65,10 @@ sv:
           edit:
             title: Redigera debatt
             update: Uppdatera debatt
+          form:
+            debate_type: Typ av debatt
+            finite: Tidsbegränsad (med start- och sluttider)
+            open: Oendlig (inga start- eller slutdatum)
           index:
             title: Debatter
           new:
@@ -71,6 +77,8 @@ sv:
           update:
             invalid: Det gick inte att uppdatera debatten.
             success: Debatten uppdaterades.
+        exports:
+          comments: Kommentarer
         models:
           debate:
             name: Debatt
@@ -79,6 +87,8 @@ sv:
           close: "%{user_name} stängde debatten %{resource_name} i utrymmet %{space_name}"
           create: "%{user_name} skapade debatten %{resource_name} på platsen %{space_name}"
           update: "%{user_name} uppdaterade debatten %{resource_name} på platsen %{space_name}"
+      debate_m:
+        commented_time_ago: Kommenterade för %{time} sedan
       debates:
         close:
           invalid: Det gick inte att stänga debatten.
@@ -102,13 +112,22 @@ sv:
           save: Spara ändringar
           title: Redigera debatt
         filters:
+          activity: Min aktivitet
           all: Alla
           category: Kategori
           category_prompt: Välj en kategori
           citizens: Medborgare
+          commented: Kommenterade
+          my_debates: Mina debatter
           official: Officiell
           origin: Ursprung
+          scope: Omfång
           search: Sök
+          state: Status
+          state_values:
+            closed: Stängda
+            open: Öppna
+          user_groups: Grupper
         filters_small_view:
           close_modal: Stäng fönstret
           filter: Filtrera
@@ -139,6 +158,7 @@ sv:
           groups_count: Grupper
           last_comment_by: Senaste kommentar av
           no_comments_yet: Inga kommentarer ännu
+          open: Öppna debatt
           participants_count: Deltagare
         update:
           invalid: Det gick inte att uppdatera debatten.
@@ -151,6 +171,7 @@ sv:
         versions_list:
           back_to_resource: Gå tillbaka till debatten
       last_activity:
+        debate_updated_at_html: "<span>Debatt uppdaterades på %{link}</span>"
         new_debate_at_html: "<span>Ny debatt i %{link}</span>"
       models:
         debate:

data/db/migrate/20210310120652_add_followable_counter_cache_to_debates.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddFollowableCounterCacheToDebates < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_debates_debates, :follows_count, :integer, null: false, default: 0, index: true
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Debates::Debate.reset_column_information
+        Decidim::Debates::Debate.find_each do |record|
+          record.class.reset_counters(record.id, :follows)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/debates/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.24.0.rc1
+  version: 0.24.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc1
+        version: 0.24.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc1
+        version: 0.24.3
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc1
+        version: 0.24.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc1
+        version: 0.24.3
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -81,28 +81,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc1
+        version: 0.24.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc1
+        version: 0.24.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc1
+        version: 0.24.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc1
+        version: 0.24.3
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -277,6 +277,7 @@ files:
 - db/migrate/20200930145546_add_scope_to_debates_debate.rb
 - db/migrate/20201126112752_archive_debates.rb
 - db/migrate/20210125101735_revert_archive_debates.rb
+- db/migrate/20210310120652_add_followable_counter_cache_to_debates.rb
 - lib/decidim/api/debate_type.rb
 - lib/decidim/api/debates_type.rb
 - lib/decidim/debates.rb
@@ -302,9 +303,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: