decidim-debates 0.25.0.rc4 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb12754734b90b524a499369750d25389b91919379a48bb07949d677376d77bc
-  data.tar.gz: 922d06bb89952e8437cbd9c9fc85c7c28aecc1b05d096543745d2a455f537ebb
+  metadata.gz: 55d5d04bfd569a8e469670f017b8faac541f0342d6c0b5d03db007a47298ac52
+  data.tar.gz: ef54effe3a66781412437e4ac46c3a06a17da1dc3421f3b507de726522f1637b
 SHA512:
-  metadata.gz: 3bdce5d0f90674104b61f5944295c18c6097288c47e5047c26255faa686d3ebfceee9461ddfcac2036b7e78ace7e08159f44899078529a01c94a4a408ee4c1a9
-  data.tar.gz: ecefd0e1fcca866db6d0c917b7540e50764b095273aa431ae5ea889b61ba77ce3885f063aa6e764ce42496de0e1eb91c4f457a73a78a446c9d2ec82ef2c64b3d
+  metadata.gz: 611e2b7785c8b93c706127bb6c849813a98dfd4daa5b34d95a096fcbb83bd17947df6ed93a110aaa53d9dd26919151c535a9c5866ca9648db8a91e20cba00fac
+  data.tar.gz: 4a2feb241c1ff4d4f4fdbe1cb547db9b2f4e122cfdb44a93ccddcef7d3110cf04d24c924950f76957e9a09c8799231a90edea29281d1aafc108e1370138969ec

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

@@ -36,7 +36,7 @@ module Decidim
       end
 
       def body
-        decidim_sanitize(present(model).description)
+        decidim_sanitize_editor(present(model).description)
       end
 
       def description

data/app/commands/decidim/debates/admin/create_debate.rb

@@ -40,7 +40,8 @@ module Decidim
             start_time: (form.start_time if form.finite),
             scope: form.scope,
             component: form.current_component,
-            author: form.current_organization
+            author: form.current_organization,
+            comments_enabled: form.comments_enabled
           }
 
           @debate = Decidim.traceability.create!(

data/app/commands/decidim/debates/admin/update_debate.rb

@@ -43,7 +43,8 @@ module Decidim
             instructions: form.instructions,
             end_time: form.end_time,
             start_time: form.start_time,
-            scope: form.scope
+            scope: form.scope,
+            comments_enabled: form.comments_enabled
           )
         end
       end

data/app/forms/decidim/debates/admin/debate_form.rb

@@ -16,6 +16,7 @@ module Decidim
         attribute :decidim_category_id, Integer
         attribute :finite, Boolean, default: true
         attribute :scope_id, Integer
+        attribute :comments_enabled, Boolean, default: true
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true

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

@@ -22,7 +22,7 @@ module Decidim
       def render_debate_description(debate)
         description = present(debate).description(strip_tags: !safe_content?, links: true)
 
-        safe_content? ? decidim_sanitize(description) : simple_format(description)
+        safe_content? ? decidim_sanitize_editor(description) : simple_format(description)
       end
 
       # Returns :text_area or :editor based on current_component settings.

data/app/models/decidim/debates/debate.rb

@@ -11,6 +11,7 @@ module Decidim
       include Decidim::Resourceable
       include Decidim::Followable
       include Decidim::Comments::CommentableWithComponent
+      include Decidim::Comments::HasAvailabilityAttributes
       include Decidim::ScopableResource
       include Decidim::Authorable
       include Decidim::Reportable
@@ -57,6 +58,14 @@ module Decidim
         Decidim::Debates::AdminLog::DebatePresenter
       end
 
+      def comments_start_time
+        start_time
+      end
+
+      def comments_end_time
+        end_time
+      end
+
       # Public: Overrides the `reported_content_url` Reportable concern method.
       def reported_content_url
         ResourceLocatorPresenter.new(self).url
@@ -96,12 +105,12 @@ module Decidim
         (ama? && open_ama?) || !ama?
       end
 
-      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
+      # Public: Overrides the `accepts_new_comments?` CommentableWithComponent concern method.
       def accepts_new_comments?
         return false unless open?
         return false if closed?
 
-        commentable? && !comments_blocked?
+        commentable? && !comments_blocked? && comments_allowed?
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.

data/app/views/decidim/debates/admin/debates/_form.html.erb

@@ -43,6 +43,10 @@
     <div class="row column">
       <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
     </div>
+
+    <div class="row column">
+      <%= form.check_box :comments_enabled, label: t("enabled", scope: "decidim.comments.admin.shared.availability_fields") %>
+    </div>
   </div>
 </div>
 

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

@@ -1,6 +1,6 @@
-<div class="reveal close-debate-modal" id="closeDebateModal" data-reveal>
+<div class="reveal close-debate-modal" id="closeDebateModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="closeDebateModal-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t("decidim.debates.debates.show.close_debate") %></h3>
+    <h3 id="closeDebateModal-label" class="reveal__title"><%= t("decidim.debates.debates.show.close_debate") %></h3>
     <button class="close-button" data-close aria-label="<%= t(".close") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

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

@@ -1,13 +1,13 @@
 <div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger">
+  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
     <%= t ".filter" %>
     <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
   </button>
 </div>
 
-<div class="reveal" id="filter-box" data-reveal>
+<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <h3 id="filter-box-label" class="reveal__title"><%= t ".filter_by" %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

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

@@ -1,6 +1,6 @@
 <% add_decidim_meta_tags({
   description: translated_attribute(debate.description),
-  title: present(debate).title(html_escape: true ),
+  title: present(debate).title,
   url: debate_url(debate.id)
 }) %>
 
@@ -37,7 +37,7 @@ edit_link(
     <% end %>
     <% close_debate_action_text = (debate.closed? ? ".edit_conclusions" : ".close_debate" ) %>
     <% if allowed_to?(:close, :debate, debate: debate) %>
-      <button type="button" data-open="closeDebateModal" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="true" tabindex="0" class="button hollow expanded button-sc button--icon follow-button">
+      <button type="button" data-open="closeDebateModal" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="dialog" tabindex="0" class="button hollow expanded button-sc button--icon follow-button">
         <%= t(close_debate_action_text) %>
       </button>
     <% elsif admin_allowed_to?(:close, :debate, debate: debate) %>
@@ -108,12 +108,12 @@ edit_link(
 
       <% if translated_attribute(debate.instructions).present? %>
         <div class="callout secondary">
-          <%= decidim_sanitize(simple_format(translated_attribute(debate.instructions), {}, sanitize: false)) %>
+          <%= decidim_sanitize_editor(simple_format(translated_attribute(debate.instructions), {}, sanitize: false)) %>
         </div>
       <% end %>
       <% if translated_attribute(debate.information_updates).present? %>
         <div class="callout success">
-          <%= decidim_sanitize(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)) %>
+          <%= decidim_sanitize_editor(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)) %>
         </div>
       <% end %>
 

data/config/locales/ar.yml

@@ -14,7 +14,6 @@ ar:
     models:
       decidim/debates/create_debate_event: النقاش
       decidim/debates/creation_disabled_event: تم تعطيل المناقشات
-      decidim/debates/creation_enabled_event: تم تمكين المناقشات
   activerecord:
     models:
       decidim/debates/debate:
@@ -37,7 +36,6 @@ ar:
           step:
             announcement: إعلان
             comments_blocked: تم حظر التعليقات
-            creation_enabled: تم إنشاء المناقشة بواسطة المشاركين
     debates:
       actions:
         confirm_destroy: هل أنت واثق؟

data/config/locales/ca.yml

@@ -17,7 +17,6 @@ ca:
       decidim/debates/close_debate_event: Debat tancat
       decidim/debates/create_debate_event: Debat
       decidim/debates/creation_disabled_event: Debats deshabilitats
-      decidim/debates/creation_enabled_event: Debats habilitats
   activerecord:
     models:
       decidim/debates/debate:
@@ -27,6 +26,7 @@ ca:
     components:
       debates:
         actions:
+          comment: Comentar
           create: Crear
           endorse: Adherir-se
         name: Debats
@@ -40,7 +40,6 @@ ca:
           step:
             announcement: Avís
             comments_blocked: Comentaris bloquejats
-            creation_enabled: Creació de debats per part de les participants habilitada
             endorsements_blocked: Adhesions bloquejades
             endorsements_enabled: Adhesions habilitades
     debates:

data/config/locales/cs.yml

@@ -17,7 +17,7 @@ cs:
       decidim/debates/close_debate_event: Debata byla uzavřena
       decidim/debates/create_debate_event: Debata
       decidim/debates/creation_disabled_event: Debaty zakázány
-      decidim/debates/creation_enabled_event: Debaty povoleny
+      decidim/debates/creation_enabled_event: Vytvoření debat povoleno
   activerecord:
     models:
       decidim/debates/debate:
@@ -29,6 +29,7 @@ cs:
     components:
       debates:
         actions:
+          comment: Komentář
           create: Vytvořit
           endorse: Schválit
         name: Debaty
@@ -42,7 +43,7 @@ cs:
           step:
             announcement: Oznámení
             comments_blocked: Komentáře blokovány
-            creation_enabled: Vytváření debaty účastníky povoleno
+            creation_enabled: Účastníci mohou vytvářet debaty
             endorsements_blocked: Schvalování blokováno
             endorsements_enabled: Schvalování povoleno
     debates:

data/config/locales/de.yml

@@ -17,7 +17,6 @@ de:
       decidim/debates/close_debate_event: Debatte beendet
       decidim/debates/create_debate_event: Debatte
       decidim/debates/creation_disabled_event: Debatten deaktiviert
-      decidim/debates/creation_enabled_event: Debatten aktiviert
   activerecord:
     models:
       decidim/debates/debate:
@@ -40,7 +39,6 @@ de:
           step:
             announcement: Ankündigung
             comments_blocked: Kommentare blockiert
-            creation_enabled: Debate-Erstellung durch Benutzer aktiviert
             endorsements_blocked: Bestätigungen blockiert
             endorsements_enabled: Bestätigungen aktiviert
     debates:

data/config/locales/el.yml

@@ -14,7 +14,6 @@ el:
     models:
       decidim/debates/create_debate_event: Συζήτηση
       decidim/debates/creation_disabled_event: Οι συζητήσεις απενεργοποιήθηκαν
-      decidim/debates/creation_enabled_event: Οι συζητήσεις ενεργοποιήθηκαν
   activerecord:
     models:
       decidim/debates/debate:
@@ -33,7 +32,6 @@ el:
           step:
             announcement: Ανακοίνωση
             comments_blocked: Τα σχόλια αποκλείστηκαν
-            creation_enabled: Η δημιουργία συζήτησης από συμμετέχοντες ενεργοποιήθηκε
     debates:
       actions:
         confirm_destroy: Είστε βέβαιοι;

data/config/locales/en.yml

@@ -18,7 +18,7 @@ en:
       decidim/debates/close_debate_event: Debate closed
       decidim/debates/create_debate_event: Debate
       decidim/debates/creation_disabled_event: Debates disabled
-      decidim/debates/creation_enabled_event: Debates enabled
+      decidim/debates/creation_enabled_event: Debates creation enabled
   activerecord:
     models:
       decidim/debates/debate:
@@ -42,7 +42,7 @@ en:
           step:
             announcement: Announcement
             comments_blocked: Comments blocked
-            creation_enabled: Debate creation by participants enabled
+            creation_enabled: Participants can create debates
             endorsements_blocked: Endorsements blocked
             endorsements_enabled: Endorsements enabled
     debates:

data/config/locales/es-MX.yml

@@ -17,7 +17,6 @@ es-MX:
       decidim/debates/close_debate_event: Debate cerrado
       decidim/debates/create_debate_event: Debate
       decidim/debates/creation_disabled_event: Debates deshabilitados
-      decidim/debates/creation_enabled_event: Debates habilitados
   activerecord:
     models:
       decidim/debates/debate:
@@ -27,6 +26,7 @@ es-MX:
     components:
       debates:
         actions:
+          comment: Comentar
           create: Crear
           endorse: Adherirse
         name: Debates
@@ -40,7 +40,6 @@ es-MX:
           step:
             announcement: Anuncio
             comments_blocked: Comentarios bloqueados
-            creation_enabled: Habilitar la creación de debates por los usuarios
             endorsements_blocked: Adhesiones bloqueadas
             endorsements_enabled: Adhesiones habilitadas
     debates:

data/config/locales/es-PY.yml

@@ -17,7 +17,6 @@ es-PY:
       decidim/debates/close_debate_event: Debate cerrado
       decidim/debates/create_debate_event: Debate
       decidim/debates/creation_disabled_event: Debates deshabilitados
-      decidim/debates/creation_enabled_event: Debates habilitados
   activerecord:
     models:
       decidim/debates/debate:
@@ -27,6 +26,7 @@ es-PY:
     components:
       debates:
         actions:
+          comment: Comentar
           create: Crear
           endorse: Adherirse
         name: Debates
@@ -40,7 +40,6 @@ es-PY:
           step:
             announcement: Anuncio
             comments_blocked: Comentarios bloqueados
-            creation_enabled: Habilitar la creación de debates por los usuarios
             endorsements_blocked: Adhesiones bloqueadas
             endorsements_enabled: Adhesiones habilitadas
     debates:

data/config/locales/es.yml

@@ -17,7 +17,7 @@ es:
       decidim/debates/close_debate_event: Debate cerrado
       decidim/debates/create_debate_event: Debate
       decidim/debates/creation_disabled_event: Debates deshabilitados
-      decidim/debates/creation_enabled_event: Debates habilitados
+      decidim/debates/creation_enabled_event: Creación de debates habilitada
   activerecord:
     models:
       decidim/debates/debate:
@@ -27,6 +27,7 @@ es:
     components:
       debates:
         actions:
+          comment: Comentar
           create: Crear
           endorse: Adherirse
         name: Debates
@@ -40,7 +41,7 @@ es:
           step:
             announcement: Aviso
             comments_blocked: Comentarios bloqueados
-            creation_enabled: Creación de debates por parte de las participantes habilitada
+            creation_enabled: Las participantes pueden crear debates
             endorsements_blocked: Adhesiones bloqueadas
             endorsements_enabled: Adhesiones habilitadas
     debates:

data/config/locales/eu.yml

@@ -3,6 +3,8 @@ eu:
     attributes:
       debate:
         category_id: Kategoria
+        closed_at: Amaiera-data
+        conclusions: Ondorioak
         decidim_category_id: Kategoria
         description: deskribapena
         end_time: Amaitzen du
@@ -12,9 +14,9 @@ eu:
         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/creation_enabled_event: Debateak gaituta
   activerecord:
     models:
       decidim/debates/debate:
@@ -24,24 +26,35 @@ eu:
     components:
       debates:
         actions:
+          comment: Iruzkina
           create: Sortu
+          endorse: Atxiki
         name: eztabaidak
         settings:
           global:
             announcement: Anuntzio
             comments_enabled: Iruzkinak gaituta
+            comments_max_length: Iruzkinen gehieneko luzera (utzi 0 defektuz)
+            scope_id: Eremua
+            scopes_enabled: Esparruak gaituta
           step:
             announcement: Anuntzio
             comments_blocked: Iruzkinak blokeatuta
-            creation_enabled: Erabiltzaileek gaitutako eztabaida sortzea
+            endorsements_blocked: Atxikimenduak blokeatuta
+            endorsements_enabled: Atxikimenduak gaituta
     debates:
       actions:
+        close: Itxi
         confirm_destroy: Ziur zaude?
         destroy: ezabatu
         edit: Editatu
         new: '%{name} berria'
         title: Ekintzak
       admin:
+        debate_closes:
+          edit:
+            close: Itxi
+            title: Itxi eztabaida
         debates:
           create:
             invalid: Arazo bat izan da eztabaida sortzen ari den bitartean.
@@ -51,6 +64,10 @@ eu:
           edit:
             title: Editatu eztabaida
             update: Eguneratu eztabaida
+          form:
+            debate_type: Eztabaida mota
+            finite: Amaiera (hasiera- eta amaiera-ordua)
+            open: Zabalik (ez dago hasiera- edo amaiera-ordurik)
           index:
             title: eztabaidak
           new:
@@ -59,14 +76,27 @@ eu:
           update:
             invalid: Arazo bat izan da eztabaida hau eguneratzean.
             success: Debate arrakastaz eguneratu da.
+        exports:
+          comments: Iruzkinak
         models:
           debate:
             name: Debate
       admin_log:
         debate:
+          close: "%{user_name} erabiltzaileak %{resource_name} eztabaida sortu du %{space_name} esparruan"
           create: "%{user_name} %{resource_name} eztabaida sortu zen %{space_name} espazioan"
           update: "%{user_name} %{resource_name} eztabaida eguneratu zen %{space_name} espazioan"
+      debate_m:
+        commented_time_ago: Iruzkina eginda orain dela %{time}
       debates:
+        close:
+          invalid: Arazo bat izan da eztabaida ixtean.
+          success: Eztabaida zuzen itxi da.
+        close_debate_modal:
+          close: Itxi
+          description: Zein da eztabaida honen laburpena edo ondorioa?
+          send: Itxi eztabaida
+        closed: Itxita
         count:
           debates_count:
             one: "%{count} eztabaida"
@@ -76,14 +106,27 @@ eu:
           success: Debate sortu da behar bezala.
         debate:
           participate: Parte hartu
+        edit:
+          back: Atzera
+          save: Gorde aldaketak
+          title: Editatu eztabaida
         filters:
+          activity: Nire jarduera
           all: guztiak
           category: Kategoria
           category_prompt: Aukeratu kategoria bat
           citizens: Hiritarrak
+          commented: Iruzkina eginda
+          my_debates: Nire eztabaidak
           official: Ofiziala
           origin: Origin
+          scope: Eremua
           search: Search
+          state: Egoera
+          state_values:
+            closed: Itxita
+            open: Ireki
+          user_groups: Taldeak
         filters_small_view:
           close_modal: Itxi modal
           filter: Filter
@@ -97,7 +140,37 @@ eu:
           back: Back
           create: Sortu
           title: Berri eztabaida
+        orders:
+          commented: Iruzkin gehien dituztenak
+          label: Ordenatu eztabaidak honen arabera
+          random: Ausazko ordena
+          recent: Azkenak
+          updated: Orain dela gutxi eguneratuak
+        show:
+          back: Itzuli zerrendara
+          close_debate: Itxi eztabaida
+          date: Data
+          debate_closed: Itxita
+          debate_conclusions_are: 'Eztabaida %{date} egunean itxi zen ondorio hauekin:'
+          edit_conclusions: Editatu ondorioak
+          edit_debate: Editatu eztabaida
+          groups_count: Taldeak
+          last_comment_by: Honen azken iruzkina
+          no_comments_yet: Oraindik ez dago iruzkinik
+          open: Eztabaida irekita
+          participants_count: Parte-hartzaileak
+        update:
+          invalid: Arazo bat izan da eztabaida hau eguneratzean.
+          success: Eztabaida zuzen eguneratu da.
+        versions:
+          debates:
+            back_to_resource: Itzuli eztabaidara
+          index:
+            title: Bertsioak
+        versions_list:
+          back_to_resource: Itzuli eztabaidara
       last_activity:
+        debate_updated_at_html: "<span>eztabaida ordu honetan %{link}</span> eguneratuta"
         new_debate_at_html: "<span> %{link}</span>eztabaida berria"
       models:
         debate:
@@ -133,6 +206,17 @@ eu:
           email_outro: Jakinarazpena jaso duzu %{participatory_space_title}jarraituz gero. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
           email_subject: Debates orain eskuragarri %{participatory_space_title}
           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_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.
+          follower:
+            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.
     gamification:
       badges:
         commented_debates:
@@ -150,3 +234,5 @@ eu:
         description: Sortutako eztabaida kopurua
         object: eztabaidak
         title: eztabaidak
+    statistics:
+      debates_count: Eztabaidak

data/config/locales/fi-plain.yml

@@ -17,7 +17,6 @@ fi-pl:
       decidim/debates/close_debate_event: Keskustelu suljettu
       decidim/debates/create_debate_event: Keskustelu
       decidim/debates/creation_disabled_event: Keskustelut poistettu käytöstä
-      decidim/debates/creation_enabled_event: Keskustelut käytössä
   activerecord:
     models:
       decidim/debates/debate:
@@ -27,6 +26,7 @@ fi-pl:
     components:
       debates:
         actions:
+          comment: Kommentoi
           create: Luo
           endorse: Suosittele
         name: Keskustelut
@@ -40,7 +40,6 @@ fi-pl:
           step:
             announcement: Ilmoitus
             comments_blocked: Kommentointi estetty
-            creation_enabled: Keskustelujen luominen käyttäjien toimesta sallittu
             endorsements_blocked: Suositukset estetty
             endorsements_enabled: Suositukset käytössä
     debates:

data/config/locales/fi.yml

@@ -17,7 +17,7 @@ fi:
       decidim/debates/close_debate_event: Keskustelu suljettu
       decidim/debates/create_debate_event: Keskustelu
       decidim/debates/creation_disabled_event: Keskustelut poistettu käytöstä
-      decidim/debates/creation_enabled_event: Keskustelut käytössä
+      decidim/debates/creation_enabled_event: Keskustelujen luonti käytössä
   activerecord:
     models:
       decidim/debates/debate:
@@ -27,6 +27,7 @@ fi:
     components:
       debates:
         actions:
+          comment: Kommentoi
           create: Luo
           endorse: Suosittele
         name: Keskustelut
@@ -40,7 +41,7 @@ fi:
           step:
             announcement: Ilmoitus
             comments_blocked: Kommentointi estetty
-            creation_enabled: Keskustelujen luominen käyttäjien toimesta käytössä
+            creation_enabled: Osallistujat voivat luoda keskusteluja
             endorsements_blocked: Suositukset estetty
             endorsements_enabled: Suositukset käytössä
     debates:

data/config/locales/fr-CA.yml

@@ -17,7 +17,6 @@ fr-CA:
       decidim/debates/close_debate_event: Débat terminé
       decidim/debates/create_debate_event: Débat
       decidim/debates/creation_disabled_event: Débats désactivés
-      decidim/debates/creation_enabled_event: Débats activés
   activerecord:
     models:
       decidim/debates/debate:
@@ -27,6 +26,7 @@ fr-CA:
     components:
       debates:
         actions:
+          comment: Commenter
           create: Créer
           endorse: Soutenir
         name: Débats
@@ -40,7 +40,6 @@ fr-CA:
           step:
             announcement: Annonce
             comments_blocked: Commentaires désactivés
-            creation_enabled: Création de débats par les utilisateurs activés
             endorsements_blocked: Soutiens bloqués
             endorsements_enabled: Soutiens activés
     debates:
@@ -235,3 +234,5 @@ fr-CA:
         description: Nombre de débats créés
         object: débats
         title: Débats
+    statistics:
+      debates_count: Débats

data/config/locales/fr.yml

@@ -17,7 +17,6 @@ fr:
       decidim/debates/close_debate_event: Débat terminé
       decidim/debates/create_debate_event: Débat
       decidim/debates/creation_disabled_event: Débats désactivés
-      decidim/debates/creation_enabled_event: Débats activés
   activerecord:
     models:
       decidim/debates/debate:
@@ -27,6 +26,7 @@ fr:
     components:
       debates:
         actions:
+          comment: Commenter
           create: Créer
           endorse: Soutenir
         name: Débats
@@ -40,7 +40,6 @@ fr:
           step:
             announcement: Annonce
             comments_blocked: Commentaires désactivés
-            creation_enabled: Création de débats par les utilisateurs activés
             endorsements_blocked: Soutiens bloqués
             endorsements_enabled: Soutiens activés
     debates:
@@ -235,3 +234,5 @@ fr:
         description: Nombre de débats créés
         object: débats
         title: Débats
+    statistics:
+      debates_count: Débats