decidim-proposals 0.23.3 → 0.23.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 407b694b48340b459b9487e1b7680f71c7f39fd120acb8f953253f0e6f6131b3
-  data.tar.gz: b5af213b89c045c25c5c3e65958938f9ccd61b8dcc2b092a399c34de39290827
+  metadata.gz: 637cdd20a4aaaaa7cbba8c154c6d0dfb7f2dbbe955473cc62873925c3272741c
+  data.tar.gz: 48646382d74a0dd40410dd89b595ffafce42ff3099c6202fe023658bb930fc2d
 SHA512:
-  metadata.gz: 0151a8ebc561f6c2b00f05315770f7dd18c80230a5562d8a7ac02d6d6efaaefea1eeb2f40cd335a17e7c1148753ad659050593ebd2db8d16900283096558995e
-  data.tar.gz: 9c07d17862f60743fee23f7662bd7e5d9681c23e7674ba2ef6ce7fb61b035399c5ea58c132a82821702051ad1a7555798f878cb695f976a8ea69c22c00e99187
+  metadata.gz: '0779bca6ce193269caef33d769c9104a74564b0612e127130aad29d71a3f1d7c6683105b1ba82920f01cfe5f744bf9ea4910ed27a5104728ce2ceda78f3327d1'
+  data.tar.gz: 00b88574a67ceddb64df0610bf879b40d467536bacaad9f3df78c87be5044a7057f5c19e309efea9166afdb2a5876c78be806c85dc210bb652b1da6da9107aba

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

@@ -2,13 +2,21 @@
 
 module Decidim
   module Proposals
-    # A cell to display when a proposal has been published.
+    # A cell to display when actions happen on a proposal.
     class ProposalActivityCell < ActivityCell
       def title
-        I18n.t(
-          "decidim.proposals.last_activity.new_proposal_at_html",
-          link: participatory_space_link
-        )
+        case action
+        when "update"
+          I18n.t(
+            "decidim.proposals.last_activity.proposal_updated_at_html",
+            link: participatory_space_link
+          )
+        else
+          I18n.t(
+            "decidim.proposals.last_activity.new_proposal_at_html",
+            link: participatory_space_link
+          )
+        end
       end
 
       def resource_link_text

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

@@ -18,7 +18,6 @@ module Decidim
         maximum: ->(record) { record.component.settings.proposal_length }
       }
 
-      validate :proposal_length
       validate :body_is_not_bare_template
 
       alias component current_component
@@ -32,13 +31,6 @@ module Decidim
 
       private
 
-      def proposal_length
-        return unless body.presence
-
-        length = current_component.settings.proposal_length
-        errors.add(:body, :too_long, count: length) if body.length > length
-      end
-
       def body_is_not_bare_template
         return if body_template.blank?
 

data/app/validators/proposal_length_validator.rb

@@ -20,7 +20,8 @@ class ProposalLengthValidator < ActiveModel::EachValidator
     if min && min.positive? && value.length < min
       record.errors.add(
         attribute,
-        options[:message] || :too_short
+        options[:message] || :too_short,
+        count: min
       )
     end
   end
@@ -31,7 +32,8 @@ class ProposalLengthValidator < ActiveModel::EachValidator
     if max && max.positive? && value.length > max
       record.errors.add(
         attribute,
-        options[:message] || :too_long
+        options[:message] || :too_long,
+        count: max
       )
     end
   end

data/config/locales/ca.yml

@@ -136,7 +136,7 @@ ca:
             participatory_texts_enabled: Texts participatius habilitats
             participatory_texts_enabled_readonly: No es pot interactuar amb aquesta configuració si hi ha propostes existents. Si us plau, crea un nou 'component de propostes' si vols habilitar aquesta característica o descarta totes les propostes importades al menú "textos participatius" si vols deshabilitar-lo.
             proposal_answering_enabled: Resposta a propostes habilitada
-            proposal_edit_before_minutes: Les propostes poden ser editades per les autorrs abans que passin aquests minuts
+            proposal_edit_before_minutes: Les propostes poden ser editades per les autores abans que passin aquests minuts
             proposal_length: Longitud màxima del cos de la proposta
             proposal_limit: Límit de propostes per participant
             proposal_wizard_step_1_help_text: Text d'ajuda pel pas "Crear" de l'assistent de propostes
@@ -523,7 +523,7 @@ ca:
           create: "%{user_name} ha deixat una nota privada a la proposta %{resource_name} dins l'espai %{space_name}"
         valuation_assignment:
           create: "%{user_name} ha assignat la proposta %{resource_name} a una avaluadora"
-          delete: "%{user_name} ha desfet l'assignació a una avaluadora de la proposta %{resource_name}"
+          delete: "%{user_name} ha desfet l'assignació a una avaluadora de la proposta %{proposal_title}"
       answers:
         accepted: Acceptades
         evaluating: En avaluació
@@ -678,6 +678,7 @@ ca:
         success: L'esborrany de proposta s'ha eliminat correctament.
       last_activity:
         new_proposal_at_html: "<span>Nova proposta a %{link}</span>"
+        proposal_updated_at_html: "<span>Proposta actualitzada a %{link}</span>"
       models:
         collaborative_draft:
           fields:

data/config/locales/cs.yml

@@ -692,6 +692,7 @@ cs:
         success: Koncept návrhu byl úspěšně smazán.
       last_activity:
         new_proposal_at_html: "<span>Nový návrh na %{link}</span>"
+        proposal_updated_at_html: "<span>Návrh byl aktualizován na %{link}</span>"
       models:
         collaborative_draft:
           fields:

data/config/locales/de.yml

@@ -678,6 +678,7 @@ de:
         success: Der Vorschlagsentwurf wurde erfolgreich gelöscht.
       last_activity:
         new_proposal_at_html: "<span>Neuer Vorschlag bei %{link}</span>"
+        proposal_updated_at_html: "<span>Vorschlag aktualisiert unter %{link}</span>"
       models:
         collaborative_draft:
           fields:

data/config/locales/en.yml

@@ -679,6 +679,7 @@ en:
         success: Proposal draft was successfully deleted.
       last_activity:
         new_proposal_at_html: "<span>New proposal at %{link}</span>"
+        proposal_updated_at_html: "<span>Proposal updated at %{link}</span>"
       models:
         collaborative_draft:
           fields:

data/config/locales/es-MX.yml

@@ -423,6 +423,7 @@ es-MX:
           form:
             attachment_legend: "(Opcional) Añadir un archivo adjunto"
             created_in_meeting: Esta propuesta procede de un encuentro
+            delete_attachment: Eliminar archivo adjunto
             select_a_category: Selecciona una categoría
             select_a_meeting: Selecciona un encuentro
           index:

data/config/locales/es-PY.yml

@@ -423,6 +423,7 @@ es-PY:
           form:
             attachment_legend: "(Opcional) Añadir un archivo adjunto"
             created_in_meeting: Esta propuesta viene de una reunión.
+            delete_attachment: Eliminar archivo adjunto
             select_a_category: Seleccione una categoría
             select_a_meeting: Seleccione una reunion
           index:

data/config/locales/es.yml

@@ -423,6 +423,7 @@ es:
           form:
             attachment_legend: "(Opcional) Añadir un archivo adjunto"
             created_in_meeting: Esta propuesta procede de un encuentro
+            delete_attachment: Eliminar archivo adjunto
             select_a_category: Selecciona una categoría
             select_a_meeting: Selecciona un encuentro
           index:

data/config/locales/fi-plain.yml

@@ -678,6 +678,7 @@ fi-pl:
         success: Ehdotusluonnos poistettiin onnistuneesti.
       last_activity:
         new_proposal_at_html: "<span>Uusi ehdotus osoitteessa %{link}</span>"
+        proposal_updated_at_html: "<span>Ehdotus päivitetty osoitteessa %{link}</span>"
       models:
         collaborative_draft:
           fields:

data/config/locales/fi.yml

@@ -678,6 +678,7 @@ fi:
         success: Ehdotusluonnoksen poistaminen onnistui.
       last_activity:
         new_proposal_at_html: "<span>Uusi ehdotus osoitteessa %{link}</span>"
+        proposal_updated_at_html: "<span>Ehdotus päivitetty osoitteessa %{link}</span>"
       models:
         collaborative_draft:
           fields:

data/config/locales/fr-CA.yml

@@ -678,6 +678,7 @@ fr-CA:
         success: Le brouillon de la proposition a bien été supprimé.
       last_activity:
         new_proposal_at_html: "<span>Nouvelle proposition à %{link}</span>"
+        proposal_updated_at_html: "<span>Débat mis à jour à %{link}</span>"
       models:
         collaborative_draft:
           fields:

data/config/locales/fr.yml

@@ -678,6 +678,7 @@ fr:
         success: Le brouillon de la proposition a bien été supprimé.
       last_activity:
         new_proposal_at_html: "<span>Nouvelle proposition à %{link}</span>"
+        proposal_updated_at_html: "<span>Débat mis à jour à %{link}</span>"
       models:
         collaborative_draft:
           fields:

data/config/locales/nl.yml

@@ -656,6 +656,7 @@ nl:
         success: Voorstel concept is succesvol verwijderd.
       last_activity:
         new_proposal_at_html: "<span>Nieuw voorstel op %{link}</span>"
+        proposal_updated_at_html: "<span>Voorstel bijgewerkt op %{link}</span>"
       models:
         collaborative_draft:
           fields:

data/config/locales/pl.yml

@@ -411,7 +411,7 @@ pl:
             title: Odpowiedź na propozycję %{title}
         proposal_notes:
           create:
-            error: Wystąpił problem podczas tworzenia tej notatki dotyczącej propozycji
+            error: Wystąpił błąd podczas tworzenia tej notatki dotyczącej propozycji
             success: Notatka dotycząca propozycji została utworzona
           form:
             note: Notatka
@@ -431,6 +431,7 @@ pl:
           form:
             attachment_legend: "(Opcjonalnie) Dodaj załącznik"
             created_in_meeting: Ta propozycja pochodzi ze spotkania
+            delete_attachment: Usuń załącznik
             select_a_category: Wybierz kategorię
             select_a_meeting: Wybierz spotkanie
           index:
@@ -613,7 +614,7 @@ pl:
           state: Status
           withdrawn: Wycofane
         filters_small_view:
-          close_modal: Zamknij modalne
+          close_modal: Zamknij okno
           filter: Filtr
           filter_by: Filtruj według
           unfold: Rozwiń
@@ -738,8 +739,13 @@ pl:
             many: "%{count} propozycji"
             other: "%{count} propozycji"
         edit:
+          add_documents: Dokumenty
+          add_images: Plik
           attachment_legend: "(Opcjonalnie) Dodaj załącznik"
           back: Wróć
+          delete_document: Usuń dokument
+          delete_image: Usuń obraz
+          gallery_legend: "(Opcjonalnie) Dodaj obraz do karty propozycji"
           select_a_category: Wybierz kategorię
           send: Wyślij
           title: Edytuj propozycję
@@ -762,7 +768,7 @@ pl:
           type: Typ
           voted: Wsparte
         filters_small_view:
-          close_modal: Zamknij modal
+          close_modal: Zamknij okno
           filter: Filtr
           filter_by: Filtruj według
           unfold: Rozwiń

data/config/locales/ro-RO.yml

@@ -84,6 +84,9 @@ ro:
     admin:
       filters:
         proposals:
+          is_emendation_true:
+            values:
+              'true': Modificări
           valuator_role_ids_has:
             label: Atribuit evaluatorului
         search_placeholder:
@@ -575,6 +578,8 @@ ro:
           amendment: Amendamente
           category: Categorie
           open: Deschideți
+        new:
+          title: Creare proiect colaborativ
         show:
           info-message: Acesta este un <strong>proiect de colaborare</strong> pentru o propunere. Aceasta înseamnă că îi poți ajuta pe autorii lor să modeleze propunerea folosind secțiunea de mai jos sau să o îmbunătățească direct prin solicitarea accesului la editare. Odată ce autorii vă acordă accesul, veți putea face modificări la acest proiect.
           publish: Publică

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.23.3"
+      "0.23.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.23.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -150,84 +150,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.4
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -631,7 +631,6 @@ files:
 - db/migrate/20200708091228_move_proposals_fields_to_i18n.rb
 - db/migrate/20200730131631_move_proposal_endorsed_event_notifications_to_resource_endorsed_event.rb
 - db/migrate/20200827154156_add_commentable_counter_cache_to_proposals.rb
-- db/migrate/20200915151348_fix_proposals_data_to_ensure_title_and_body_are_hashes.rb
 - db/migrate/20201002085508_fix_proposals_data.rb
 - lib/decidim/content_parsers/proposal_parser.rb
 - lib/decidim/content_renderers/proposal_renderer.rb

data/db/migrate/20200915151348_fix_proposals_data_to_ensure_title_and_body_are_hashes.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-class FixProposalsDataToEnsureTitleAndBodyAreHashes < ActiveRecord::Migration[5.2]
-  def up
-    reset_column_information
-
-    PaperTrail.request(enabled: false) do
-      Decidim::Proposals::Proposal.find_each do |proposal|
-        next if proposal.title.is_a?(Hash) && proposal.body.is_a?(Hash)
-
-        author = proposal.coauthorships.first.author
-
-        locale = author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
-
-        proposal.title = {
-          locale => proposal.title
-        }
-        proposal.body = {
-          locale => proposal.body
-        }
-
-        proposal.save!
-      end
-    end
-
-    reset_column_information
-  end
-
-  def down; end
-
-  def reset_column_information
-    Decidim::User.reset_column_information
-    Decidim::Coauthorship.reset_column_information
-    Decidim::Proposals::Proposal.reset_column_information
-    Decidim::Organization.reset_column_information
-  end
-end