decidim-forms 0.26.0.rc2 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b9bda71f82ea8834423fdd0160f804ffd07b4f2463374c06c497fbac9311349
-  data.tar.gz: 734131fa283abc6c4985cccb00221e2899cbe9a51bb6f4526a6235d144a318ad
+  metadata.gz: c05c5c0a4333cc4dbefaa5e8d37fa861059a6881d5d47d075fd618e7f7169826
+  data.tar.gz: f46c7ea6704161d57385dd589360b78fe3763057e532640004cbb539aee5c0e4
 SHA512:
-  metadata.gz: 0eef2098c5cb0e0239051c2889a1ab727a746622d78ceccaf3b9a74249c0e605d713b4d6189d15c68114fe17cf30cd0ed55105c8e2392c866906bc0efeea6ef9
-  data.tar.gz: 77b2ce921a9dfd4415f59d1227bc24b22c3307a81a5214e8b66fdfe9b12a117ec91d70f0655e9dafaaaf5ba491e1a453053e4008e32744b6280a292d3011bf6b
+  metadata.gz: fb39a317c541eca9a1d3ed286b8b3873a79bc7f748a37ae4a20a693e19900b473b6e83f46ec82d07c3d5d5b603143d5d46327addfd19d99f014f163f8a741775
+  data.tar.gz: 593ac4089260f909886fa7b05de438d2da561a4d5801742044c79a7c2ee5343c1c59df55282c8fd18af036ce272fc04329c3ef9bb04699de5cf5182dd361ed36

data/app/views/decidim/forms/questionnaires/_answer.html.erb

@@ -30,7 +30,9 @@
 
   <%= answer_form.hidden_field :question_id %>
 
-  <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
+  <% if answer.question.max_choices %>
+    <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
+  <% end %>
 
   <% answer.errors.full_messages.each do |msg| %>
     <small class="form-error is-visible"><%= msg %></small>

data/app/views/decidim/forms/questionnaires/show.html.erb

@@ -8,7 +8,7 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
 <div class="row columns">
-  <h3 class="section-heading"><%= translated_attribute questionnaire.title %></h3>
+  <h2 class="section-heading"><%= translated_attribute questionnaire.title %></h2>
   <div class="row">
     <div class="columns large-<%= columns %> medium-centered lead">
       <%= decidim_sanitize_editor translated_attribute questionnaire.description %>
@@ -33,7 +33,7 @@
             <% if visitor_already_answered? %>
               <div class="section">
                 <div class="callout success">
-                  <h5><%= t(".questionnaire_answered.title") %></h5>
+                  <h3 class="heading5"><%= t(".questionnaire_answered.title") %></h3>
                   <p><%= t(".questionnaire_answered.body") %></p>
                 </div>
               </div>
@@ -42,7 +42,7 @@
                 <noscript>
                   <div class="section">
                     <div class="callout warning">
-                      <h5><%= t(".questionnaire_js_disabled.title") %></h5>
+                      <h3 class="heading5"><%= t(".questionnaire_js_disabled.title") %></h3>
                       <p><%= t(".questionnaire_js_disabled.body") %></p>
                     </div>
                   </div>
@@ -50,7 +50,7 @@
                 <% unless current_participatory_space.can_participate?(current_user) %>
                   <div class="section">
                     <div class="callout alert">
-                      <h5><%= t(".questionnaire_for_private_users.title") %></h5>
+                      <h3 class="heading5"><%= t(".questionnaire_for_private_users.title") %></h3>
                       <p><%= t(".questionnaire_for_private_users.body") %></p>
                     </div>
                   </div>
@@ -64,10 +64,10 @@
                   <% @form.responses_by_step.each_with_index do |step_answers, step_index| %>
                     <div id="step-<%= step_index %>" class="<%= step_index.zero? ? "questionnaire-step" : "questionnaire-step hide" %>" data-toggler=".hide">
                       <% if @form.total_steps > 1 %>
-                        <h4 class="section-heading">
+                        <h3 class="section-heading">
                           <%= t(".current_step", step: step_index + 1) %>
                           <span class="answer-questionnaire__steps"><%= t(".of_total_steps", total_steps: @form.total_steps) %></span>
-                        </h4>
+                        </h3>
                       <% end %>
 
                       <% step_answers.each do |answer| %>
@@ -128,7 +128,7 @@
             <% end %>
           <% else %>
             <div class="answer-questionnaire">
-              <h5 class="section-heading"><%= t(".answer_questionnaire.title") %></h5>
+              <h3 class="section-heading"><%= t(".answer_questionnaire.title") %></h3>
               <p>
                 <%= t(".answer_questionnaire.anonymous_user_message", sign_in_link: decidim.new_user_session_path, sign_up_link: decidim.new_user_registration_path).html_safe %>
               </p>
@@ -141,7 +141,7 @@
         <% else %>
           <div class="section">
             <div class="callout warning">
-              <h4><%= t(".questionnaire_closed.title") %></h4>
+              <h3 class="heading4"><%= t(".questionnaire_closed.title") %></h3>
               <p><%= t(".questionnaire_closed.body") %></p>
             </div>
           </div>

data/config/locales/ar.yml

@@ -3,6 +3,7 @@ ar:
     attributes:
       answer:
         body: إجابة
+        choices: الخيارات
       question:
         max_choices: أقصى عدد من الخيارات
         question_type: نوع
@@ -30,6 +31,9 @@ ar:
             free_text: نص حر
             remove: إزالة
             statement: بيان
+          display_condition:
+            condition_question: سؤال
+            remove: حذف
           edit:
             save: حفظ
           form:
@@ -47,6 +51,8 @@ ar:
             remove: إزالة
             statement: بيان
             up: فوق
+          title_and_description:
+            description: الوصف
           update:
             invalid: كانت هناك مشكلة في حفظ النموذج.
       errors:

data/config/locales/de.yml

@@ -79,6 +79,7 @@ de:
           form:
             add_question: Frage hinzufügen
             add_separator: Trennzeichen hinzufügen
+            add_title_and_description: Füge Titel und Beschreibung hinzu
             already_answered_warning: Der Fragebogen wird bereits von einigen Benutzern beantwortet, sodass Sie die Fragen nicht ändern können.
             collapse: Alle Fragen einklappen
             expand: Alle Fragen ausklappen
@@ -108,6 +109,15 @@ de:
             remove: Löschen
             separator: Trennzeichen
             up: Hoch
+          title_and_description:
+            collapse: Einklappen
+            description: Beschreibung
+            down: Runter
+            expand: Ausklappen
+            remove: Entfernen
+            title: Titel
+            title_and_description: Titel und Beschreibung
+            up: Hinauf
           update:
             invalid: Beim Speichern des Fragebogens sind Fehler aufgetreten.
             success: Formular erfolgreich gespeichert.
@@ -131,6 +141,7 @@ de:
         short_answer: Kurze Antwort
         single_option: Einzelne Option
         sorting: Sortierung
+        title_and_description: Titel und Beschreibung
       questionnaires:
         answer:
           invalid: Bei der Beantwortung des Fragebogens sind Fehler aufgetreten.

data/config/locales/gl.yml

@@ -32,6 +32,7 @@ gl:
             save: Gardar
           form:
             add_question: Engadir pregunta
+            add_title_and_description: Engadir títutlo e descrición
             already_answered_warning: Algúns usuarios xa responderon o cuestionario para que non poida modificar as súas preguntas.
           matrix_row:
             remove: Quitar
@@ -45,6 +46,15 @@ gl:
             remove: Quitar
             statement: Declaración
             up: Arriba
+          title_and_description:
+            collapse: Contraer
+            description: Descrición
+            down: Abaixo
+            expand: Expandir
+            remove: Eliminar
+            title: Título
+            title_and_description: Título e descrición
+            up: Arriba
           update:
             invalid: Produciuse un erro ao gardar o cuestionario.
       errors:
@@ -58,6 +68,7 @@ gl:
         short_answer: Resposta curta
         single_option: Opción única
         sorting: Clasificación
+        title_and_description: Título e descrición
       questionnaires:
         answer:
           invalid: Houbo erros ao responder ao cuestionario.

data/config/locales/hu.yml

@@ -34,6 +34,7 @@ hu:
             save: Mentés
           form:
             add_question: Kérdés hozzáadása
+            add_title_and_description: Adj hozzá címet és leírást
             already_answered_warning: Néhány felhasználó már válaszolt a kérdőívre, így nem változtathatja meg kérdéseit.
             collapse: Minden kérdés összecsukása
             expand: Minden kérdés kibontása
@@ -51,6 +52,15 @@ hu:
             remove: Eltávolít
             statement: Nyilatkozat
             up: Fel
+          title_and_description:
+            collapse: Összecsuk
+            description: Leírás
+            down: Le
+            expand: Kibont
+            remove: Eltávolít
+            title: Cím
+            title_and_description: Cím és leírás
+            up: Fel
           update:
             invalid: Hiba történt a kérdőív mentésekor.
       errors:
@@ -64,6 +74,7 @@ hu:
         short_answer: Rövid válasz
         single_option: Egy választási lehetőség
         sorting: Válogatás
+        title_and_description: Cím és leírás
       questionnaires:
         answer:
           invalid: Hiba történt a kérdőív megválaszolásakor.

data/config/locales/no.yml

@@ -3,15 +3,22 @@
     attributes:
       answer:
         body: Svar
+        choices: Valg
+        selected_choices: Valgte valg
       question:
         max_choices: Maksimalt antall valg
         question_type: Type
       questionnaire_question:
         mandatory: Obligatorisk
+        max_characters: Tegngrense (la være 0 hvis ingen begrensning)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Må legges til på nytt
+            body:
+              too_long: er for lang
             choices:
               missing: er ikke fullstendig
               too_many: er for mange
@@ -48,16 +55,44 @@
               title: "%{total} svar totalt"
             show:
               title: 'Svar #%{number}'
+          display_condition:
+            answer_option: Svaralternativ
+            condition_question: Spørsmål
+            condition_type: Betingelse
+            condition_types:
+              answered: Besvart
+              equal: Lik
+              match: Inkluder tekst
+              not_answered: Ikke besvart
+              not_equal: Ikke lik
+            condition_value: Inkludert tekst
+            display_condition: Vis betingelse
+            mandatory: Denne betingelsen må alltid oppfylles uavhengig av status for andre betingelser
+            remove: Fjern
+            save_warning: Husk å lagre skjemaet før du konfigurerer visningsbetingelser
+            select_answer_option: Velg svaralternativ
+            select_condition_question: Velg et spørsmål
+            select_condition_type: Velg en betingelsestype
           edit:
             save: Lagre
+            title: Rediger spørreskjema
           form:
             add_question: Legg til spørsmål
+            add_separator: Legg til skilletegn
+            add_title_and_description: Legg til tittel og beskrivelse
             already_answered_warning: Skjemaet er allerede besvart av noen brukere derfor kan du ikke endre spørsmålene.
+            collapse: Skjul alle spørsmål
+            expand: Utvid alle spørsmål
+            preview: Forhåndsvis
+            title: Rediger skjema for %{questionnaire_for}
+            unpublished_warning: Skjemaet er ikke publisert. Du kan endre spørsmålet, men da slettes nåværende svar.
           matrix_row:
+            matrix_row: Rad
             remove: Fjern
             statement: Uttalelse
           question:
             add_answer_option: Legg til svaralternativ
+            add_display_condition: Legg til visningsbetingelse
             add_display_condition_info: Lagre skjemaet for å konfigurere visningsbetingelser
             add_matrix_row: Legg til rad
             any: Alle
@@ -74,8 +109,18 @@
             remove: Fjern
             separator: Skilletegn
             up: Opp
+          title_and_description:
+            collapse: Kollaps
+            description: Beskrivelse
+            down: Ned
+            expand: Utvid
+            remove: Fjern
+            title: Tittel
+            title_and_description: Tittel og beskrivelse
+            up: Opp
           update:
             invalid: Det oppstod et problem med å lagre dette skjema.
+            success: Skjemaet ble lagret.
       errors:
         answer:
           body: Teksten kan ikke være blank
@@ -84,12 +129,19 @@
       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
+        matrix_multiple: Matrise (Flervalg)
+        matrix_single: Matrise (Enkeltvalg)
         multiple_option: Flere alternativer
         short_answer: Kort svar
         single_option: Enkelt alternativ
         sorting: Sortering
+        title_and_description: Tittel og beskrivelse
       questionnaires:
         answer:
           invalid: Det oppstod et problem med å svare på skjemaet.

data/config/locales/ro-RO.yml

@@ -112,10 +112,12 @@ ro:
           title_and_description:
             collapse: Restrânge
             description: Descriere
+            down: Mergi în jos
             expand: Extinde
             remove: Șterge
             title: Titlu
             title_and_description: Titlu și descriere
+            up: Mergi în sus
           update:
             invalid: A apărut o eroare la salvarea chestionarului.
             success: Chestionarul a fost salvat cu succes.

data/config/locales/sv.yml

@@ -79,6 +79,7 @@ sv:
           form:
             add_question: Lägg till fråga
             add_separator: Lägg till separator
+            add_title_and_description: Lägg till titel och beskrivning
             already_answered_warning: Frågeformuläret har redan besvarats av vissa användare så du inte kan ändra dess frågor.
             collapse: Komprimera alla frågor
             expand: Expandera alla frågor
@@ -108,8 +109,18 @@ sv:
             remove: Radera
             separator: Avgränsare
             up: Upp
+          title_and_description:
+            collapse: Kollapsa
+            description: Beskrivning
+            down: Ner
+            expand: Expandera
+            remove: Ta bort
+            title: Titel
+            title_and_description: Titel och beskrivning
+            up: Upp
           update:
             invalid: Det gick inte att spara formuläret.
+            success: Formuläret har sparats.
       errors:
         answer:
           body: Kroppen kan inte vara to
@@ -130,6 +141,7 @@ sv:
         short_answer: Kort svar
         single_option: Ett alternativ
         sorting: Sortering
+        title_and_description: Titel och beskrivning
       questionnaires:
         answer:
           invalid: Det gick inte att besvara formuläret.

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.26.0.rc2
+  version: 0.26.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -308,9 +308,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: