decidim-proposals 0.26.0.rc2 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6de6e1aba63e22b53acd81b90dba35747c450fd0896f02a09b7e2ed4e0f4c399
-  data.tar.gz: f12f55b08a0b73b9be1551c5ddb9a19c6660a05bcb7e91566cd8473ec345e643
+  metadata.gz: e9316d8a84eaa9ab617ea9f953ecf52b05246f697da8fc598c4a8995d8d5900c
+  data.tar.gz: 1e66d935e6c4e58181bb395483d8f1f7d4cd89ee5fe09412367f608fd809408b
 SHA512:
-  metadata.gz: 33765293150b20320f7af104930f1a7253e54779728d8bd20eb4297899c290ffe5d946339870bf5536c5d9fe73f1632f97768c0a15a3359dcbbaee70f83a5a71
-  data.tar.gz: 79e1c45b96cb97a895b205830181c866b77bcb0ca7dbf3996ccc0463605615bf480ccc4dd9dc4ee3dad1d7280eb7a62d9a19da42facd0c693dd9ee1fea1a7b0d
+  metadata.gz: 3644baab02f8d01130733c7db392f765e58a5a1674eddce50e3be2a6ecb44483a08cf0a96cdd725c467d0e46fa8b7467f2bb2cf6722c11b75a37f925eae4bdb2
+  data.tar.gz: 6c43f7c39bed8f2ebf8fea345f0e82f2a4b451e9c38896c6c736b76338a2184be45137f8a9ee09d59e4583ba92b38f0eff4175811378ae1ac4d3324f5ca3fab0

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

@@ -22,7 +22,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path(filter_link_params)
+        resource_locator(model).path
       end
 
       def current_participatory_space

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

@@ -39,7 +39,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path(filter_link_params)
+        resource_locator(model).path
       end
 
       def amend_resource_path

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

@@ -22,7 +22,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path(filter_link_params)
+        resource_locator(model).path
       end
 
       def current_participatory_space

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

@@ -122,7 +122,7 @@ module Decidim
       end
 
       def resource_image_path
-        @resource_image_path ||= has_image? ? model.attachments.find_by("content_type like '%image%'").url : nil
+        @resource_image_path ||= has_image? ? model.attachments.find_by("content_type like '%image%'").thumbnail_url : nil
       end
 
       def cache_hash
@@ -143,6 +143,8 @@ module Decidim
         hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
         hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
         hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
+        hash << has_footer?
+        hash << has_actions?
 
         hash.join(Decidim.cache_key_separator)
       end

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

@@ -63,6 +63,7 @@ module Decidim
         @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, component)
                          &.includes(:component)
                          &.published
+                         &.not_hidden
                          &.order(id: :asc)
       end
 

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

@@ -46,13 +46,18 @@ module Decidim
             attributes = {
               state: form.state,
               answer: form.answer,
-              answered_at: Time.current,
               cost: form.cost,
               cost_report: form.cost_report,
               execution_period: form.execution_period
             }
 
-            attributes[:state_published_at] = Time.current if !initial_has_state_published && form.publish_answer?
+            if form.state == "not_answered"
+              attributes[:answered_at] = nil
+              attributes[:state_published_at] = nil
+            else
+              attributes[:answered_at] = Time.current
+              attributes[:state_published_at] = Time.current if !initial_has_state_published && form.publish_answer?
+            end
 
             proposal.update!(attributes)
           end

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

@@ -61,7 +61,7 @@ module Decidim
 
         def attributes
           parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-          parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
+          parsed_body = Decidim::ContentProcessor.parse(form.body, current_organization: form.current_organization).rewrite
           {
             title: parsed_title,
             body: parsed_body,

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

@@ -59,7 +59,7 @@ module Decidim
 
         def update_proposal
           parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-          parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
+          parsed_body = Decidim::ContentProcessor.parse(form.body, current_organization: form.current_organization).rewrite
           Decidim.traceability.update!(
             proposal,
             form.current_user,

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

@@ -13,7 +13,7 @@ module Decidim
 
       def body_with_hashtags
         @body_with_hashtags ||= begin
-          ret = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite.strip
+          ret = Decidim::ContentProcessor.parse(form.body, current_organization: form.current_organization).rewrite.strip
           ret += "\n#{body_extra_hashtags.strip}" unless body_extra_hashtags.empty?
           ret
         end

data/app/events/decidim/proposals/admin/proposal_note_created_event.rb

@@ -13,7 +13,7 @@ module Decidim
         end
 
         def admin_proposal_info_url
-          decidim_admin_participatory_process_proposals.proposal_url(resource, resource.component.mounted_params)
+          send(resource.component.mounted_admin_engine).proposal_url(resource, resource.component.mounted_params)
         end
 
         private

data/app/events/decidim/proposals/collaborative_draft_withdrawn_event.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     class CollaborativeDraftWithdrawnEvent < Decidim::Events::SimpleEvent
-      i18n_attributes :author_nickname, :author_name, :author_path
+      i18n_attributes :author_nickname, :author_name, :author_path, :author_url
 
       delegate :nickname, :name, to: :author, prefix: true
 
@@ -15,6 +15,10 @@ module Decidim
         author.profile_path
       end
 
+      def author_url
+        author.profile_url
+      end
+
       private
 
       def author

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

@@ -14,7 +14,7 @@ module Decidim
         attribute :cost, Float
         attribute :internal_state, String
 
-        validates :internal_state, presence: true, inclusion: { in: %w(accepted rejected evaluating) }
+        validates :internal_state, presence: true, inclusion: { in: %w(not_answered accepted rejected evaluating) }
         validates :answer, translatable_presence: true, if: ->(form) { form.state == "rejected" }
 
         with_options if: :costs_required? do

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

@@ -82,7 +82,7 @@ module Decidim
         # Finds the Meetings of the current participatory space
         def meetings
           @meetings ||= Decidim.find_resource_manifest(:meetings).try(:resource_scope, current_component)
-                               &.order(title: :asc)
+                          &.published&.order(title: :asc)
         end
 
         # Return the meeting as author

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

@@ -102,7 +102,7 @@ module Decidim
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_proposal_body(proposal)
-        render_sanitized_content(proposal, :body)
+        Decidim::ContentProcessor.render(render_sanitized_content(proposal, :body), "div")
       end
 
       # Returns :text_area or :editor based on the organization' settings.

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

@@ -229,6 +229,12 @@ module Decidim
         ResourceLocatorPresenter.new(self).url
       end
 
+      # Returns the presenter for this author, to be used in the views.
+      # Required by ResourceRenderer.
+      def presenter
+        Decidim::Proposals::ProposalPresenter.new(self)
+      end
+
       # Public: Overrides the `reported_attributes` Reportable concern method.
       def reported_attributes
         [:title, :body]

data/app/permissions/decidim/proposals/admin/permissions.rb

@@ -120,7 +120,10 @@ module Decidim
 
         # Proposals can only be created from the admin when the
         # corresponding setting is enabled.
+        # This setting is incompatible with participatory texts.
         def can_create_proposal_from_admin?
+          return disallow! if participatory_texts_are_enabled? && permission_action.subject == :proposal
+
           toggle_allow(admin_creation_is_enabled?) if permission_action.subject == :proposal
         end
 

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

@@ -6,7 +6,7 @@
 
     <div class="card-section">
       <div class="row column">
-        <%= f.collection_radio_buttons :internal_state, [["accepted", t(".accepted")], ["rejected", t(".rejected")], ["evaluating", t(".evaluating")]], :first, :last, prompt: true %>
+        <%= f.collection_radio_buttons :internal_state, [["not_answered", t(".not_answered")], ["accepted", t(".accepted")], ["rejected", t(".rejected")], ["evaluating", t(".evaluating")]], :first, :last, prompt: true %>
       </div>
 
       <div class="row column">

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

@@ -15,7 +15,7 @@
 
       <%== cell("decidim/proposals/proposal_m", proposal).badge %>
 
-      <p><%= truncate(present(proposal).body(strip_tags: true), length: 100) %></p>
+      <p><%= strip_tags(render_proposal_body(proposal)).truncate(100) %></p>
       <%= cell "decidim/tags", proposal, context: { extra_classes: ["tags--proposal"] } %>
     </div>
   </div>

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

@@ -28,9 +28,9 @@
 <%= render partial: "voting_rules" %>
 <div class="row columns">
   <div class="title-action">
-    <h3 id="proposals-count" class="title-action__title section-heading">
+    <h2 id="proposals-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
-    </h3>
+    </h2>
     <% if current_settings.creation_enabled && current_component.participatory_space.can_participate?(current_user) %>
       <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small", data: { "redirect_url" => new_proposal_path } do %>
         <%= t(".new_proposal") %>

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

@@ -35,16 +35,16 @@ extra_admin_link(
 <div class="row column view-header">
 
   <div class="m-bottom">
-    <%= link_to proposals_path(filter_link_params), class: "small hollow" do %>
+    <%= link_to proposals_path, class: "small hollow js-back-to-list" do %>
       <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
       <%= t(".back_to_list") %>
     <% end %>
   </div>
 
   <% if @proposal.emendation? %>
-    <h3 class="heading3"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h3>
+    <h2 class="heading3"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h2>
   <% else %>
-    <h3 class="heading3"><%= present(@proposal).title(links: true, html_escape: true) %></h3>
+    <h2 class="heading3"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
   <% end %>
   <% unless component_settings.participatory_texts_enabled? %>
     <%= cell("decidim/coauthorships", @proposal, has_actions: true, size: 3, context: { current_user: current_user }) %>

data/config/locales/ar.yml

@@ -94,6 +94,8 @@ ar:
     admin:
       filters:
         proposals:
+          category_id_eq:
+            label: الفئة
           valuator_role_ids_has:
             label: تم إسناده إلى مُقيِّم
     components:
@@ -146,33 +148,21 @@ ar:
     events:
       proposals:
         collaborative_draft_access_accepted:
-          email_intro: 'تم قبول %{requester_name} للوصول كمساهم في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: لقد تلقيت هذا الإشعار لأنك متعاون مع <a href="%{resource_path}">%{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_path}">%{resource_title}</a>.'
-          email_outro: لقد تلقيت هذا الإشعار لأنك متعاون مع <a href="%{resource_path}">%{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_path}">%{resource_title}</a> مشروع الصفحة التعاونية.'
-          email_outro: لقد تلقيت هذا الإشعار لأنك متعاون مع <a href="%{resource_path}">%{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_path}">%{resource_title}</a>.
-          email_outro: لقد تلقيت هذا الإشعار لأنك طلبت أن تصبح متعاونًا مع <a href="%{resource_path}">%{resource_title}</a>.
           email_subject: تم قبولك كمساهم بـ %{resource_title}.
           notification_title: لقد تم قبول <strong>للدخول كمساهم</strong> في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requester_rejected:
-          email_intro: لقد تم رفض وصولك كمساهم في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: لقد تلقيت هذا الإشعار لأنك طلبت أن تصبح متعاونًا مع <a href="%{resource_path}">%{resource_title}</a>.
           email_subject: لقد تم رفضك كمساهم بـ %{resource_title}.
           notification_title: لقد تم رفض دخولك <strong>كمساهم</strong> في المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_path}">%{author_name} %{author_nickname}</a> سحبت المسودة التعاونية <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: لقد تلقيت هذا الإشعار لأنك متعاون مع <a href="%{resource_path}">%{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:
@@ -620,8 +610,12 @@ ar:
             many: "%{count} مقترحات"
             other: "%{count} مقترحات"
         edit:
+          add_documents: المستندات
+          add_images: ملف
           attachment_legend: "(اختياري) إضافة مرفق"
           back: الى الخلف
+          delete_document: حذف المستند
+          delete_image: حذف الصورة
           select_a_category: الرجاء تحديد الفئة
           send: إرسال
           title: تعديل الاقتراح
@@ -663,7 +657,6 @@ ar:
             other: الدعم
         new:
           send: استمر
-          title: إنشاء اقتراحك
         orders:
           label: 'ترتيب المقترحات حسب:'
           most_commented: الأكثر تعليقًا عليها

data/config/locales/bg.yml

@@ -155,33 +155,21 @@ bg:
             email_subject: Някой е направил бележка в предложението %{resource_title}.
             notification_title: Някой е направил бележка в предложението <a href="%{resource_path}">%{resource_title}</a>. Вижте я в <a href="%{admin_proposal_info_path}">администраторския панел</a>
         collaborative_draft_access_accepted:
-          email_intro: '%{requester_name} получи достъп като сътрудник в съвместната чернова <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: Получихте известие, защото сте сътрудник в <a href="%{resource_path}">%{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_path}">%{resource_title}</a>.'
-          email_outro: Получихте известие, защото сте сътрудник в <a href="%{resource_path}">%{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_path}">%{resource_title}</a>.'
-          email_outro: Получихте известие, защото сте сътрудник в <a href="%{resource_path}">%{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_path}">%{resource_title}</a>.
-          email_outro: Получихте известие, защото заявихте да бъдете сътрудник в <a href="%{resource_path}">%{resource_title}</a>.
           email_subject: Приет сте като сътрудник в %{resource_title}.
           notification_title: <strong>Получихте достъп като сътрудник</strong> в колективната чернова <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requester_rejected:
-          email_intro: Отказан Ви е достъп като сътрудник в колективната чернова <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Получихте известие, защото заявихте да бъдете сътрудник в <a href="%{resource_path}">%{resource_title}</a>.
           email_subject: Отхвърлен сте като сътрудник в %{resource_title}.
           notification_title: <strong>Отказан Ви е достъп като сътрудник</strong> в колективната чернова <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_path}">%{author_name} %{author_nickname}</a> оттегли колективната чернова <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Получихте известие, защото сте сътрудник в <a href="%{resource_path}">%{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:

data/config/locales/ca.yml

@@ -197,6 +197,7 @@ ca:
             automatic_hashtags: Hashtags afegits a totes les propostes
             comments_blocked: Comentaris bloquejats
             creation_enabled: Les participants poden crear propostes
+            creation_enabled_readonly: Aquesta opció es desactiva quan actives la funcionalitat de Textos Participatius. Per a pujar propostes com a text participatiu fes clic al botó de Textos Participatius i segueix les instruccions.
             default_sort_order: Ordre per defecte de propostes
             default_sort_order_help: '''Per defecte'' vol dir que si els suports estan habilitats, les propostes es mostraran aleatòriament, i si els suports estan bloquejats, aleshores es mostraran de més a menys suports.'
             default_sort_order_options:
@@ -225,33 +226,33 @@ ca:
             email_subject: Algú ha deixat una nota a la proposta %{resource_title}.
             notification_title: Algú ha deixat una nota a la proposta <a href="%{resource_path}">%{resource_title}</a>. Revisa-la ara a través del <a href="%{admin_proposal_info_path}">taulell d'admistració</a>
         collaborative_draft_access_accepted:
-          email_intro: 'S''ha acceptat %{requester_name} per accedir com a contribuidora de l''esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: Has rebut aquesta notificació perquè ets contribuidora de <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: 'S''ha acceptat %{requester_name} per accedir com a contribuidora de l''esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.'
+          email_outro: Has rebut aquesta notificació perquè ets una contribuïdora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "S'ha acceptat %{requester_name} per accedir com a contribuidora del %{resource_title}."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha estat <strong>acceptat per accedir com a contribuidora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
-          email_intro: 'S''ha rebutjat %{requester_name} per accedir com a contribuidora de l''esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: Has rebut aquesta notificació perquè ets contribuidora de <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: 'S''ha rebutjat que %{requester_name} accedeixi com a contribuidora de l''esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.'
+          email_outro: Has rebut aquesta notificació perquè ets una contribuïdora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "S'ha rebutjat %{requester_name} per accedir com a contribuïdora de l'esborrany col·laboratiu %{resource_title}."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a><strong> ha estat rebutjat per accedir com a contribuïdora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
-          email_intro: '%{requester_name} ha sol·licitat accés com a contribuïdora. Pots <strong>acceptar o rebutjar la sol·licitud</strong> de l''esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: Has rebut aquesta notificació perquè ets contribuïdora de <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: '%{requester_name} ha sol·licitat accés com a contribuïdora. Pots <strong>acceptar o rebutjar la sol·licitud</strong> de l''esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.'
+          email_outro: Has rebut aquesta notificació perquè ets contribuïdora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} ha demanat accés per contribuir a %{resource_title}."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> ha sol·licitat accés per contribuir a l'esborrany col·laboratiu de <a href="%{resource_path}">%{resource_title}</a>. Si us plau, <strong>accepta o rebutja la sol·licitud</strong>.
         collaborative_draft_access_requester_accepted:
-          email_intro: Has estat acceptada com a contribuïdora de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Has rebut aquesta notificació perquè has sol·licitat ser contribuïdora de <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: Has estat acceptada com a contribuïdora de l'esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.
+          email_outro: Has rebut aquesta notificació perquè has sol·licitat ser contribuïdora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: Has estat acceptada com a contribuïdora de %{resource_title}.
           notification_title: Has estat acceptada <strong>com a contribuïdora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requester_rejected:
-          email_intro: Has estat rebutjada per accedir com a contribuïdora de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Has rebut aquesta notificació perquè has sol·licitat ser contribuïdora de <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: Has estat rebutjada per accedir com a contribuïdora de l'esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.
+          email_outro: Has rebut aquesta notificació perquè has sol·licitat ser contribuïdora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: Has estat rebutjada com a contribuïdora de %{resource_title}.
           notification_title: Has estat rebutjada <strong>per accedir com a contribuïdora</strong> de l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha retirat l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Has rebut aquesta notificació perquè ets una contribuïdora de <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> ha retirat l'esborrany col·laboratiu <a href="%{resource_url}">%{resource_title}</a>.
+          email_outro: Has rebut aquesta notificació perquè ets contribuïdora de <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{author_name} %{author_nickname} ha retirat l'esborrany col·laboratiu %{resource_title}."
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>ha retirat</strong> l'esborrany col·laboratiu <a href="%{resource_path}">%{resource_title}</a>.
         creation_enabled:
@@ -455,6 +456,7 @@ ca:
             accepted: Acceptades
             answer_proposal: Resposta
             evaluating: En avaluació
+            not_answered: No resposta
             rejected: Rebutjada
             title: Respondre a la proposta %{title}
         proposal_notes:

data/config/locales/cs.yml

@@ -205,6 +205,7 @@ cs:
             automatic_hashtags: Do všech návrhů byly přidány značky Hashtags
             comments_blocked: Komentáře byly blokovány
             creation_enabled: Účastníci mohou vytvářet návrhy
+            creation_enabled_readonly: Toto nastavení je zakázáno, pokud aktivujete funkci účastnických textů. Chcete-li nahrát návrhy jako participativní text, klikněte na tlačítko Participatory Texts a postupujte podle pokynů.
             default_sort_order: Výchozí řazení návrhu
             default_sort_order_help: Výchozí znamená, že pokud jsou podporované funkce povoleny, budou návrhy zobrazeny náhodně, a pokud jsou opory blokovány, pak budou seřazeny podle nejpodporovanější.
             default_sort_order_options:
@@ -233,33 +234,33 @@ cs:
             email_subject: Někdo zanechal poznámku na návrh %{resource_title}.
             notification_title: Někdo zanechal poznámku k návrhu <a href="%{resource_path}">%{resource_title}</a>. Podívejte se na <a href="%{admin_proposal_info_path}">admin panel</a>
         collaborative_draft_access_accepted:
-          email_intro: '%{requester_name} byl přijat k přístupu jako přispěvatel k <a href="%{resource_path}">%{resource_title}</a> návrh spolupráce.'
-          email_outro: Toto oznámení jste dostali, protože jste spolupracovníkem uživatele <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: '%{requester_name} byl přijat k přístupu jako přispěvatel konceptu spolupráce <a href="%{resource_url}">%{resource_title}</a>.'
+          email_outro: Obdrželi jste toto oznámení, protože jste spolupracovníkem <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} byl přijat k přístupu jako přispěvatel %{resource_title}."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> je <strong>přijat k přístupu jako přispěvatel</strong> ke společnému návrhu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_rejected:
-          email_intro: '%{requester_name} byl odmítnut jako přístupový člen projektu <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: Toto oznámení jste dostali, protože jste spolupracovníkem uživatele <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: '%{requester_name} byl odmítnut přístup jako přispěvatel konceptu spolupráce <a href="%{resource_url}">%{resource_title}</a>.'
+          email_outro: Obdrželi jste toto oznámení, protože jste spolupracovníkem <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} byl odmítnut pro přístup jako přispěvatel k %{resource_title} kolektivnímu návrhu."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> byl <strong>odmítnut k přístupu jako přispěvatel</strong> ke společnému návrhu <a href="%{resource_path}">%{resource_title}</a>.
         collaborative_draft_access_requested:
-          email_intro: '%{requester_name} požadoval přístup jako přispěvatel. Můžete <strong>přijmout nebo odmítnout žádost</strong> ze <a href="%{resource_path}">%{resource_title}</a> společném návrhu stránky.'
-          email_outro: Toto oznámení jste dostali, protože jste spolupracovníkem uživatele <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: '%{requester_name} požádal o přístup jako přispěvatel. Můžete <strong>přijmout nebo odmítnout požadavek</strong> ze stránky společného konceptu <a href="%{resource_url}">%{resource_title}</a>.'
+          email_outro: Obdrželi jste toto oznámení, protože jste spolupracovníkem <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{requester_name} požádal o přístup k příspěvku na %{resource_title}."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> požádal o přístup k přispění ke společnému návrhu <a href="%{resource_path}">%{resource_title}</a>. Prosím, <strong>přijměte nebo odmítněte žádost</strong>.
         collaborative_draft_access_requester_accepted:
-          email_intro: Byli jste přijati k přístupu jako přispěvatel projektu spolupráce <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Toto oznámení jste obdrželi, protože jste požádali, abyste se stal spolupracovníkem uživatele <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: Byl jste přijat k přístupu jako přispěvatel konceptu spolupráce <a href="%{resource_url}">%{resource_title}</a>.
+          email_outro: Obdrželi jste toto oznámení, protože jste požádali o spolupráci <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: Byli jste přijati jako přispěvatel %{resource_title}.
           notification_title: Byl jsi <strong>přijal přístup jako přispěvatel</strong> na <a href="%{resource_path}">%{resource_title}</a> společném návrhu.
         collaborative_draft_access_requester_rejected:
-          email_intro: Byl jste odmítnut jako zprostředkovatel projektu spolupráce <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Toto oznámení jste obdrželi, protože jste požádali, abyste se stal spolupracovníkem uživatele <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: Byl vám odmítnut přístup jako přispěvatel konceptu spolupráce <a href="%{resource_url}">%{resource_title}</a>.
+          email_outro: Obdrželi jste toto oznámení, protože jste požádali o spolupráci <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: Byl jste odmítnut jako přispěvatel %{resource_title}.
           notification_title: Byl jsi <strong>odmítnut přístup jako přispěvatel</strong> na <a href="%{resource_path}">%{resource_title}</a> společném návrhu.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_path}">%{author_name} %{author_nickname}</a> stáhl společný koncept <a href="%{resource_path}">%{resource_title}</a>.
-          email_outro: Toto oznámení jste dostali, protože jste spolupracovníkem uživatele <a href="%{resource_path}">%{resource_title}</a>.
+          email_intro: <a href="%{author_url}">%{author_name} %{author_nickname}</a> stáhl <a href="%{resource_url}">%{resource_title}</a> společný koncept.
+          email_outro: Obdrželi jste toto oznámení, protože jste spolupracovníkem <a href="%{resource_url}">%{resource_title}</a>.
           email_subject: "%{author_name} %{author_nickname} stáhl společný koncept %{resource_title}."
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>stáhl</strong> <a href="%{resource_path}">%{resource_title}</a> společný koncept.
         creation_enabled:
@@ -467,6 +468,7 @@ cs:
             accepted: Přijato
             answer_proposal: Odpovědět
             evaluating: Hodnocení
+            not_answered: Nezodpovězeno
             rejected: Odmítnuto
             title: Odpověď na návrh %{title}
         proposal_notes:

data/config/locales/de.yml

@@ -192,33 +192,21 @@ de:
             email_subject: Jemand hat eine Notiz für Vorschlag %{resource_title} erstellt.
             notification_title: Jemand hat eine Notiz für den Vorschlag <a href="%{resource_path}">%{resource_title}</a>erstellt. Sie können sie über das <a href="%{admin_proposal_info_path}">Admin-Panel</a> anzeigen
         collaborative_draft_access_accepted:
-          email_intro: '%{requester_name} wurde zur Mitwirkung am kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> akzeptiert.'
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie am kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> mitwirken.
           email_subject: "%{requester_name} wurde zur Mitwirkung an %{resource_title} akzeptiert."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> wurde zur Mitwirkung am kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> <strong>angenommen</strong>.
         collaborative_draft_access_rejected:
-          email_intro: '%{requester_name} wurde als Mitwirkender des kollaborativen Entwurfs <a href="%{resource_path}">%{resource_title}</a> abgelehnt.'
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie am kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> mitwirken.
           email_subject: "%{requester_name} wurde als Mitwirkender des kollaborativen Entwurfs %{resource_title} abgelehnt."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> wurde als Mitwirkender beim kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> <strong>abgelehnt</strong>.
         collaborative_draft_access_requested:
-          email_intro: '%{requester_name} hat um Zugriff auf Ihren kollaborativen Entwurf angefragt. Sie können den Antrag auf der Seite des kollaborativen Entwurfs <a href="%{resource_path}">%{resource_title}</a> <strong>annehmen oder ablehnen</strong>.'
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie am kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> mitwirken.
           email_subject: "%{requester_name} hat um Zugang zur Mitwirkung bei %{resource_title} angefragt."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> hat Zugriff beantragt, um beim kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> mitzuwirken. Bitte <strong>den Antrag akzeptieren oder ablehnen</strong>.
         collaborative_draft_access_requester_accepted:
-          email_intro: Sie wurden zur Mitwirkung am kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> akzeptiert.
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie angefragt haben, bei <a href="%{resource_path}">%{resource_title}</a> mitzuwirken.
           email_subject: Sie wurden als Mitwirkender von %{resource_title} angenommen.
           notification_title: Sie wurden zur Mitwirkung am kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> <strong>akzeptiert</strong>.
         collaborative_draft_access_requester_rejected:
-          email_intro: Der Zugriff auf den kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> wurde Ihnen verweigert.
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie angefragt haben, bei <a href="%{resource_path}">%{resource_title}</a> mitzuwirken.
           email_subject: Sie wurden als Mitwirkender von %{resource_title} abgelehnt.
           notification_title: Sie wurden als Mitwirkender beim kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> <strong>abgelehnt</strong>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_path}">%{author_name} %{author_nickname}</a> hat den kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> zurückgezogen.
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie bei <a href="%{resource_path}">%{resource_title}</a> mitwirken.
           email_subject: "%{author_name} %{author_nickname} hat den kollaborativen Entwurf %{resource_title} zurückgezogen."
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> hat den kollaborativen Entwurf <a href="%{resource_path}">%{resource_title}</a> <strong>zurückgezogen</strong>.
         creation_enabled:
@@ -711,7 +699,7 @@ de:
             one: "%{count} Vorschlag"
             other: "%{count} Vorschläge"
         edit:
-          add_documents: Dokumente
+          add_documents: Unterlagen
           add_images: Datei
           attachment_legend: "(Optional) Fügen Sie einen Anhang hinzu"
           back: Zurück
@@ -755,7 +743,6 @@ de:
             other: Stimmen
         new:
           send: Fortsetzen
-          title: Neuen Vorschlag erstellen
         orders:
           label: 'Vorschläge sortieren nach:'
           most_commented: Am meisten kommentiert