decidim-forms 0.26.0 → 0.27.0.rc1

data/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ es:
           update:
             invalid: Se ha producido un error al guardar el formulario.
             success: Formulario guardado correctamente.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} actualizó el cuestionario %{resource_name}"
       errors:
         answer:
           body: El campo no puede estar en blanco
@@ -128,10 +132,9 @@ es:
         extension_allowlist: 'Formatos de archivo aceptados:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagen medirá:'
         processors:
-          resize_and_pad: Redimensionada y ajustada a
-          resize_to_fit: Redimensionada para ajustarla
+          resize_and_pad: Esta imagen será redimensionada y ajustada a %{dimensions}.
+          resize_to_fit: Esta imagen será redimensionada para ajustarse a %{dimensions}.
       question_types:
         files: Archivos
         long_answer: Respuesta larga

data/config/locales/et.yml

@@ -1 +1,2 @@
+---
 et:

data/config/locales/eu.yml

@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -118,10 +119,6 @@ eu:
         extension_allowlist: 'Onartutako formatuak:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Irudi honek neurtuko du:'
-        processors:
-          resize_and_pad: Birdimentsionatua eta honi egokitua
-          resize_to_fit: Birdimentsionatua egokitzeko
       question_types:
         files: Fitxategiak
         long_answer: Erantzun luzea

data/config/locales/fi-plain.yml

@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ fi-pl:
           update:
             invalid: Kyselylomakkeiden tallentamisessa on tapahtunut virheitä.
             success: Lomake tallennettu onnistuneesti.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} päivitti kyselyä %{resource_name}"
       errors:
         answer:
           body: Runkoteksti ei voi olla tyhjä
@@ -128,10 +132,9 @@ fi-pl:
         extension_allowlist: 'Sallitut tiedostopäätteet:'
       images:
         dimensions: "%{width} x %{height} pikseliä"
-        dimensions_info: 'Tämän kuvan koko tulee olemaan:'
         processors:
-          resize_and_pad: Muutetaan kokoon ja täytetään
-          resize_to_fit: Muutetaan mahtumaan kokoon
+          resize_and_pad: Kuvan kokoa muutetaan ja rajataan arvoon %{dimensions}.
+          resize_to_fit: Tämä kuva muutetaan kokoon %{dimensions} sopivaksi.
       question_types:
         files: Tiedostot
         long_answer: Pitkä vastaus

data/config/locales/fi.yml

@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ fi:
           update:
             invalid: Kyselylomakkeen tallentaminen epäonnistui.
             success: Lomake tallennettu onnistuneesti.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} päivitti kyselyä %{resource_name}"
       errors:
         answer:
           body: Runkoteksti ei voi olla tyhjä
@@ -128,10 +132,9 @@ fi:
         extension_allowlist: 'Sallitut tiedostopäätteet:'
       images:
         dimensions: "%{width} x %{height} pikseliä"
-        dimensions_info: 'Tämän kuvan koko tulee olemaan:'
         processors:
-          resize_and_pad: Muutetaan kokoon ja täytetään
-          resize_to_fit: Muutetaan mahtumaan kokoon
+          resize_and_pad: Kuvan kokoa muutetaan ja rajataan arvoon %{dimensions}.
+          resize_to_fit: Tämä kuva muutetaan kokoon %{dimensions} sopivaksi.
       question_types:
         files: Tiedostot
         long_answer: Pitkä vastaus

data/config/locales/fr-CA.yml

@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -128,10 +129,9 @@ fr-CA:
         extension_allowlist: 'Formats acceptés :'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Cette image sera :'
         processors:
-          resize_and_pad: Redimensionné et ajustée à
-          resize_to_fit: Redimensionnée pour s'adapter
+          resize_and_pad: Cette image sera redimensionnée et recadrée en %{dimensions}.
+          resize_to_fit: Cette image sera redimensionnée pour s'adapter à %{dimensions}.
       question_types:
         files: Fichiers
         long_answer: Longue réponse

data/config/locales/fr.yml

@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -128,10 +129,9 @@ fr:
         extension_allowlist: 'Formats acceptés :'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Cette image sera :'
         processors:
-          resize_and_pad: Redimensionné et ajustée à
-          resize_to_fit: Redimensionnée pour s'adapter
+          resize_and_pad: Cette image sera redimensionnée et recadrée en %{dimensions}.
+          resize_to_fit: Cette image sera redimensionnée pour s'adapter à %{dimensions}.
       question_types:
         files: Fichiers
         long_answer: Longue réponse

data/config/locales/ga-IE.yml

@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:

data/config/locales/gl.yml

@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -62,6 +63,10 @@ gl:
           body: O corpo non pode estar en branco
       files:
         extension_allowlist: 'Formatos aceptados:'
+      images:
+        processors:
+          resize_and_pad: A imaxe axustarase para se encadrar a %{dimensions}.
+          resize_to_fit: A imaxe axustarase para se adaptar a %{dimensions}.
       question_types:
         long_answer: Resposta longa
         multiple_option: Múltipla opción

data/config/locales/hr.yml

@@ -1 +1,2 @@
+---
 hr:

data/config/locales/hu.yml

@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -68,6 +69,9 @@ hu:
           body: A szövegtörzs nem lehet üres
       files:
         extension_allowlist: 'Elfogadott formátumok:'
+      images:
+        processors:
+          resize_to_fit: 'A kép át lesz méretezve erre a méretre: %{dimensions}.'
       question_types:
         long_answer: Hosszú válasz
         multiple_option: Több választási lehetőség

data/config/locales/id-ID.yml

@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:

data/config/locales/is-IS.yml

@@ -1 +1,2 @@
-is-IS:
+---
+is:

data/config/locales/it.yml

@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -118,10 +119,6 @@ it:
         extension_allowlist: 'Formati accettati:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Questa immagine sarà:'
-        processors:
-          resize_and_pad: Ridimensionato e spaziato a
-          resize_to_fit: Ridimensionato per adattarsi
       question_types:
         files: I file
         long_answer: Risposta lunga

data/config/locales/ja.yml

@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ ja:
           update:
             invalid: フォームの保存に失敗しました。
             success: フォームを保存しました。
+      admin_log:
+        questionnaire:
+          update: "%{user_name} が %{resource_name} アンケートを更新しました"
       errors:
         answer:
           body: 本文は空白にできません
@@ -128,10 +132,9 @@ ja:
         extension_allowlist: '承認されたフォーマット:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'この画像は次のようになります:'
         processors:
-          resize_and_pad: リサイズおよびパッド先
-          resize_to_fit: フィットするようにリサイズしました
+          resize_and_pad: この画像はリサイズされ、 %{dimensions} に合わされます。
+          resize_to_fit: この画像は %{dimensions} に合うようにリサイズされます。
       question_types:
         files: ファイル
         long_answer: 長い回答

data/config/locales/ko.yml

@@ -1 +1,2 @@
+---
 ko:

data/config/locales/lb.yml

@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -118,10 +119,6 @@ lb:
         extension_allowlist: 'Gültige Formate:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Das Bild wird:'
-        processors:
-          resize_and_pad: in der Größe angepasst und gepolstert zu
-          resize_to_fit: in der Größe verändert, damit es passt
       question_types:
         files: Dateien
         long_answer: Lange Antwort

data/config/locales/lt.yml

@@ -1 +1,2 @@
+---
 lt:

data/config/locales/lv.yml

@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -69,10 +70,6 @@ lv:
         extension_allowlist: 'Pieņemtie formāti:'
       images:
         dimensions: "%{width} x %{height} pikseļi"
-        dimensions_info: 'Attēlam būs:'
-        processors:
-          resize_and_pad: Mainīts lielums un izveidota robeža
-          resize_to_fit: Mainīts, lai ietilptu
       question_types:
         long_answer: Garā atbilde
         matrix_multiple: Matrica (vairāki varianti)

data/config/locales/mt.yml

@@ -1 +1,2 @@
+---
 mt:

data/config/locales/nl.yml

@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -122,10 +123,6 @@ nl:
         extension_allowlist: 'Geaccepteerde formaten:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Deze afbeelding zal zijn:'
-        processors:
-          resize_and_pad: Verkleind en verwijderd naar
-          resize_to_fit: Vergrootst naar pasvorm
       question_types:
         long_answer: Lang antwoord
         matrix_multiple: Matrix (meerdere opties)

data/config/locales/no.yml

@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -128,10 +129,6 @@
         extension_allowlist: 'Aksepterte formater:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Dette bildet vil være:'
-        processors:
-          resize_and_pad: Endret størrelse og avstand til
-          resize_to_fit: Endret størrelse for å passe
       question_types:
         files: Filer
         long_answer: Langt svar

data/config/locales/om-ET.yml

@@ -1 +1,2 @@
+---
 om:

data/config/locales/pl.yml

@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -118,10 +119,6 @@ pl:
         extension_allowlist: 'Dozwolone formaty:'
       images:
         dimensions: "%{width} × %{height} px"
-        dimensions_info: 'Rozmiar obrazu będzie wynosił:'
-        processors:
-          resize_and_pad: Zmieniony i dopełniony do
-          resize_to_fit: Dopasowany
       question_types:
         files: Pliki
         long_answer: Długa odpowiedź

data/config/locales/pt-BR.yml

@@ -1,4 +1,5 @@
-pt-BR:
+---
+pt:
   activemodel:
     attributes:
       answer:
@@ -118,10 +119,6 @@ pt-BR:
         extension_allowlist: 'Formatos aceitos:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagem será:'
-        processors:
-          resize_and_pad: Redimensionado e acolchoado para
-          resize_to_fit: Redimensionado para caber
       question_types:
         files: Arquivos
         long_answer: Resposta longa

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -118,10 +119,6 @@ pt:
         extension_allowlist: 'Formatos aceites:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagem será:'
-        processors:
-          resize_and_pad: Redimensionada e ajustada para
-          resize_to_fit: Redimensionada para caber
       question_types:
         files: Ficheiros
         long_answer: Resposta longa

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -128,10 +129,6 @@ ro:
         extension_allowlist: 'Formate acceptate:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Această imagine va fi:'
-        processors:
-          resize_and_pad: Redimensionat și padded la
-          resize_to_fit: Redimensionată pentru a se potrivi
       question_types:
         files: Fișiere
         long_answer: Răspuns lung

data/config/locales/ru.yml

@@ -1,3 +1,4 @@
+---
 ru:
   decidim:
     forms:

data/config/locales/si-LK.yml

@@ -1 +1,2 @@
+---
 si:

data/config/locales/sk.yml

@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:

data/config/locales/sl.yml

@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:

data/config/locales/so-SO.yml

@@ -1 +1,2 @@
+---
 so:

data/config/locales/sr-CS.yml

@@ -1 +1,2 @@
+---
 sr:

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -128,10 +129,6 @@ sv:
         extension_allowlist: 'Godkända format:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Denna bild kommer att vara:'
-        processors:
-          resize_and_pad: Anpassad och vadderad till
-          resize_to_fit: Anpassad för att passa
       question_types:
         files: Filer
         long_answer: Långt svar

data/config/locales/sw-KE.yml

@@ -1 +1,2 @@
+---
 sw:

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -113,10 +114,6 @@ tr:
         extension_allowlist: 'Kabul edilen biçimler:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Bu resim:'
-        processors:
-          resize_and_pad: Yeniden boyutlandırıldı ve dolduruldu
-          resize_to_fit: Sığacak şekilde yeniden boyutlandırıldı
       question_types:
         long_answer: Uzun cevap
         matrix_multiple: Matris (Çoklu seçenek)

data/config/locales/uk.yml

@@ -1 +1,2 @@
+---
 uk:

data/config/locales/val-ES.yml

@@ -1,3 +1,4 @@
+---
 val:
   decidim:
     forms:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -112,10 +113,6 @@ zh-CN:
         extension_allowlist: '接受的格式：'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: '这张图片将是：'
-        processors:
-          resize_and_pad: 缩放并填充到
-          resize_to_fit: 调整到适合的
       question_types:
         long_answer: 长答案
         matrix_multiple: 矩阵(多选项)

data/config/locales/zh-TW.yml

@@ -1 +1,2 @@
+---
 zh-TW:

data/lib/decidim/exporters/form_pdf.rb

@@ -15,11 +15,11 @@ module Decidim
       end
 
       def template
-        "decidim/forms/admin/questionnaires/answers/export/pdf.html.erb"
+        "decidim/forms/admin/questionnaires/answers/export/pdf"
       end
 
       def layout
-        "decidim/forms/admin/questionnaires/questionnaire_answers.html.erb"
+        "decidim/forms/admin/questionnaires/questionnaire_answers"
       end
 
       def locals

data/lib/decidim/forms/{data_portability_user_answers_serializer.rb → download_your_data_user_answers_serializer.rb}

@@ -2,9 +2,9 @@
 
 module Decidim
   module Forms
-    class DataPortabilityUserAnswersSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataUserAnswersSerializer < Decidim::Exporters::Serializer
       include Decidim::TranslationsHelper
-      # Serializes an user answer for data portability
+      # Serializes an user answer for download your data
       def serialize
         {
           id: resource.id,

data/lib/decidim/forms/test/factories.rb

@@ -29,38 +29,47 @@ FactoryBot.define do
     end
 
     trait :with_all_questions do
-      questions do
+      after(:build) do |questionaire, _evaluator|
         position = 0
-        qs = %w(short_answer long_answer).collect do |text_question_type|
-          q = build(:questionnaire_question, question_type: text_question_type, position: position)
+        %w(short_answer long_answer).collect do |text_question_type|
+          q = create(:questionnaire_question,
+                     question_type: text_question_type,
+                     position: position,
+                     questionnaire: questionaire)
           position += 1
-          q
+          questionaire.questions << q
         end
 
         %w(single_option multiple_option).each do |option_question_type|
-          q = build(:questionnaire_question, :with_answer_options, question_type: option_question_type, position: position)
-          position += 1
-          qs << q
+          q = create(:questionnaire_question, :with_answer_options,
+                     question_type: option_question_type,
+                     position: position,
+                     questionnaire: questionaire)
           q.display_conditions.build(
-            condition_question: qs[q.position - 2],
+            condition_question: questionaire.questions[q.position - 1],
             question: q,
             condition_type: :answered,
             mandatory: true
           )
+          questionaire.questions << q
+          position += 1
         end
 
         %w(matrix_single matrix_multiple).collect do |matrix_question_type|
-          q = build(:questionnaire_question, :with_answer_options, question_type: matrix_question_type, position: position, body: generate_localized_title)
-          position += 1
-          qs << q
+          q = build(:questionnaire_question, :with_answer_options,
+                    question_type: matrix_question_type,
+                    position: position,
+                    body: generate_localized_title,
+                    questionnaire: questionaire)
           q.display_conditions.build(
-            condition_question: qs[q.position - 2],
+            condition_question: questionaire.questions[q.position - 1],
             question: q,
             condition_type: :answered,
             mandatory: true
           )
+          questionaire.questions << q
+          position += 1
         end
-        qs
       end
     end
 

data/lib/decidim/forms/test/shared_examples/has_questionnaire.rb

@@ -241,6 +241,9 @@ shared_examples_for "has questionnaire" do
 
       it "shows errors without submitting the form" do
         expect(page).to have_no_selector ".alert.flash"
+        different_error = I18n.t("decidim.forms.questionnaires.answer.max_choices_alert")
+        expect(different_error).to eq("There are too many choices selected")
+        expect(page).not_to have_content(different_error)
 
         expect(page).to have_content("can't be blank")
       end

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb

@@ -344,11 +344,11 @@ shared_examples_for "update questions" do
   end
 
   context "when a questionnaire has multiple existing questions" do
-    let!(:question_1) do
+    let!(:question1) do
       create(:questionnaire_question, questionnaire: questionnaire, body: first_body, position: 0)
     end
 
-    let!(:question_2) do
+    let!(:question2) do
       create(:questionnaire_question, questionnaire: questionnaire, body: second_body, position: 1)
     end
 

data/lib/decidim/forms/user_answers_serializer.rb

@@ -79,7 +79,7 @@ module Decidim
       end
 
       def normalize_matrix_choices(answer, choices)
-        answer.question.matrix_rows.map do |matrix_row|
+        answer.question.matrix_rows.to_h do |matrix_row|
           row_body = translated_attribute(matrix_row.body)
 
           row_choices = answer.question.answer_options.map do |answer_option|
@@ -88,7 +88,7 @@ module Decidim
           end
 
           [row_body, row_choices]
-        end.to_h
+        end
       end
 
       def answer_translated_attribute_name(attribute)

data/lib/decidim/forms/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.26.0"
+      "0.27.0.rc1"
     end
   end
 end

data/lib/decidim/forms.rb

@@ -9,7 +9,7 @@ module Decidim
   # This namespace holds the logic of the `Forms`.
   module Forms
     autoload :UserAnswersSerializer, "decidim/forms/user_answers_serializer"
-    autoload :DataPortabilityUserAnswersSerializer, "decidim/forms/data_portability_user_answers_serializer"
+    autoload :DownloadYourDataUserAnswersSerializer, "decidim/forms/download_your_data_user_answers_serializer"
   end
 
   module Exporters