decidim-proposals 0.32.0.rc2 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fc06798927baa41252173d448c8d8cd405218e02eae208975061a6b6a736a87
-  data.tar.gz: 021d02221b22c4008ad24667e8f0a1e685aaf90647cdd2dbd1fb3d390c099248
+  metadata.gz: 76f8028076056c19ad5ce823a1d2907352d566302d0772a1da36b64c3c3e380e
+  data.tar.gz: 99c6c69cbe9aaa138371363daeb32334543da6a42b6e1f562c351c81217af5e8
 SHA512:
-  metadata.gz: 021c9c0a741e00b52bfed523c93268e8bd620212a90b9eb03d4e796720aecadbe45cf8235dfa8bd1b80f0ceb08ff80c58b9ef4515f92675d5ebea85b7a43f406
-  data.tar.gz: 97027564f5c0183ac1f93614e38212dedb57e7160bd28621e525c86fb81285a8d0894b43e5c728cb2ee2222257d1a736b1dcdee6e2cf0644bd07bac911cabb71
+  metadata.gz: 4cee4638c6cdd360b71bae094d98a65daade5926ecd34094b4cc0abfb3c97c4148b77f0f088dba2992e095301fd86470fd541c4f472b5d52307df9b7b0c0887d
+  data.tar.gz: 24650eff90d924e95ca68f827238989da1d53cb83f0a959f08788e03a68f7cbdc9b24cfa47acbe9daad95680cc5212930f168386ff17ab99345f0752ac9d7eaa

data/app/cells/decidim/proposals/proposal_vote/show.erb

@@ -1,19 +1,4 @@
-<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user&.admin?) %>
-  <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
-    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal: resource, from_proposals_list: true } %>
-  <% else %>
-    <% progress ||= resource.proposal_votes_count || 0 %>
-    <% total ||= resource.maximum_votes || 0 %>
-    <%= cell(
-          "decidim/progress_bar",
-          progress,
-          total:,
-          units_name: "decidim.proposals.proposals.votes_count.count",
-          element_id: "proposal-#{resource.id}-votes-count",
-          class: total.positive? ? "card__proposals-votes-limited" : "card__proposals-votes-unlimited"
-        ) %>
-  <% end %>
-<% end %>
+<%= cell("decidim/proposals/proposal_votes_count", resource, from_proposals_list:) %>
 
 <% button_classes = "button button__sm button__secondary w-full" %>
 

data/app/{views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb → cells/decidim/proposals/proposal_votes_count/participatory_texts.erb}

@@ -1,38 +1,38 @@
-<% if proposal.rejected? %>
+<% if resource.rejected? %>
   <div></div>
 <% else %>
   <% if !current_user %>
     <% if current_settings.votes_blocked? %>
-      <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
-        <%= proposal.proposal_votes_count || 0 %>
+      <button type="button" name="button" class="column button button--sc disabled" disabled id="<%= element_id %>">
+        <%= resource.proposal_votes_count || 0 %>
       </button>
     <% else %>
-      <button type="button" name="button" class="column button button--sc" id="proposal-<%= proposal.id %>-votes-count">
-        <%= proposal.proposal_votes_count || 0 %>
+      <button type="button" name="button" class="column button button--sc" id="<%= element_id %>">
+        <%= resource.proposal_votes_count || 0 %>
       </button>
     <% end %>
   <% else %>
-    <% if proposal_voted_by_user?(proposal) %>
-      <button type="button" name="button" class="column button success button--sc" id="proposal-<%= proposal.id %>-votes-count">
-        <%= proposal.proposal_votes_count || 0 %>
+    <% if proposal_voted_by_user?(resource) %>
+      <button type="button" name="button" class="column button success button--sc" id="<%= element_id %>">
+        <%= resource.proposal_votes_count || 0 %>
       </button>
     <% else %>
-      <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
-        <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
-          <%= proposal.proposal_votes_count || 0 %>
+      <% if resource.maximum_votes_reached? && !resource.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+        <button type="button" name="button" class="column button button--sc disabled" disabled id="<%= element_id %>">
+          <%= resource.proposal_votes_count || 0 %>
         </button>
       <% else %>
         <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
-          <button type="button" name="button" class="column button button--sc" disabled id="proposal-<%= proposal.id %>-votes-count">
-            <%= proposal.proposal_votes_count || 0 %>
+          <button type="button" name="button" class="column button button--sc" disabled id="<%= element_id %>">
+            <%= resource.proposal_votes_count || 0 %>
           </button>
         <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-          <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
-            <%= proposal.proposal_votes_count || 0 %>
+          <button type="button" name="button" class="column button button--sc disabled" disabled id="<%= element_id %>">
+            <%= resource.proposal_votes_count || 0 %>
           </button>
         <% else %>
-          <button type="button" name="button" class="column button button--sc" id="proposal-<%= proposal.id %>-votes-count">
-            <%= proposal.proposal_votes_count || 0 %>
+          <button type="button" name="button" class="column button button--sc" id="<%= element_id %>">
+            <%= resource.proposal_votes_count || 0 %>
           </button>
         <% end %>
       <% end %>

data/app/cells/decidim/proposals/proposal_votes_count/show.erb

@@ -0,0 +1,12 @@
+<% if participatory_texts_variant? %>
+  <%= render :participatory_texts %>
+<% else %>
+  <%= cell(
+        "decidim/progress_bar",
+        progress,
+        total:,
+        units_name: "decidim.proposals.proposals.votes_count.count",
+        element_id:,
+        class: progress_bar_class
+      ) %>
+<% end %>

data/app/cells/decidim/proposals/proposal_votes_count_cell.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # Renders the votes count (progress bar or participatory texts variant)
+    # for a given proposal
+    class ProposalVotesCountCell < Decidim::ViewModel
+      include Cell::ViewModel::Partial
+      include Decidim::Proposals::ProposalVotesHelper
+
+      alias resource model
+
+      def show
+        return unless can_see_votes?
+
+        render
+      end
+
+      private
+
+      def can_see_votes?
+        return false if component.current_settings.votes_hidden?
+
+        space_member? || admin? || transparent_space?
+      end
+
+      def space_member?
+        participatory_space.can_participate?(current_user)
+      end
+
+      def admin?
+        current_user&.admin?
+      end
+
+      def transparent_space?
+        participatory_space.try(:transparent?)
+      end
+
+      def participatory_texts_variant?
+        component.settings.participatory_texts_enabled? && from_proposals_list?
+      end
+
+      def component
+        resource.component
+      end
+      alias current_component component
+
+      def participatory_space
+        component.participatory_space
+      end
+
+      def current_settings
+        component.current_settings
+      end
+
+      def component_settings
+        component.settings
+      end
+
+      def from_proposals_list?
+        options[:from_proposals_list]
+      end
+
+      def progress
+        resource.proposal_votes_count || 0
+      end
+
+      def total
+        resource.maximum_votes || 0
+      end
+
+      def progress_bar_class
+        total.positive? ? "card__proposals-votes-limited" : "card__proposals-votes-unlimited"
+      end
+
+      def element_id
+        "proposal-#{resource.id}-votes-count"
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/admin/update_proposal.rb

@@ -36,7 +36,7 @@ module Decidim
           transaction do
             update_proposal
             update_proposal_author
-            document_cleanup!(include_all_attachments: true)
+            attachment_cleanup!(include_all_attachments: true)
             create_attachments(first_weight: first_attachment_weight) if process_attachments?
           end
 

data/app/commands/decidim/proposals/create_proposal.rb

@@ -82,7 +82,7 @@ module Decidim
             )
 
             proposal.taxonomizations = form.taxonomizations if form.taxonomizations.present?
-            proposal.documents = form.documents if form.documents.present?
+            proposal.attachments = form.attachments if form.attachments.present?
             if form.geocoded?
               proposal.latitude = form.latitude
               proposal.longitude = form.longitude

data/app/commands/decidim/proposals/update_proposal.rb

@@ -39,7 +39,7 @@ module Decidim
             update_proposal
           end
 
-          document_cleanup!(include_all_attachments: true)
+          attachment_cleanup!(include_all_attachments: true)
 
           create_attachments(first_weight: first_attachment_weight) if process_attachments?
         end

data/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -14,7 +14,7 @@ module Decidim
         translatable_attribute :body, Decidim::Attributes::RichText
         attribute :attachment, AttachmentForm
 
-        attachments_attribute :documents
+        attachments_attribute :attachments
 
         validates :title, :body, translatable_presence: true
         validates :title, :body, translated_etiquette: true
@@ -27,61 +27,12 @@ module Decidim
 
           self.title = presenter.title(all_locales: title.is_a?(Hash))
           self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
-          self.documents = model.attachments.ids
-          self.add_documents = model.attachments.map { |att| { id: att.id, title: att.title } }
-        end
-
-        def documents=(value)
-          case value
-          when String
-            super(parse_string_documents(value))
-          when Integer
-            super([value])
-          else
-            super
-          end
-        end
-
-        def documents
-          result = super
-
-          if should_use_add_documents?(result)
-            extract_ids_from_add_documents
-          else
-            result.is_a?(Array) ? result : []
-          end
+          self.attachments = model.attachments.ids
+          self.add_attachments = model.attachments.map { |att| { id: att.id, title: att.title } }
         end
 
         def notify_missing_attachment_if_errored
-          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
-        end
-
-        private
-
-        def should_use_add_documents?(result)
-          (result.blank? || result.is_a?(String)) && add_documents.present?
-        end
-
-        def extract_ids_from_add_documents
-          add_documents
-            .select { |doc| doc.is_a?(Hash) && (doc[:id].present? || doc["id"].present?) }
-            .map { |doc| (doc[:id] || doc["id"]).to_i }
-        end
-
-        def parse_string_documents(value)
-          return [] if value.blank?
-
-          parse_document_ids(value)
-        end
-
-        def parse_document_ids(value)
-          ids = begin
-            Array(JSON.parse(value))
-          rescue JSON::ParserError
-            value.split(",").map(&:strip)
-          end
-
-          ids.map(&:to_i).reject(&:zero?)
+          errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
         end
       end
     end

data/app/forms/decidim/proposals/admin/proposals_import_form.rb

@@ -16,7 +16,6 @@ module Decidim
         attribute :states, Array[String]
 
         validates :origin_component_id, :origin_component, :current_component, presence: true
-        validates :states, presence: true
         validate :valid_states
 
         def states

data/app/forms/decidim/proposals/admin/proposals_merge_form.rb

@@ -16,7 +16,7 @@ module Decidim
         attribute :target_component_id, Array[Integer]
         attribute :proposal_ids, Array
 
-        attachments_attribute :documents
+        attachments_attribute :attachments
 
         validates :target_component, :proposals, :current_component, presence: true
         validates :proposal_ids, length: { minimum: 2 }
@@ -62,7 +62,7 @@ module Decidim
         end
 
         def notify_missing_attachment_if_errored
-          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
+          errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
         end
       end
     end

data/app/forms/decidim/proposals/proposal_form.rb

@@ -19,7 +19,7 @@ module Decidim
       attribute :longitude, Float
       attribute :attachment, AttachmentForm
 
-      attachments_attribute :documents
+      attachments_attribute :attachments
 
       validates :title, :body, presence: true
       validates :title, :body, etiquette: true
@@ -42,7 +42,7 @@ module Decidim
         presenter = ProposalPresenter.new(model)
         self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
 
-        self.documents = model.attachments
+        self.attachments = model.attachments
       end
 
       def participatory_space_manifest
@@ -73,7 +73,7 @@ module Decidim
       # in any other field. This is needed because when the form has 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_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
+        errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
       end
     end
   end

data/app/jobs/decidim/proposals/admin/import_proposals_job.rb

@@ -32,7 +32,9 @@ module Decidim
         def proposals
           proposals = Decidim::Proposals::Proposal.not_hidden.not_withdrawn.where(component: origin_component)
 
-          if @form["states"].include?("not_answered")
+          if @form["states"].blank?
+            proposals
+          elsif @form["states"].include?("not_answered")
             proposals.not_answered.or(proposals.where(id: proposals.only_status(@form["states"]).pluck(:id)))
           else
             proposals.only_status(@form["states"])

data/app/models/decidim/proposals/proposal.rb

@@ -426,8 +426,14 @@ module Decidim
       # Create the :search_text ransacker alias for searching from both of these.
       ransacker_i18n_multi :search_text, [:title, :body]
 
+      ransacker_i18n :translated_title, :title
+
       def self.ransackable_attributes(_auth_object = nil)
-        %w(id_string search_text title body is_emendation comments_count proposal_votes_count published_at proposal_notes_count)
+        %w(
+          id_string search_text title translated_title body is_emendation
+          comments_count proposal_votes_count published_at proposal_notes_count
+          state_published evaluation_assignments_count
+        )
       end
 
       def self.ransackable_associations(_auth_object = nil)

data/app/packs/src/decidim/proposals/admin/proposals_merge.js

@@ -1,5 +1,4 @@
 import { createDialog } from "src/decidim/a11y"
-import createEditor from "src/decidim/editor";
 import attachGeocoding from "src/decidim/geocoding/attach_input";
 import { initializeUploadFields } from "src/decidim/direct_uploads/upload_field";
 import { initializeReverseGeocoding } from "src/decidim/geocoding/reverse_geocoding"
@@ -14,8 +13,6 @@ document.addEventListener("decidim:loaded", () => {
     const activateDrawerForm = () => {
       const saveForm = drawer.dialog.querySelector("#form-merge-proposals");
 
-      // Handles editor initialization
-      saveForm.querySelectorAll(".editor-container").forEach((element) => createEditor(element));
       const form = document.querySelector(".proposals_merge_form_admin");
 
       // Handles meeting checkbox

data/app/views/decidim/proposals/admin/proposal_states/index.html.erb

@@ -58,7 +58,7 @@
                   <% else %>
                     <li class="dropdown__item">
                       <div class="dropdown__button-disabled">
-                        <%= with_tooltip t("tooltips.deleted_proposal_states_info", scope: "decidim.admin") do %>
+                        <%= with_tooltip t("tooltips.deleted_proposal_states_info", scope: "decidim.admin"), class: :left do %>
                           <%= icon "delete-bin-line", class: "text-gray" %>
                           <span>
                             <%= t("actions.destroy", scope: "decidim.proposals") %>

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

@@ -22,7 +22,7 @@
       <% else %>
         <li class="dropdown__item">
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.cannot_edit_proposal_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.cannot_edit_proposal_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "pencil-line", class: "text-gray" %>
               <span>
                 <%= t("actions.edit_proposal", scope: "decidim.proposals") %>
@@ -73,7 +73,7 @@
           <% end %>
         <% else %>
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_proposals_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_proposals_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "pencil-line", class: "text-gray" %>
               <span>
                 <%= t("actions.edit_proposal", scope: "decidim.proposals") %>

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

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

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_merge.html.erb

@@ -3,6 +3,7 @@
 
   </div>
   <%# form_build automatically adds this tag when the editor form field is called but as this is rendered with ajax it will be ignored so we manually put here %>
+  <%= append_javascript_pack_tag "decidim_editor", defer: false %>
   <%= append_stylesheet_pack_tag "decidim_editor" %>
   <%= append_stylesheet_pack_tag "decidim_geocoding" %>
 <% end %>

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

@@ -6,7 +6,7 @@
     <%= render partial: "decidim/admin/shared/adjacent_navigation", locals: { adjacent_paths: filtered_adjacent_paths(proposal, :proposal_path) } %>
     <div class="component__show_header">
       <h2 class="component__show_header-title">
-        <%= decidim_html_escape(present(proposal).title).html_safe %>
+        <%= present(proposal).title(html_escape: true) %>
       </h2>
     </div>
 
@@ -20,7 +20,7 @@
             <li class="component__show_nav-author-title">
               <%= link_to_if(
                     presented_author.profile_path.present?,
-                    presented_author.name,
+                    decidim_html_escape(presented_author.name),
                     presented_author.profile_path,
                     target: :blank
                   ) %>
@@ -47,9 +47,9 @@
         <div class="card-section">
           <div class="row column">
             <span class="component__show-title"><%= t ".body" %></span>
-            <p class="component__show-text">
-              <%= simple_format(present(proposal).body(strip_tags: true)) %>
-            </p>
+            <div class="component__show-text editor-content">
+              <%= render_proposal_body(proposal) %>
+            </div>
           </div>
         </div>
 

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

@@ -33,7 +33,7 @@
       <% end %>
       <% if component_settings.attachments_allowed? %>
         <div class="row column pt-4">
-          <%= form.attachment :documents,
+          <%= form.attachment :attachments,
                               multiple: true,
                               label: t("decidim.proposals.proposals.edit.add_attachments"),
                               button_label: t("decidim.proposals.proposals.edit.add_attachments"),

data/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb

@@ -3,7 +3,7 @@
     var $proposalVotesCount = $('#proposal-<%= proposal.id %>-votes-count');
 
     if($proposalVotesCount[0]) {
-      morphdom($proposalVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/votes_count", locals: { proposal:, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
+      morphdom($proposalVotesCount[0], '<%= j(cell("decidim/proposals/proposal_votes_count", proposal, from_proposals_list: @from_proposals_list).to_s).strip.html_safe %>');
     }
 
     var $proposalVoteButton = $('#proposal-<%= proposal.id %>-vote-button');

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

@@ -23,7 +23,7 @@
   <% end %>
 <% end %>
 <% if component_settings.attachments_allowed? && (new_proposal || @proposal) %>
-  <%= form.attachment :documents,
+  <%= form.attachment :attachments,
                       multiple: true,
                       label: t("decidim.proposals.proposals.edit.add_attachments"),
                       button_label: t("decidim.proposals.proposals.edit.add_attachments"),

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

@@ -1,6 +1,6 @@
 <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
-  <li role="menuitem" class="dropdown__item">
-    <%= link_to edit_proposal_path(@proposal), class: "dropdown__button" do %>
+  <li role="presentation" class="dropdown__item">
+    <%= link_to edit_proposal_path(@proposal), class: "dropdown__button", role: "menuitem" do %>
       <span><%= t("edit_proposal", scope: "decidim.proposals.proposals.show") %></span>
       <%= icon "pencil-line" %>
     <% end %>
@@ -10,8 +10,8 @@
 <% end %>
 
 <% if @proposal.withdrawable_by?(current_user) %>
-  <li role="menuitem" class="dropdown__item">
-    <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), resource: @proposal, method: :put, class: "dropdown__button", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show" ), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show" ) } do %>
+  <li role="presentation" class="dropdown__item">
+    <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), resource: @proposal, method: :put, class: "dropdown__button", role: "menuitem", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show" ), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show" ) } do %>
       <span><%= t("withdraw_proposal", scope: "decidim.proposals.proposals.show") %></span>
       <%= icon "arrow-go-back-line" %>
     <% end %>

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

@@ -2,7 +2,7 @@
   <section class="layout-aside__section">
     <div class="proposal__aside-vote layout-aside__ctas-buttons" data-controller="sticky-buttons">
       <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } unless @proposal.withdrawn? %>
-      <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
+      <%= cell("decidim/proposals/proposal_votes_count", @proposal, from_proposals_list: false) %>
     </div>
   </section>
 <% end %>

data/config/locales/ar.yml

@@ -44,10 +44,6 @@ ar:
               allowed_file_content_types: 'نوع الوثيقة غير صالح. يسمح فقط بالملفات ذات الإضافات التالية: %{types}'
         proposal:
           attributes:
-            add_documents:
-              needs_to_be_reattached: يحتاج إلى إعادة ربط
-            add_photos:
-              needs_to_be_reattached: يحتاج إلى إعادة ربط
             body:
               cant_be_equal_to_template: لا يمكن أن يساوي القالب
               identical: لا يمكن أن يكون العنوان متطابقًا
@@ -125,7 +121,6 @@ ar:
             attachments_allowed: السماح للمرفقات
             collaborative_drafts_enabled: تم تمكين المسودات التعاونية
             comments_enabled: تم تمكين التعليقات
-            comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال القيمة الافتراضية)
             default_sort_order: التصنيف الافتراضي للاقتراح
             default_sort_order_options:
               most_commented: صاحبة الأكثر تعليقات
@@ -187,17 +182,14 @@ ar:
           email_intro: 'تم قبول %{requester_name} لأن يكون مسجلاً كمساهم في المسودة التعاونية <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: لقد تلقيت هذا الإشعار لأنك مساهم مع <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "تم قبول %{requester_name} للوصول كمساهم في %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> كان <strong>مقبولة للوصول كمساهم</strong> من <a href="%{resource_path}">%{resource_title}</a> مشروع تعاوني.
         collaborative_draft_access_rejected:
           email_intro: 'تم رفض %{requester_name} لأن يكون مسجلاً كمساهم في المسودة التعاونية <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: لقد تلقيت هذا الإشعار لأنك مساهم مع <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "تم رفض %{requester_name} للوصول كمساهم في المسودة التعاونية %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> تم رفض الوصول إلى <strong>كمساهم</strong> في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
           email_intro: 'طلب %{requester_name} إمكانية المشاركة كمساهم. يمكنك <strong>قبول أو رفض الطلب</strong> من صفحة المسودة التعاونية <a href="%{resource_url}">%{resource_title}</a>.'
           email_outro: لقد تلقيت هذا الإشعار لأنك مساهم مع <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} طلب الوصول للمساهمة في %{resource_title}."
-          notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> طلب الوصول للمساهمة في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a> . يرجى <strong>قبول أو رفض الطلب</strong>.
         collaborative_draft_access_requester_accepted:
           email_intro: تم قبول طلبك للمشاركة كمساهم في المسودة التعاونية <a href="%{resource_url}">%{resource_title}</a>.
           email_outro: لقد تلقيت هذا الإشعار لأنك طلبت أن تصبح مساهماً مع <a href="%{resource_url}">%{resource_title}</a>.
@@ -209,10 +201,7 @@ ar:
           email_subject: لقد تم رفضك كمساهم بـ %{resource_title}.
           notification_title: لقد تم رفض دخولك <strong>كمساهم</strong> في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> سحب <a href="%{resource_url}">%{resource_title}</a> المسودة التعاونية.
           email_outro: لقد تلقيت هذا الإشعار لأنك مساهم مع <a href="%{resource_url}">%{resource_title}</a>.
-          email_subject: "%{author_name} %{author_nickname} سحب المشروع %{resource_title} التعاوني."
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>سحبت</strong> مشروع <a href="%{resource_path}">%{resource_title}</a> التعاوني.
         creation_enabled:
           email_intro: 'يمكنك الآن إنشاء مقترحات جديدة في %{participatory_space_title}! ابدأ المشاركة في هذه الصفحة:'
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{participatory_space_title}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
@@ -222,11 +211,6 @@ ar:
           email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف "%{resource_title}".
           email_subject: تم ذكر اقتراحك "%{mentioned_proposal_title}"
           notification_title: لقد تم ذكر اقتراحك "%{mentioned_proposal_title}" <a href="%{resource_path}">في هذه المساحة</a> في التعليقات.
-        proposal_published:
-          email_intro: '%{author_name} %{author_nickname}، الذي تتابعه ، بنشر اقتراح جديد يسمى "%{resource_title}". التحقق من ذلك والمساهمة:'
-          email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{author_nickname}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
-          email_subject: اقتراح جديد "%{resource_title}" من %{author_nickname}
-          notification_title: تم نشر مقترح <a href="%{resource_path}">%{resource_title}</a> بواسطة <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: تمت إضافة الاقتراح "%{resource_title}" إلى "%{participatory_space_title}" الذي تتابعه.
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع "%{participatory_space_title}". يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.