decidim-proposals 0.26.4 → 0.27.0.rc1

data/app/services/decidim/proposals/proposal_search.rb

@@ -2,83 +2,28 @@
 
 module Decidim
   module Proposals
-    # A service to encapsualte all the logic when searching and filtering
-    # proposals in a participatory process.
+    # This service scopes the proposal searches with parameters that cannot be
+    # passed from the user interface.
     class ProposalSearch < ResourceSearch
-      text_search_fields :title, :body
+      attr_reader :type, :activity
 
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the proposals from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        options[:scope] = options.fetch(:scope, Proposal)
-        options[:scope] = options[:state_withdraw] == "withdrawn" ? options[:scope].withdrawn : options[:scope].except_withdrawn
-        super(options[:scope], options)
-      end
-
-      # Handle the activity filter
-      def search_activity
-        case activity
-        when "voted"
-          query
-            .includes(:votes)
-            .where(decidim_proposals_proposal_votes: { decidim_author_id: user })
-        when "my_proposals"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
-            .where(decidim_coauthorships: { decidim_author_id: user })
-        else # Assume 'all'
-          query
-        end
-      end
-
-      def search_state_withdraw
-        return query if state_withdraw == "withdrawn"
+      def build(params)
+        return super if search_context == :admin
 
-        query.except_withdrawn
-      end
+        @type = params[:type]
+        @activity = params[:activity]
 
-      # Handle the state filter
-      def search_state
-        apply_scopes(%w(accepted rejected evaluating state_not_published), state)
-      end
-
-      # Handle the amendment type filter
-      def search_type
-        case type
-        when "proposals"
-          query.only_amendables
-        when "amendments"
-          query.only_visible_emendations_for(user, component)
-        else # Assume 'all'
-          query.amendables_and_visible_emendations_for(user, component)
+        if params[:activity] && user
+          case params[:activity]
+          when "voted"
+            add_scope(:voted_by, user)
+          when "my_proposals"
+            add_scope(:coauthored_by, user)
+          end
         end
-      end
-
-      # Filters Proposals by the name of the classes they are linked to. By default,
-      # returns all Proposals. When a `related_to` param is given, then it camelcases item
-      # to find the real class name and checks the links for the Proposals.
-      #
-      # The `related_to` param is expected to be in this form:
-      #
-      #   "decidim/meetings/meeting"
-      #
-      # This can be achieved by performing `klass.name.underscore`.
-      #
-      # Returns only those proposals that are linked to the given class name.
-      def search_related_to
-        from = query
-               .joins(:resource_links_from)
-               .where(decidim_resource_links: { to_type: related_to.camelcase })
-
-        to = query
-             .joins(:resource_links_to)
-             .where(decidim_resource_links: { from_type: related_to.camelcase })
+        add_scope(:with_type, [params[:type], user, component]) if params[:type]
 
-        query.where(id: from).or(query.where(id: to))
+        super
       end
     end
   end

data/app/validators/proposal_length_validator.rb

@@ -5,14 +5,11 @@
 # allows the minimum and maximum values to be lambdas allowing us to fetch the
 # maximum length dynamically for each proposals component.
 class ProposalLengthValidator < ActiveModel::EachValidator
-  include ActionView::Helpers::SanitizeHelper
-
   def validate_each(record, attribute, value)
     return if value.blank?
 
-    text_value = strip_tags(value)
-    validate_min_length(record, attribute, text_value)
-    validate_max_length(record, attribute, text_value)
+    validate_min_length(record, attribute, value)
+    validate_max_length(record, attribute, value)
   end
 
   private

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

@@ -83,7 +83,7 @@
             </div>
 
             <div class="row column">
-              <%= form.upload :file, optional: false %>
+              <%= form.upload :file %>
               <% if params[:id].present? %>
                 <% if proposal.documents.present? %>
                   <%= form.hidden_field :id, value: proposal.documents.first.id %>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -7,8 +7,8 @@
   </td>
   <td>
     <%= link_to(
-      present(proposal).title(html_escape: true),
-      proposal_path(proposal)
+     decidim_html_escape(present(proposal).title).html_safe,
+     proposal_path(proposal)
     ) %><br>
   </td>
   <td>

data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb

@@ -1,4 +1,4 @@
-$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+$("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
 
 <% proposal_ids.each do |id| %>
   $(".table-list [data-id='<%= id %>']")

data/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb

@@ -0,0 +1,26 @@
+<% if flash.now[:error].present? %>
+  $("<%= form_selector %> <%= attribute_selector %>").addClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:alert].present? %>
+  $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:notice].present? %>
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+
+  <% proposal_ids.each do |id| %>
+    $(".table-list [data-id='<%= id %>']")
+      .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
+  <% end %>
+
+  $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
+  $(".js-check-all").prop('checked', false);
+  $(".js-check-all-resources").prop('checked', false);
+  window.hideBulkActionsButton();
+  window.hideBulkActionForms();
+  window.showOtherActionsButtons();
+  window.selectedResourcesCountUpdate();
+<% end %>

data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb

@@ -63,21 +63,13 @@
 <% if component_settings.attachments_allowed? %>
   <fieldset class="attachments_container">
     <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit") %></legend>
-    <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
-      <div class="field">
-        <%= nested_form.text_field :title %>
-      </div>
-
-      <div class="field">
-        <%= nested_form.upload :file, optional: false %>
-        <% if @form.errors[:attachment].present? %>
-          <% @form.errors[:attachment].each do |message| %>
-            <small class="form-error is-visible">
-              <%= message %>
-            </small>
-          <% end %>
-        <% end %>
-      </div>
-    <% end %>
+    <div class="row column">
+      <%= form.attachment :documents,
+        multiple: false,
+        label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+        button_label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+        button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"),
+        help_i18n_scope: "decidim.forms.file_help.file" %>
+    </div>
   </fieldset>
 <% end %>

data/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="collaborative_drafts">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -14,18 +14,18 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
+  <%= form.check_boxes_tree :with_any_state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
 
   <% if linked_classes_for(Decidim::Proposals::CollaborativeDraft).any? %>
     <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
+    <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>

data/app/views/decidim/proposals/collaborative_drafts/_wizard_aside.html.erb

@@ -1,6 +1,6 @@
 <div class="columns large-3">
   <div class="m-bottom">
-    <%= link_to collaborative_drafts_path do %>
+    <%= link_to :back do %>
       <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
       <%= t("back_from_collaborative_draft", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe %>
     <% end %>

data/app/views/decidim/proposals/collaborative_drafts/edit.html.erb

@@ -28,4 +28,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/app/views/decidim/proposals/collaborative_drafts/new.html.erb

@@ -21,4 +21,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb

@@ -67,49 +67,26 @@
 <% if component_settings.attachments_allowed? && @proposal %>
   <fieldset class="gallery__container photos_container">
     <legend><%= t("gallery_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-
-    <% if @form.photos.any? %>
-      <% @form.photos.each do |photo| %>
-        <div class="callout gallery__item" id="attachment_<%= photo.id %>" data-closable>
-          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.filename %>
-          <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
-          <button class="close-button"
-                  aria-label="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
-                  title="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
-                  type="button"
-                  data-close>
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-      <% end %>
-    <% end %>
-
     <div class="row column">
-      <%= form.file_field :add_photos, multiple: false, label: t("add_images", scope: "decidim.proposals.proposals.edit") %>
+      <%= form.attachment :photos,
+        multiple: false,
+        label: t("decidim.proposals.proposals.edit.add_image"),
+        button_label: t("decidim.proposals.proposals.edit.add_image"),
+        button_edit_label: t("decidim.proposals.proposals.edit.edit_image"),
+        help_i18n_scope: "decidim.forms.file_help.image",
+        extension_allowlist: Decidim::OrganizationSettings.for(current_organization).upload_allowed_file_extensions_image %>
     </div>
   </fieldset>
 
   <fieldset class="attachments_container gallery__container documents_container">
     <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-
-    <% if @form.documents.any? %>
-      <% @form.documents.each do |document| %>
-        <div class="callout" id="attachment_<%= document.id %>" data-closable>
-          <%= link_to translated_attribute(document.title), document.url %>
-          <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
-          <%= form.hidden_field :documents, multiple: true, value: document.id, id: "document-#{document.id}" %>
-          <button class="close-button"
-                  aria-label="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
-                  title="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
-                  type="button" data-close>
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-      <% end %>
-    <% end %>
-
     <div class="row column">
-      <%= form.file_field :add_documents, multiple: true, label: t("add_documents", scope: "decidim.proposals.proposals.edit") %>
+      <%= form.attachment :documents,
+        multiple: true,
+        label: t("decidim.proposals.proposals.edit.add_documents"),
+        button_label: t("decidim.proposals.proposals.edit.add_documents"),
+        button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
+        help_i18n_scope: "decidim.forms.file_help.file" %>
     </div>
   </fieldset>
 <% end %>

data/app/views/decidim/proposals/proposals/_filters.html.erb

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="proposals">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -17,19 +17,19 @@
   <%= form.hidden_field "state_withdraw", value: params.dig("filter", "state_withdraw") %>
 
   <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
-    <%= form.check_boxes_tree :state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
+    <%= form.check_boxes_tree :with_any_state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
+    <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if component_settings.official_proposals_enabled %>
-    <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
+    <%= form.check_boxes_tree :with_any_origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_user %>

data/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -1,7 +1,7 @@
-<% if params.dig("filter", "state_withdraw").present? && params["filter"]["state_withdraw"] == "withdrawn" %>
+<% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
   <div class="callout warning">
     <%= t("decidim.proposals.proposals.index.text_banner",
-          go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[state_withdraw]" => nil)),
+          go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[with_availability]" => nil)),
           ).html_safe %>
   </div>
 <% end %>
@@ -37,10 +37,10 @@
 
 <div class="row">
   <div class="text-right">
-    <% if params.dig("filter", "state_withdraw").present? && params["filter"]["state_withdraw"] == "withdrawn" %>
-      <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[state_withdraw]" => nil) %>
+    <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
+      <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[with_availability]" => nil) %>
     <% else %>
-      <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { state_withdraw: "withdrawn", state: [""] }) %>
+      <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { with_availability: "withdrawn", state: [""] }) %>
     <% end %>
   </div>
 </div>

data/app/views/decidim/proposals/proposals/complete.html.erb

@@ -21,4 +21,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/app/views/decidim/proposals/proposals/edit.html.erb

@@ -28,4 +28,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/app/views/decidim/proposals/proposals/edit_draft.html.erb

@@ -23,4 +23,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/app/views/decidim/proposals/proposals/new.html.erb

@@ -35,4 +35,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -36,10 +37,6 @@ ar:
           valuator_role_id: اسم المُقيِّم
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'نوع المستند غير صالح. التنسيقات المقبولة هي: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -206,6 +203,7 @@ ar:
           affected_user:
             email_intro: 'تم رفض اقتراحك "%{resource_title}". يمكنك قراءة الإجابة في هذه الصفحة:'
             email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف "%{resource_title}".
+            email_subject: تم رفض اقتراحك
             notification_title: تم رفض اقتراحك <a href="%{resource_path}">%{resource_title}</a>.
         proposal_update_category:
           email_intro: 'قام المشرف بتحديث فئة اقتراحك "%{resource_title}" ، تحقق من ذلك في هذه الصفحة:'
@@ -431,7 +429,6 @@ ar:
           all: الكل
         filter_origin_values:
           all: الكل
-          citizens: المواطنون
           meetings: اجتماعات
           official: الرسمية
           user_groups: المجموعات
@@ -475,6 +472,7 @@ ar:
             many: "%{count} مسودات تعاونية"
             other: "%{count} مسودات تعاونية"
         create:
+          error: كانت هناك مشكلة في إنشاء هذه المسودات التعاونية
           success: تم إنشاء مشروع تعاوني بنجاح.
         edit:
           attachment_legend: "(اختياري) إضافة مرفق"
@@ -608,12 +606,8 @@ ar:
             many: "%{count} مقترحات"
             other: "%{count} مقترحات"
         edit:
-          add_documents: المستندات
-          add_images: ملف
           attachment_legend: "(اختياري) إضافة مرفق"
           back: الى الخلف
-          delete_document: حذف المستند
-          delete_image: حذف الصورة
           select_a_category: الرجاء تحديد الفئة
           send: إرسال
           title: تعديل الاقتراح

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:
@@ -36,10 +37,6 @@ bg:
           valuator_role_id: Име на проверяващ
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Невалиден тип документ. Допустимите формати са: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -45,7 +46,7 @@ ca:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: 'Tipus de document no vàlid. Els formats acceptats són: %{valid_mime_types}'
+              allowed_file_content_types: 'Tipus de document invàlid. Els formats que s''accepten són: %{types}'
         proposal:
           attributes:
             add_documents:
@@ -213,7 +214,6 @@ ca:
             endorsements_enabled: Adhesions habilitades
             proposal_answering_enabled: Resposta a propostes activada
             publish_answers_immediately: Publica les respostes a les propostes immediatament
-            publish_answers_immediately_help_html: 'Tingues present que si respons alguna proposta sense que això estigui habilitat, l''hauràs de publicar-les manualment seleccionant-les i fent servir l''acció de publicar. Per a més informació sobre el funcionament, consulta la <a href="https://docs.decidim.org/en/admin/components/proposals/answers#_publication" target="_blank">pàgina de documentació de les respostes a les propostes</a>.'
             suggested_hashtags: Hashtags suggerits a les participants per a noves propostes
             votes_blocked: Suports bloquejats
             votes_enabled: Suports habilitats
@@ -303,7 +303,6 @@ ca:
           email_outro: Has rebut aquesta notificació perquè estàs seguint "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
           email_subject: Nova proposta "%{resource_title}" afegida a %{participatory_space_title}
           notification_title: '%{author} ha afegit la proposta <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title}'
-          notification_title_official: S'ha afegit la proposta oficial <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title}
         proposal_rejected:
           affected_user:
             email_intro: 'La teva proposta "%{resource_title}" ha estat rebutjada. Pots llegir la resposta en aquesta pàgina:'
@@ -402,21 +401,8 @@ ca:
           proposals: Propostes
         imports:
           help:
-            answers: |
-              El document d'importació ha de contindre els següents noms de columna i en cas d'arxius CSV o Excel o noms de claus en el cas d'arxius JSON:
-              <ul>
-              <li><b>id:</b> ID de la proposta a responder</li>
-              <li>state<b>:</b> Un d'aquests "acceptada", "en avaluació" o "rebutjada"</li>
-              <li><b>answer/en</b> Resposta en idioma inglés. Això dependrà de la configuració d'idioma predeterminat a la teva plataforma.</li>
-              </ul>
-            proposals: |
-              El document ha de contindre els següents noms de columna en cas d'arxius CSV o Excel o noms de claus en el cas d'arxius JSON:
-              <ul>
-              <li><b>title/ca:</b> Títol en català. Això dependrà de la configuració d'idioma predeterminat a la teva plataforma.</li>
-              <li><b>body/ca:</b> Descripció en català. Això dependrà de la configuració d'idioma predeterminat a la teva plataforma.</li>
-              <li><b>scope/id:</b> ID de l'Àmbit</li>
-              <li><b>category/id:</b> ID de la Categoria</li>
-              </ul>
+            answers: 'El document d''importació ha tenir les columnes següents: id, estat (acceptada, en avaluació, rebutjada) resposta/es (en els diferents idiomes habilitats a la plataforma).'
+            proposals: L'arxiu ha d'incloure els noms de columna title/ca i body/ca (o un altre idioma de preferència per exemple, title/es i body/es). També s'admeten les columnes scope/id i category/id.
           label:
             answers: Importar respostes des d'un fitxer
             proposals: Importar propostes des d'un fitxer
@@ -448,14 +434,14 @@ ca:
             info_1: Les seccions següents s'han convertit a propostes. Ara pots revisar-les i ajustar-les abans de publicar.
             publish_document: Publicar el document
             save_draft: Desa l'esborrany
-            title: Previsualitzar el text participatiu
+            title: PREVISUALITZAR EL TEXT PARTICIPATIU
           new_import:
             accepted_mime_types:
               md: Markdown
               odt: ODT
             bottom_hint: "(Podràs previsualitzar i ordenar les seccions del document)"
             document_legend: 'Afegeix un document de menys de 2 Mb, cadascuna de les seccions (fins a 3 nivells de profunditat) es convertiran a propostes. Els formats suportats són: %{valid_mime_types}'
-            title: Afegir document
+            title: AFEGIR DOCUMENT
             upload_document: Puja el document
           publish:
             invalid: No s'han pogut publicar propostes
@@ -609,9 +595,9 @@ ca:
           all: Totes
         filter_origin_values:
           all: Totes
-          citizens: Ciutadania
           meetings: Trobades
           official: Oficial
+          participants: Participants
           user_groups: Grups
         filter_scope_values:
           all: Totes
@@ -649,7 +635,7 @@ ca:
             one: "%{count} esborrany de col·laboració"
             other: "%{count} esborrany de col·laboració"
         create:
-          error: S'ha produït un error en crear aquest esborrany col·laboratiu.
+          error: S'ha produït un error en crear aquest esborrany col·laboratiu
           success: Esborrany col·laboratiu creat correctament.
         edit:
           attachment_legend: "(Opcional) Afegeix un fitxer adjunt"
@@ -674,6 +660,8 @@ ca:
           filter_by: Filtra per
           unfold: Desplega
         new:
+          add_file: Afegir fitxer
+          edit_file: Editar el fitxer
           send: Continua
         new_collaborative_draft_button:
           new_collaborative_draft: Nou esborrany col·laboratiu
@@ -784,12 +772,12 @@ ca:
           description: Les coordenades s'actualitzaran quan facis clic en el botó 'previsualitzar'. No obstant això, la direcció no canvia.
           instructions: Pots moure la ubicació en el mapa.
         edit:
-          add_documents: Documents
-          add_images: Arxiu
+          add_documents: Afegir documents
+          add_image: Afegir imatge
           attachment_legend: "(Opcional) Afegiu un fitxer adjunt"
           back: Torna
-          delete_document: Eliminar document
-          delete_image: Eliminar imatge
+          edit_documents: Editar documents
+          edit_image: Editar imatge
           gallery_legend: "(Opcional) Afegir una imatge a la targeta de proposta"
           select_a_category: Si us plau, selecciona una categoria
           send: Envia