decidim-debates 0.31.7 → 0.32.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b96154868e8fa67840ff75e2b1e2c2e639b6381cc0de973fd386d048c059489
-  data.tar.gz: afc9b574d1c21c8aa4ab183d48ffac5ed4e1cc441be9858eab59537c7c43dba6
+  metadata.gz: 504cf530bc1f11776d3cd5e93cd781f4888762c2b07597dd55f770f31c675707
+  data.tar.gz: a77fff7b61b400f0d2d3bce57683cd0c3c4f8e7872da65151f505f661b2c8ec4
 SHA512:
-  metadata.gz: 84cf3a73ca539d02d254b79be6e7b3415d0bfa8c96fbc618da9d93574339a18b4ba53834033a17ef586c6f1abf17f4f54d55373a1c6cbb6bd69533d773f93993
-  data.tar.gz: 0e1790ae0c8d7fb908fdac56a50ca04f594912b915e03aaa81e5852527fc258571892f324aa81d67c50cea5af5e34af8b20cb3d27e5b0403b2811f59fc7bf4cc
+  metadata.gz: 7fe7b852e10a54d98c97ae036879737a8cdf9c719f7cfcaee3ba4118fcbe0bc158dc8328c73f0df23e7e69672e446209936e8ec58cc4e634e711bd196b4ba245
+  data.tar.gz: 073e5d311a9649489291335fb94cdd9d6f8734a25adb5c2907830dd2dcb04b4f2751764dedc692baa756e2c2c58980eabc5ae0a78972248389ffd8ee33a0af4f

data/README.md

@@ -1,10 +1,14 @@
-# Decidim::Debates
+# decidim-debates
 
-The Debates module adds debate to any participatory process. It adds a CRUD engine to the admin and public view scoped inside the participatory process.
+The Debates module adds debate to any participatory space. It adds a CRUD engine to the admin and public view scoped inside the participatory space.
 
 ## Usage
 
-Debates will be available as a Component for any participatory space.
+Debates will be available as a Component for any Participatory Space.
+
+## Installation
+
+This is on the default Decidim installation so you should not change anything to use this component.
 
 ## Contributing
 

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

@@ -8,6 +8,7 @@ module Decidim
     # for a given instance of a Debate
     class DebateLCell < Decidim::CardLCell
       include Decidim::SanitizeHelper
+
       delegate :component_settings, to: :controller
 
       alias debate model

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

@@ -45,7 +45,7 @@ module Decidim
 
         def run_after_hooks
           @attached_to = resource
-          attachment_cleanup!(include_all_attachments: true)
+          document_cleanup!(include_all_attachments: true)
           create_attachments(first_weight: 1) if process_attachments?
         end
       end

data/app/commands/decidim/debates/close_debate.rb

@@ -28,6 +28,8 @@ module Decidim
 
       attr_reader :form
 
+      delegate :debate, to: :form
+
       def close_debate
         @debate = Decidim.traceability.perform_action!(
           :close,

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

@@ -56,7 +56,7 @@ module Decidim
 
       def run_after_hooks
         @attached_to = resource
-        attachment_cleanup!(include_all_attachments: true)
+        document_cleanup!(include_all_attachments: true)
         create_attachments(first_weight: 1) if process_attachments?
       end
     end

data/app/controllers/decidim/debates/admin/debate_closes_controller.rb

@@ -26,7 +26,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("debates.close.invalid", scope: "decidim.debates")
-              render action: "edit", status: :unprocessable_entity
+              render action: "edit", status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/debates/admin/debates_controller.rb

@@ -6,6 +6,7 @@ module Decidim
       # This controller allows an admin to manage debates from a Participatory Space
       class DebatesController < Decidim::Debates::Admin::ApplicationController
         include Decidim::Admin::HasTrashableResources
+
         helper Decidim::ApplicationHelper
 
         helper_method :debates
@@ -34,14 +35,14 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("debates.create.invalid", scope: "decidim.debates.admin")
-              render action: "new", status: :unprocessable_entity
+              render action: "new", status: :unprocessable_content
             end
           end
         end
 
         def edit
           enforce_permission_to(:update, :debate, debate:)
-          @form = form(Decidim::Debates::Admin::DebateForm).from_model(debate, debate:)
+          @form = form(Decidim::Debates::Admin::DebateForm).from_model(debate)
         end
 
         def update
@@ -57,7 +58,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("debates.update.invalid", scope: "decidim.debates.admin")
-              render action: "edit", status: :unprocessable_entity
+              render action: "edit", status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/debates/debates_controller.rb

@@ -35,7 +35,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("debates.create.invalid", scope: "decidim.debates")
-            render action: "new", status: :unprocessable_entity
+            render action: "new", status: :unprocessable_content
           end
         end
       end
@@ -63,7 +63,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("debates.update.invalid", scope: "decidim.debates")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end
@@ -76,12 +76,12 @@ module Decidim
         CloseDebate.call(@form) do
           on(:ok) do |debate|
             flash[:notice] = I18n.t("debates.close.success", scope: "decidim.debates")
-            redirect_back fallback_location: Decidim::ResourceLocatorPresenter.new(debate).path
+            redirect_back_or_to(Decidim::ResourceLocatorPresenter.new(debate).path)
           end
 
           on(:invalid) do
             flash[:alert] = I18n.t("debates.close.invalid", scope: "decidim.debates")
-            redirect_back fallback_location: Decidim::ResourceLocatorPresenter.new(debate).path
+            redirect_back_or_to(Decidim::ResourceLocatorPresenter.new(debate).path)
           end
         end
       end
@@ -125,6 +125,16 @@ module Decidim
       def tab_panel_items
         @tab_panel_items ||= attachments_tab_panel_items(debate)
       end
+
+      def add_breadcrumb_item
+        return {} if debate.blank?
+
+        {
+          label: translated_attribute(debate.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).debate_path(debate),
+          active: false
+        }
+      end
     end
   end
 end

data/app/controllers/decidim/debates/orderable.rb

@@ -14,18 +14,32 @@ module Decidim
         private
 
         def available_orders
-          @available_orders ||= %w(random recent commented updated)
+          @available_orders ||= possible_orders
+        end
+
+        def possible_orders
+          @possible_orders ||= begin
+            possible_orders = %w(random recent updated)
+            possible_orders << "most_commented" if most_commented_order_available?
+            possible_orders
+          end
         end
 
         def default_order
           "updated"
         end
 
+        def most_commented_order_available?
+          return @most_commented_order_available if defined?(@most_commented_order_available)
+
+          @most_commented_order_available = Decidim::Debates::Debate.most_commented_available?(current_component)
+        end
+
         def reorder(debates)
           case order
           when "recent"
             debates.order(created_at: :desc)
-          when "commented"
+          when "most_commented"
             debates.order(comments_count: :desc)
           when "updated"
             debates.order(updated_at: :desc)

data/app/controllers/decidim/debates/versions_controller.rb

@@ -9,7 +9,17 @@ module Decidim
       include Decidim::ResourceVersionsConcern
 
       def versioned_resource
-        @versioned_resource ||= present(Debate.where(component: current_component).not_hidden.find(params[:debate_id]))
+        @versioned_resource ||= Debate.where(component: current_component).not_hidden.find(params[:debate_id])
+      end
+
+      def add_breadcrumb_item
+        return {} if versioned_resource.blank?
+
+        {
+          label: translated_attribute(versioned_resource.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).debate_path(versioned_resource),
+          active: false
+        }
       end
     end
   end

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

@@ -23,7 +23,7 @@ module Decidim
         attribute :comments_enabled, Boolean, default: true
         attribute :attachment, AttachmentForm
 
-        attachments_attribute :attachments
+        attachments_attribute :documents
 
         validates :title, :description, translatable_presence: true
         validates :title, :description, translated_etiquette: true
@@ -42,11 +42,7 @@ module Decidim
           self.title = presenter.title(all_locales: title.is_a?(Hash))
           self.description = presenter.description(all_locales: description.is_a?(Hash))
           self.comments_layout = model.comments_layout || "single_column"
-          self.attachments = model.attachments
-        end
-
-        def comments_layout_locked?
-          debate&.comments_count&.positive?
+          self.documents = model.attachments
         end
 
         def participatory_space_manifest
@@ -76,7 +72,7 @@ module Decidim
         # an error, the attachment is lost, so we need a way to inform the user of
         # this problem.
         def notify_missing_attachment_if_errored
-          errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
+          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
         end
       end
     end

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

@@ -13,7 +13,7 @@ module Decidim
       attribute :description, String
       attribute :attachment, AttachmentForm
 
-      attachments_attribute :attachments
+      attachments_attribute :documents
 
       validates :title, :description, presence: true
       validates :title, :description, etiquette: true
@@ -26,7 +26,7 @@ module Decidim
         # user locale is taken as the text locale.
         self.title = debate.title.values.first
         self.description = debate.description.values.first
-        self.attachments = debate.attachments
+        self.documents = debate.attachments
       end
 
       def participatory_space_manifest

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

@@ -72,19 +72,31 @@ module Decidim
         @filter_sections ||= begin
           items = [{
             method: :with_any_state,
+            name: "[with_any_state]",
             collection: filter_debates_state_values,
             label: t("decidim.debates.debates.filters.state"),
             id: "date",
             type: :radio_buttons
           }]
           current_component.available_taxonomy_filters.each do |taxonomy_filter|
-            items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+            items.append(method: :with_any_taxonomies,
+                         name: "[with_any_taxonomies][#{taxonomy_filter.root_taxonomy_id}]",
                          collection: filter_taxonomy_values_for(taxonomy_filter),
                          label: decidim_sanitize_translated(taxonomy_filter.name),
                          id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")
           end
-          items.append(method: :with_any_origin, collection: filter_origin_values, label: t("decidim.debates.debates.filters.origin"), id: "origin")
-          items.append(method: :activity, collection: activity_filter_values, label: t("decidim.debates.debates.filters.activity"), id: "activity") if current_user
+          items.append(method: :with_any_origin,
+                       name: "[with_any_origin]",
+                       collection: filter_origin_values,
+                       label: t("decidim.debates.debates.filters.origin"),
+                       id: "origin")
+          if current_user
+            items.append(method: :activity,
+                         name: "[activity]",
+                         collection: activity_filter_values,
+                         label: t("decidim.debates.debates.filters.activity"),
+                         id: "activity")
+          end
 
           items.reject { |item| item[:collection].blank? }
         end

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

@@ -220,7 +220,7 @@ module Decidim
       # rubocop:disable Rails/SkipsModelValidations
       def update_comments_count
         comments_count = comments.not_hidden.not_deleted.count
-        last_comment = comments.not_hidden.not_deleted.order("created_at DESC").first
+        last_comment = comments.not_hidden.not_deleted.order(created_at: :desc).first
 
         update_columns(
           last_comment_at: last_comment&.created_at,
@@ -236,6 +236,15 @@ module Decidim
       # Create the :search_text ransacker alias for searching from both of these.
       ransacker_i18n_multi :search_text, [:title, :description]
 
+      def self.most_commented_available?(component)
+        return false unless component.settings.comments_enabled?
+
+        where(component:)
+          .not_hidden
+          .where("comments_count > 0")
+          .exists?
+      end
+
       def self.ransackable_scopes(_auth_object = nil)
         [:with_any_state, :with_any_origin, :with_any_taxonomies]
       end

data/app/permissions/decidim/debates/permissions.rb

@@ -31,6 +31,8 @@ module Decidim
       private
 
       def can_create_debate?
+        return false unless user
+
         authorized?(:create) &&
           current_settings&.creation_enabled? && component.participatory_space.can_participate?(user)
       end

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

@@ -57,7 +57,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_debates_info", scope: "decidim.admin"), class: :left do %>
+            <%= with_tooltip t("tooltips.deleted_debates_info", scope: "decidim.admin") do %>
               <%= icon "delete-bin-line", class: "text-gray" %>
               <span>
                 <%= t("actions.soft_delete", scope: "decidim.admin") %>

data/app/views/decidim/debates/admin/debates/_debate-tr.html.erb

@@ -8,12 +8,12 @@
   </td>
   <td data-label="<%= t("models.debate.fields.start_time", scope: "decidim.debates") %>">
     <% if debate.start_time %>
-      <%= l debate.start_time, format: :long %>
+      <%= l debate.start_time, format: :decidim_short %>
     <% end %>
   </td>
   <td data-label="<%= t("models.debate.fields.end_time", scope: "decidim.debates") %>">
     <% if debate.end_time %>
-      <%= l debate.end_time, format: :long %>
+      <%= l debate.end_time, format: :decidim_short %>
     <% end %>
   </td>
   <td data-label="<%= t("models.debate.fields.taxonomies", scope: "decidim.debates") %>">

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

@@ -48,13 +48,9 @@
 
       <div class="row column">
         <%= label_tag :comments_layout, t(".comments_visualization") %>
-        <% if @form.comments_layout_locked? %>
-          <%= cell("decidim/announcement", t(".comments_layout_locked_warning"), callout_class: "warning") %>
-        <% else %>
-          <span class="help-text"><%= t(".comments_warning") %></span>
-        <% end %>
+        <span class="help-text"><%= t(".comments_warning") %></span>
         <div>
-          <%= form.collection_radio_buttons(:comments_layout, [[t(".single_column"), "single_column"], [t(".two_columns"), "two_columns"]], :last, :first, {}, { disabled: @form.comments_layout_locked? }) do |builder|
+          <%= form.collection_radio_buttons(:comments_layout, [[t(".single_column"), "single_column"], [t(".two_columns"), "two_columns"]], :last, :first) do |builder|
             builder.label(class: "form__wrapper-checkbox-label") { builder.radio_button + builder.text }
           end %>
         </div>
@@ -62,7 +58,7 @@
 
       <% if component_settings.attachments_allowed? %>
         <div class="row column">
-          <%= form.attachment :attachments,
+          <%= form.attachment :documents,
                               multiple: true,
                               label: t("decidim.debates.admin.debates.form.add_attachments"),
                               button_label: t("decidim.debates.admin.debates.form.add_attachments"),

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

@@ -1,14 +1,14 @@
 
 <% if allowed_to?(:edit, :debate, debate: debate) %>
-  <li role="presentation" class="dropdown__item">
-    <%= link_to edit_debate_path(debate), class: "dropdown__button", role: "menuitem" do %>
+  <li role="menuitem" class="dropdown__item">
+    <%= link_to edit_debate_path(debate), class: "dropdown__button" do %>
       <span><%= t("edit_debate", scope: "decidim.debates.debates.show") %></span>
       <%= icon "pencil-line" %>
     <% end %>
   </li>
 <% elsif admin_allowed_to?(:update, :debate, debate: debate) %>
-  <li role="presentation" class="dropdown__item">
-    <%= link_to resource_locator(debate).edit, class: "dropdown__button", role: "menuitem" do %>
+  <li role="menuitem" class="dropdown__item">
+    <%= link_to resource_locator(debate).edit, class: "dropdown__button" do %>
       <span><%= t("edit_debate", scope: "decidim.debates.debates.show") %></span>
       <%= icon "pencil-line" %>
     <% end %>
@@ -17,15 +17,15 @@
 
 <% close_debate_action_text = (debate.closed? ? "decidim.debates.debates.show.edit_conclusions" : "decidim.debates.debates.show.close_debate" ) %>
 <% if allowed_to?(:close, :debate, debate: debate) %>
-  <li role="presentation" class="dropdown__item">
-    <button type="button" data-dialog-open="close-debate" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="dialog" tabindex="0" class="dropdown__button" role="menuitem">
+  <li role="menuitem" class="dropdown__item">
+    <button type="button" data-dialog-open="close-debate" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="dialog" tabindex="0" class="dropdown__button">
       <span><%= t(close_debate_action_text) %></span>
       <%= icon "lock-line" %>
     </button>
   </li>
 <% elsif admin_allowed_to?(:close, :debate, debate: debate) %>
-  <li role="presentation" class="dropdown__item">
-    <%= link_to Decidim::EngineRouter.admin_proxy(debate.component).edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), class: "dropdown__button", role: "menuitem" do %>
+  <li role="menuitem" class="dropdown__item">
+    <%= link_to Decidim::EngineRouter.admin_proxy(debate.component).edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), class: "dropdown__button" do %>
       <span><%= t(close_debate_action_text) %></span>
       <%= icon "lock-line" %>
     <% end %>

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

@@ -12,7 +12,7 @@
 
   <% if component_settings.attachments_allowed? %>
     <div class="row column">
-      <%= form.attachment :attachments,
+      <%= form.attachment :documents,
                           multiple: true,
                           label: t("decidim.debates.admin.debates.form.add_attachments"),
                           button_label: t("decidim.debates.admin.debates.form.add_attachments"),

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

@@ -1,7 +1,7 @@
 <% add_decidim_meta_tags(
   description: translated_attribute(current_participatory_space.try(:short_description) || current_participatory_space.description),
   title: t("decidim.components.pagination.page_title",
-           component_name: component_name,
+           component_name:,
            current_page: paginated_debates.current_page,
            total_pages: paginated_debates.total_pages ),
   url: debates_url,

data/config/locales/ar.yml

@@ -1,4 +1,3 @@
----
 ar:
   activemodel:
     attributes:
@@ -103,6 +102,14 @@ ar:
             title: عنوان
     events:
       debates:
+        create_debate_event:
+          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}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
@@ -116,7 +123,7 @@ ar:
       badges:
         commented_debates:
           conditions:
-          - اختر نقاشًا مفتوحًا للمشاركة فيه
+            - اختر نقاشًا مفتوحًا للمشاركة فيه
           description: تُمنح هذه الشارة عندما تشارك بنشاط في المناقشات المختلفة من خلال ترك تعليقاتك.
           description_another: شارك هذا المشارك في %{score} مناقشات.
           description_own: لقد شاركت في %{score} مناقشات.

data/config/locales/bg.yml

@@ -1,4 +1,3 @@
----
 bg:
   activemodel:
     attributes:
@@ -31,6 +30,7 @@ bg:
           global:
             announcement: Обявление
             comments_enabled: Коментарите са активирани
+            comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
           step:
             announcement: Обявление
             comments_blocked: Коментарите са блокирани
@@ -147,6 +147,13 @@ bg:
             email_outro: Получихте това известие, защото следвате %{participatory_space_title} пространство за участие. Можете да спрете да получавате известия, като следвате предишната връзка.
             email_subject: Нов дебат „%{resource_title}“ на %{participatory_space_title}
             notification_title: Дебатът <a href="%{resource_path}">%{resource_title}</a> беше създаден на <a href="%{participatory_space_url}">%{participatory_space_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}. Може да прекратите известията чрез предходния линк.
@@ -172,7 +179,7 @@ bg:
       badges:
         commented_debates:
           conditions:
-          - Изберете отворен дебат и участвайте в него
+            - Изберете отворен дебат и участвайте в него
           description: Тази значка се предоставя, когато участвате активно в различни дебати, като оставяте коментари.
           description_another: Този участник се е включил в %{score} дебата.
           description_own: Участвали сте в %{score} дебата.

data/config/locales/ca-IT.yml

@@ -1,4 +1,3 @@
----
 ca-IT:
   activemodel:
     attributes:
@@ -34,6 +33,7 @@ ca-IT:
           comment: Comentar
           create: Crear un debat
           like: M'agrada
+          vote_comment: Votar el comentari
         name: Debats
         settings:
           global:
@@ -41,7 +41,7 @@ ca-IT:
             attachments_allowed: Permetre fitxers adjunts
             clear_all: Netejar-ho tot
             comments_enabled: Comentaris habilitats
-            comments_max_length: Caràcters màxims per comentari (deixar a 0 el valor predeterminat)
+            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
             define_taxonomy_filters: Si us plau, defineix algunes filtres per aquest espai de participació abans de fer servir aquesta configuració.
             no_taxonomy_filters_found: No s'han trobat filtres de taxonomia.
             taxonomy_filters: Seleccionar filtres pel component
@@ -76,13 +76,12 @@ ca-IT:
           form:
             add_attachments: Afegir fitxer(s) adjunt(s)
             attachment_legend: Afegir un document o una imatge
-            comments_layout_locked_warning: No es pot canviar el disseny dels comentaris perquè ja s'han publicat comentaris.
             comments_visualization: Visualització dels comentaris
             comments_warning: Una vegada que es publica el primer comentari, l'opció de visualització seleccionada no es pot canviar.
             debate_type: Tipus de debat
             edit_attachments: Edita els fitxers adjunts
             errors:
-              comments_layout_locked: No es pot canviar el disseny dels comentaris perquè ja s'han publicat comentaris.
+              comments_layout_locked: No pots canviar el disseny del comentari una vegada que s'hagi publicat algun comentario.
             finite: Finit (amb moments d'inici i de fi)
             open: Obert (sense moments d'inici ni de fi)
             single_column: 'Columna única: Els comentaris es mostren per ordre cronològic i poden rebre respostes.'
@@ -157,8 +156,8 @@ ca-IT:
           create: Crear
           title: Crear un debat
         orders:
-          commented: Més comentats
           label: Ordenar debats per
+          most_commented: Més comentats
           random: Ordre aleatori
           recent: Més recents
           updated: Recentment actualitzats
@@ -205,10 +204,10 @@ ca-IT:
           user_followers:
             email_intro: |-
               Hola,
-              %{author_name}, a qui segueixes, ha creat un nou debat "%{resource_title}". Consulta i contribueix:
-            email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{author_name}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-            email_subject: Nou debat "%{resource_title}" creat per %{author_name}
-            notification_title: <a href="%{author_path}">%{author_name}</a> ha creat el debat <a href="%{resource_path}">%{resource_title}</a>.
+              %{author_name} %{author_nickname}, a qui segueixes, ha creat un nou debat "%{resource_title}". Consulta i contribueix:
+            email_outro: Has rebut aquesta notificació perquè estàs seguint a "%{author_nickname}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+            email_subject: Nou debat "%{resource_title}" de %{author_nickname}
+            notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha creat el debat <a href="%{resource_path}">%{resource_title}</a>.
         creation_disabled:
           email_intro: 'La creació de debats ja no està activa a %{participatory_space_title}. Encara pots participar en debats oberts des d''aquesta pàgina:'
           email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
@@ -234,7 +233,7 @@ ca-IT:
       badges:
         commented_debates:
           conditions:
-          - Tria un debat obert per participar
+            - Tria un debat obert per participar
           description: Aquesta ensenya es desbloqueja quan participes activament en els diferents debats deixant els teus comentaris.
           description_another: Aquesta participant ha pres part en %{score} debats.
           description_own: Has participat en %{score} debats.