decidim-forms 0.25.0.rc4 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e285b75d082b62ee006eed32a4dc59b6a3feb360756a8979da8bc6ffaf6d2c
-  data.tar.gz: c19cde0fe7f254c45e09ff3190574831376bebca2f8223c2717b64d408cf23b0
+  metadata.gz: 58253eb8322a05bac48b60ee5a1b469183bb23df8768dfa36e4ff9e89d4962be
+  data.tar.gz: c8ffbd6fd1537adcdd76487b0d18e832a8effbbe4722bcda72a5d8b6e5eb0d83
 SHA512:
-  metadata.gz: 73087c2ef51e694f96ad9c41e91040adc792ed28d055ba277fc1024231fb0b9e39e58b4dab098914039f62dc32f4615abae8e82f32b9268a669a504cc77f6924
-  data.tar.gz: e17dd677edbc36f8e2a63e6771f98568bdb770c0a7ee78b0584dc522332ef9b058ce3138ba1108dc4f27d2422bbd72092068784461b1bb8fd466f77616e90bb2
+  metadata.gz: 2d078591bab65974d315d8eff0fff980d2c7973a1ef67d829f952620d39d251b6b2e381655be036a740ba5d61bd4c8351984c629e74f202878c234173a2dda68
+  data.tar.gz: 38b3873ee99d11c14c8dcf1efadeac81e57f3a67d80e6ca23bf7c9d208d1527599d756d092b739d92b6f6bc009c36f97fe5969c90c391520fc88c14b5cd31d3f

data/app/commands/decidim/forms/answer_questionnaire.rb

@@ -20,7 +20,7 @@ module Decidim
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        return broadcast(:invalid) if @form.invalid?
+        return broadcast(:invalid) if @form.invalid? || user_already_answered?
 
         answer_questionnaire
 
@@ -32,7 +32,7 @@ module Decidim
         end
       end
 
-      attr_reader :form
+      attr_reader :form, :questionnaire, :current_user
 
       private
 
@@ -96,6 +96,10 @@ module Decidim
           raise ActiveRecord::Rollback if @errors
         end
       end
+
+      def user_already_answered?
+        questionnaire.answered_by?(current_user || form.context.session_token)
+      end
     end
   end
 end

data/app/forms/decidim/forms/admin/question_form.rb

@@ -42,6 +42,10 @@ module Decidim
           question_type == Decidim::Forms::Question::SEPARATOR_TYPE
         end
 
+        def title_and_description?
+          question_type == Decidim::Forms::Question::TITLE_AND_DESCRIPTION_TYPE
+        end
+
         def matrix_rows_by_position
           matrix_rows.sort do |a, b|
             if a.position && b.position

data/app/models/decidim/forms/answer.rb

@@ -22,6 +22,7 @@ module Decidim
       validate :question_belongs_to_questionnaire
 
       scope :not_separator, -> { joins(:question).where.not(decidim_forms_questions: { question_type: Decidim::Forms::Question::SEPARATOR_TYPE }) }
+      scope :not_title_and_description, -> { joins(:question).where.not(decidim_forms_questions: { question_type: Decidim::Forms::Question::TITLE_AND_DESCRIPTION_TYPE }) }
 
       def self.user_collection(user)
         where(decidim_user_id: user.id)

data/app/models/decidim/forms/question.rb

@@ -8,7 +8,8 @@ module Decidim
 
       QUESTION_TYPES = %w(short_answer long_answer single_option multiple_option sorting files matrix_single matrix_multiple).freeze
       SEPARATOR_TYPE = "separator"
-      TYPES = (QUESTION_TYPES + [SEPARATOR_TYPE]).freeze
+      TITLE_AND_DESCRIPTION_TYPE = "title_and_description"
+      TYPES = (QUESTION_TYPES + [SEPARATOR_TYPE, TITLE_AND_DESCRIPTION_TYPE]).freeze
 
       translatable_fields :body, :description
 
@@ -49,6 +50,7 @@ module Decidim
       validates :question_type, inclusion: { in: TYPES }
 
       scope :not_separator, -> { where.not(question_type: SEPARATOR_TYPE) }
+      scope :not_title_and_description, -> { where.not(question_type: TITLE_AND_DESCRIPTION_TYPE) }
 
       scope :with_body, -> { where(question_type: %w(short_answer long_answer)) }
       scope :with_choices, -> { where.not(question_type: %w(short_answer long_answer)) }
@@ -84,6 +86,10 @@ module Decidim
         question_type.to_s == SEPARATOR_TYPE
       end
 
+      def title_and_description?
+        question_type.to_s == TITLE_AND_DESCRIPTION_TYPE
+      end
+
       def has_attachments?
         question_type.to_s == "files"
       end

data/app/packs/src/decidim/forms/admin/forms.js

@@ -375,8 +375,10 @@ export default function createEditableForm() {
     fieldSelector: fieldSelector,
     addFieldButtonSelector: ".add-question",
     addSeparatorButtonSelector: ".add-separator",
+    addTitleAndDescriptionButtonSelector: ".add-title-and-description",
     fieldTemplateSelector: ".decidim-question-template",
     separatorTemplateSelector: ".decidim-separator-template",
+    TitleAndDescriptionTemplateSelector: ".decidim-title-and-description-template",
     removeFieldButtonSelector: ".remove-question",
     moveUpFieldButtonSelector: ".move-up-question",
     moveDownFieldButtonSelector: ".move-down-question",

data/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb

@@ -21,10 +21,13 @@ module Decidim
           return "-" if answer.choices.empty?
 
           choices = answer.choices.map do |choice|
-            choice.try(:custom_body) || choice.try(:body)
+            {
+              answer_option_body: choice.try(:answer_option).try(:translated_body),
+              choice_body: body_or_custom_body(choice)
+            }
           end
 
-          return choices.first if answer.question.question_type == "single_option"
+          return choice(choices.first) if answer.question.question_type == "single_option"
 
           content_tag(:ul) do
             safe_join(choices.map { |c| choice(c) })
@@ -52,11 +55,23 @@ module Decidim
           # rubocop:enable Style/StringConcatenation
         end
 
-        def choice(choice_body)
+        def choice(choice_hash)
           content_tag :li do
-            choice_body
+            render_body_for choice_hash
           end
         end
+
+        def render_body_for(choice_hash)
+          return choice_hash[:answer_option_body] if choice_hash[:choice_body].blank?
+
+          "#{choice_hash[:answer_option_body]} (#{choice_hash[:choice_body]})"
+        end
+
+        def body_or_custom_body(choice)
+          return choice.custom_body if choice.try(:custom_body).present?
+
+          ""
+        end
       end
     end
   end

data/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb

@@ -46,13 +46,16 @@ module Decidim
           with_choices = sibilings.where.not("decidim_forms_questions.question_type in (?)", %w(short_answer long_answer))
                                   .where("decidim_forms_answers.id IN (SELECT decidim_answer_id FROM decidim_forms_answer_choices)").count
 
-          (with_body + with_choices).to_f / questionnaire.questions.not_separator.count * 100
+          (with_body + with_choices).to_f / questionnaire.questions.not_separator.not_title_and_description.count * 100
         end
 
         private
 
         def sibilings
-          Answer.not_separator.where(questionnaire: questionnaire, session_token: participant.session_token).joins(:question).order("decidim_forms_questions.position ASC")
+          Answer.not_separator
+                .not_title_and_description
+                .where(questionnaire: questionnaire, session_token: participant.session_token)
+                .joins(:question).order("decidim_forms_questions.position ASC")
         end
       end
     end

data/app/queries/decidim/forms/questionnaire_user_answers.rb

@@ -20,7 +20,10 @@ module Decidim
 
       # Finds and group answers by user for each questionnaire's question.
       def query
-        answers = Answer.not_separator.joins(:question).where(questionnaire: @questionnaire)
+        answers = Answer.not_separator
+                        .not_title_and_description
+                        .joins(:question)
+                        .where(questionnaire: @questionnaire)
 
         answers.sort_by { |answer| answer.question.position }.group_by { |a| a.user || a.session_token }.values
       end

data/app/views/decidim/forms/admin/questionnaires/_form.html.erb

@@ -65,6 +65,12 @@
               id: tabs_id_for_question(blank_question),
               editable: questionnaire.questions_editable? %>
       </script>
+      <script type="text/template" class="decidim-title-and-description-template decidim-template" id="title-and-description-template">
+        <%= render "decidim/forms/admin/questionnaires/title_and_description",
+              form: question_form,
+              id: tabs_id_for_question(blank_question),
+              editable: questionnaire.questions_editable? %>
+      </script>
       <%= render "decidim/forms/admin/questionnaires/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-dummy" %>
       <%= render "decidim/forms/admin/questionnaires/display_condition_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "display-condition-template-dummy" %>
       <%= render "decidim/forms/admin/questionnaires/matrix_row_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "matrix-row-template-dummy" %>
@@ -83,6 +89,11 @@
                 form: question_form,
                 id: tabs_id_for_question(question),
                 editable: questionnaire.questions_editable? %>
+        <% elsif question.title_and_description? %>
+          <%= render "decidim/forms/admin/questionnaires/title_and_description",
+                form: question_form,
+                id: tabs_id_for_question(question),
+                editable: questionnaire.questions_editable? %>
         <% else %>
           <%= render "decidim/forms/admin/questionnaires/question",
                 form: question_form,
@@ -102,6 +113,7 @@
   <% if questionnaire.questions_editable? %>
     <button class="button add-question"><%= t(".add_question") %></button>
     <button class="button add-separator"><%= t(".add_separator") %></button>
+    <button class="button add-title-and-description"><%= t(".add_title_and_description") %></button>
   <% end %>
 </div>
 

data/app/views/decidim/forms/admin/questionnaires/_title_and_description.html.erb

@@ -0,0 +1,80 @@
+<% question = form.object %>
+<% is_expanded = question.errors.any? %>
+
+<div class="card questionnaire-question" id="<%= id %>-field">
+  <div class="card-divider question-divider">
+    <h2 class="card-title">
+    <span>
+      <% if editable %>
+        <%== icon("move") %>
+      <% end %>
+      <%= dynamic_title(translated_attribute(question.body), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t(".title_and_description")) %>
+    </span>
+
+      <button type="button" class="button small secondary button--title question--collapse" data-toggle="<%= id %>-question-card button--collapse-question-<%= id %> button--expand-question-<%= id %>">
+        <span id="button--collapse-question-<%= id %>" data-toggler=".hide" class="icon-collapse <%= "hide" unless is_expanded %>">
+          <%== icon("caret-top", aria_label: t(".collapse"), role: "img") %>
+        </span>
+
+        <span id="button--expand-question-<%= id %>" data-toggler=".hide" class="icon-expand <%= "hide" if is_expanded %>">
+          <%== icon("caret-bottom", aria_label: t(".expand"), role: "img") %>
+        </span>
+      </button>
+
+      <% if editable %>
+        <button class="button small alert hollow move-up-question button--title">
+          <%== "#{icon("arrow-top")} #{t(".up")}" %>
+        </button>
+
+        <button class="button small alert hollow move-down-question button--title">
+          <%== "#{icon("arrow-bottom")} #{t(".down")}" %>
+        </button>
+
+        <button class="button small alert hollow remove-question button--title">
+          <%= t(".remove") %>
+        </button>
+      <% end %>
+    </h2>
+  </div>
+
+  <div class="card-section collapsible <%= "hide" unless is_expanded %>" data-toggler=".hide" id="<%= id %>-question-card">
+    <div class="row column">
+      <%=
+        form.translated(
+          :text_field,
+          :body,
+          tabs_id: id,
+          label: t(".title"),
+          disabled: !editable
+        )
+      %>
+    </div>
+
+    <div class="row column">
+      <%=
+        form.translated(
+          :editor,
+          :description,
+          toolbar: :full,
+          tabs_id: id,
+          label: t(".description"),
+          disabled: !editable
+        )
+      %>
+    </div>
+
+    <%=
+      form.hidden_field(
+        :question_type,
+        value: :title_and_description
+      )
+    %>
+
+    <% if question.persisted? %>
+      <%= form.hidden_field :id, disabled: !editable %>
+    <% end %>
+
+    <%= form.hidden_field :position, value: question.position || 0, disabled: !editable %>
+    <%= form.hidden_field :deleted, disabled: !editable %>
+  </div>
+</div>

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

@@ -3,6 +3,15 @@
 <% if answer.question.separator? %>
   <%= render partial: "decidim/forms/questionnaires/answers/#{answer.question.question_type}", locals: { answer: answer, answer_form: answer_form, answer_idx: answer_idx, field_id: field_id, disabled: disabled } %>
   <%= answer_form.hidden_field :question_id %>
+<% elsif answer.question.title_and_description? %>
+  <%= label_tag field_id, translated_attribute(answer.question.body), class: "questionnaire-title_and_description" %>
+  <% if translated_attribute(answer.question.description).present? %>
+    <div class="help-title_and_description ">
+      <%= decidim_sanitize_editor translated_attribute(answer.question.description) %>
+    </div>
+  <% end %>
+  <%= render partial: "decidim/forms/questionnaires/answers/#{answer.question.question_type}", locals: { answer: answer, answer_form: answer_form, answer_idx: answer_idx, field_id: field_id, disabled: disabled } %>
+  <%= answer_form.hidden_field :question_id %>
 <% else %>
   <% case answer.question.question_type %>
   <% when "single_option", "multiple_option", "sorting" %>
@@ -13,7 +22,7 @@
 
   <% if translated_attribute(answer.question.description).present? %>
     <div class="help-text">
-      <%= decidim_sanitize translated_attribute(answer.question.description) %>
+      <%= decidim_sanitize_editor translated_attribute(answer.question.description) %>
     </div>
   <% end %>
 

data/app/views/decidim/forms/questionnaires/answers/_title_and_description.html.erb

@@ -0,0 +1 @@
+<%= answer_form.hidden_field :body, value: "title-and-description", id: field_id, disabled: disabled %>

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

@@ -11,7 +11,7 @@
   <h3 class="section-heading"><%= translated_attribute questionnaire.title %></h3>
   <div class="row">
     <div class="columns large-<%= columns %> medium-centered lead">
-      <%= decidim_sanitize translated_attribute questionnaire.description %>
+      <%= decidim_sanitize_editor translated_attribute questionnaire.description %>
     </div>
   </div>
 </div>
@@ -20,8 +20,8 @@
   <div class="columns large-<%= columns %> medium-centered">
     <div class="card">
       <div class="card__content">
-       <% unless questionnaire_for.try(:component)&.try(:published?) %>
-           <div class="section">
+        <% unless questionnaire_for.try(:component)&.try(:published?) %>
+          <div class="section">
             <div class="callout warning">
               <p><%= t(".questionnaire_not_published.body") %></p>
             </div>
@@ -65,14 +65,15 @@
                     <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">
-                          <%= t(".current_step", step: step_index + 1) %> <span class="answer-questionnaire__steps"><%= t(".of_total_steps", total_steps: @form.total_steps) %></span>
+                          <%= t(".current_step", step: step_index + 1) %>
+                          <span class="answer-questionnaire__steps"><%= t(".of_total_steps", total_steps: @form.total_steps) %></span>
                         </h4>
                       <% end %>
 
                       <% step_answers.each do |answer| %>
                         <div class="row column answer question" data-max-choices="<%= answer.question.max_choices %>" data-conditioned="<%= answer.question.display_conditions.any? %>" data-question-id="<%= answer.question.id %>">
                           <% answer.question.display_conditions.each do |display_condition| %>
-                            <%= content_tag :div, nil,  class: "display-condition", data: display_condition.to_html_data %>
+                            <%= content_tag :div, nil, class: "display-condition", data: display_condition.to_html_data %>
                           <% end %>
 
                           <%= fields_for "questionnaire[responses][#{answer_idx}]", answer do |answer_form| %>
@@ -86,7 +87,7 @@
                             ) %>
                           <% end %>
                         </div>
-                        <% if !answer.question.separator? %>
+                        <% if !(answer.question.separator? || answer.question.title_and_description?) %>
                           <% cleaned_answer_idx += 1 %>
                         <% end %>
                         <% answer_idx += 1 %>
@@ -108,7 +109,7 @@
                         <div class="row column tos-agreement">
                           <%= form.check_box :tos_agreement, label: t(".tos_agreement"), id: "questionnaire_tos_agreement", disabled: !current_participatory_space.can_participate?(current_user) %>
                           <div class="help-text">
-                            <%= decidim_sanitize translated_attribute questionnaire.tos %>
+                            <%= decidim_sanitize_editor translated_attribute questionnaire.tos %>
                           </div>
                         </div>
                       <% end %>

data/config/locales/cs.yml

@@ -79,6 +79,7 @@ cs:
           form:
             add_question: Přidat otázku
             add_separator: Přidat oddělovač
+            add_title_and_description: Přidat název a popis
             already_answered_warning: Formulář je již zodpovězen některými uživateli, takže jeho otázky nemůžete upravovat.
             collapse: Sbalit všechny otázky
             expand: Rozbalit všechny otázky
@@ -108,6 +109,15 @@ cs:
             remove: Odebrat
             separator: Oddělovač
             up: Nahoru
+          title_and_description:
+            collapse: Sbalit
+            description: Popis
+            down: Dolů
+            expand: Rozbalit
+            remove: Odebrat
+            title: Název
+            title_and_description: Název a popis
+            up: Nahoru
           update:
             invalid: Při ukládání dotazníku došlo k chybám.
             success: Formulář byl úspěšně uložen.
@@ -131,6 +141,7 @@ cs:
         short_answer: Stručná odpověď
         single_option: Jedna možnost
         sorting: Třídění
+        title_and_description: Název a popis
       questionnaires:
         answer:
           invalid: Při odpovědi na dotazník došlo k chybám.

data/config/locales/en.yml

@@ -80,6 +80,7 @@ en:
           form:
             add_question: Add question
             add_separator: Add separator
+            add_title_and_description: Add title and description
             already_answered_warning: The form is already answered by some users so you cannot modify its questions.
             collapse: Collapse all questions
             expand: Expand all questions
@@ -109,6 +110,15 @@ en:
             remove: Remove
             separator: Separator
             up: Up
+          title_and_description:
+            collapse: Collapse
+            description: Description
+            down: Down
+            expand: Expand
+            remove: Remove
+            title: Title
+            title_and_description: Title and description
+            up: Up
           update:
             invalid: There was a problem saving the form.
             success: Form successfully saved.
@@ -132,6 +142,7 @@ en:
         short_answer: Short answer
         single_option: Single option
         sorting: Sorting
+        title_and_description: Title and description
       questionnaires:
         answer:
           invalid: There was a problem answering the form.

data/config/locales/es.yml

@@ -79,6 +79,7 @@ es:
           form:
             add_question: Añadir pregunta
             add_separator: Añadir separador
+            add_title_and_description: Añadir título y descripción
             already_answered_warning: Algunas participantes ya han respondido el formulario, por lo que no puedes modificar las preguntas.
             collapse: Contraer todas las preguntas
             expand: Expandir todos las preguntas
@@ -108,6 +109,15 @@ es:
             remove: Eliminar
             separator: Separador
             up: Subir
+          title_and_description:
+            collapse: Contraer
+            description: Descripción
+            down: Bajar
+            expand: Expandir
+            remove: Eliminar
+            title: Título
+            title_and_description: Título y descripción
+            up: Subir
           update:
             invalid: Se ha producido un error al guardar el formulario.
             success: Formulario guardado correctamente.
@@ -131,6 +141,7 @@ es:
         short_answer: Respuesta corta
         single_option: Opción única
         sorting: Ordenación
+        title_and_description: Titulo y descripción
       questionnaires:
         answer:
           invalid: Se ha producido un error al responder el formulario.

data/config/locales/eu.yml

@@ -3,18 +3,27 @@ eu:
     attributes:
       answer:
         body: Erantzuna
+        choices: Aukerak
+        selected_choices: Hautatutako aukerak
       question:
         max_choices: Gehienezko aukera kopurua
         question_type: Mota
       questionnaire_question:
         mandatory: derrigorrezko
+        max_characters: Karaktereen muga (utzi 0 mugarik ez badago)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Fitxategia berriro erantsi behar da
+            body:
+              too_long: luzeegia da
             choices:
               missing: ez dira osatu
               too_many: gehiegi dira
+        questionnaire:
+          request_invalid: Arazo bat izan da zure eskaera bidaltzean. Saiatu berriro
   decidim:
     forms:
       admin:
@@ -23,35 +32,101 @@ eu:
             description: deskribapena
             tos: Zerbitzu-baldintzak
         questionnaires:
+          actions:
+            back: Itzuli galderetara
+            show: Erakutsi erantzunak
           answer_option:
             answer_option: Erantzun aukera
             free_text: Testu librea
             remove: Kendu
             statement: adierazpena
+          answers:
+            actions:
+              back: Itzuli erantzunetara
+              export: Esportatu
+              show: Erakutsi erantzunak
+            empty: Oraindik ez dago erantzunik
+            export:
+              answer:
+                title: '#%{number} erantzuna'
+            export_response:
+              title: survey_user_answers_%{token}
+            index:
+              title: "Guztira %{total} erantzun"
+            show:
+              title: '#%{number} erantzuna'
+          display_condition:
+            answer_option: Erantzuteko aukera
+            condition_question: Galdera
+            condition_type: Baldintza
+            condition_types:
+              answered: Erantzunda
+              equal: Honen berdina
+              match: Testua barne
+              not_answered: Erantzun gabe
+              not_equal: Ez da berdina
+            condition_value: Testua barne
+            display_condition: Bistaratzeko baldintza
+            mandatory: Baldintza hau beti bete behar da, beste baldintza batzuen egoera edozein dela ere
+            remove: Kendu
+            save_warning: Gogoratu formularioa gorde behar duzula, bistaratze-baldintzak konfiguratu aurretik
+            select_answer_option: Hautatu erantzun-aukera
+            select_condition_question: Hautatu galdera bat
+            select_condition_type: Hautatu baldintza mota bat
           edit:
             save: Save
+            title: Editatu galdetegia
           form:
-            add_question: Galdera gehitu
+            add_question: Gehitu galdera
+            add_separator: Gehitu banatzailea
             already_answered_warning: Galdetegia dagoeneko erantzun dio erabiltzaile batzuek, beraz, ezin dituzu bere galderak aldatu.
+            collapse: Bildu galdera guztiak
+            expand: Zabaldu galdera guztiak
+            preview: Aurreikusi
+            title: Editatu galdetegia honetarako %{questionnaire_for}
+            unpublished_warning: Galdetegia ez dago argitaratuta. Bere galderak aldatu ahal dituzu, baina egitean oraingo erantzunak ezabatuko dira.
           matrix_row:
+            matrix_row: Errenkada
             remove: Kendu
             statement: adierazpena
           question:
             add_answer_option: Gehitu erantzun aukera
+            add_display_condition: Gehitu bistaratzeko baldintza
+            add_display_condition_info: Gorde galdetegia bistaratzeko baldintzak konfiguratzeko
+            add_matrix_row: Gehitu errenkada
             any: Edozein
+            collapse: Bildu
             description: deskribapena
             down: Down
+            expand: Zabaldu
             question: Galdera
             remove: Kendu
             statement: adierazpena
             up: up
+          separator:
+            down: Jaitsi
+            remove: Kendu
+            separator: Bereizlea
+            up: Igo
           update:
             invalid: Akatsik egon da galdeketa gordetzean.
+            success: Galdetegia zuzen gorde da.
       errors:
         answer:
           body: Gorputza ezin da hutsik egon
+      files:
+        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
+        matrix_multiple: Matrizea (aukera anitzekoa)
+        matrix_single: Matrizea (aukera bakarrekoa)
         multiple_option: Hainbat aukera
         short_answer: Erantzun laburra
         single_option: Aukera bakarra
@@ -59,6 +134,7 @@ eu:
       questionnaires:
         answer:
           invalid: Akatsik egon da galdeketa erantzutean.
+          max_choices_alert: Aukera gehiegi daude hautatuta
           success: Galdesortaz erantzun ona.
         question:
           max_choices: 'Gehienezko aukerak: %{n}'
@@ -66,6 +142,8 @@ eu:
           answer_questionnaire:
             anonymous_user_message: <a href="%{sign_in_link}">Hasi saioa zure kontuarekin</a> edo <a href="%{sign_up_link}">saioa hasi</a> galdetegiari erantzuteko.
             title: Erantzun galdetegia
+          current_step: '%{step} urratsa'
+          of_total_steps: '%{total_steps} etik'
           questionnaire_answered:
             body: Galdeketa honi erantzun dio.
             title: Dagoeneko erantzun
@@ -75,11 +153,24 @@ eu:
           questionnaire_for_private_users:
             body: Galdetegia erabiltzaile pribatuentzat soilik dago erabilgarri
             title: Galdeketa itxia
+          questionnaire_js_disabled:
+            body: Galdetegi honen ezaugarri batzuk desaktibatu egingo dira. Zure esperientzia hobetzeko, gaitu JavaScript zure nabigatzailean.
+            title: Javascript desaktibatuta dago
           tos_agreement: Zerbitzu-baldintzak onartzen dituzunean parte hartuz
       step_navigation:
         show:
           are_you_sure: Ekintza hau ezin da desegin eta ezin izango dituzu zure erantzunak editatu. Ziur zaude?
+          back: Atzera
+          continue: Jarraitu
           submit: Bidali
       user_answers_serializer:
+        body: Erantzuna
+        completion: Amaiera
         created_at: Erantzuna
         id: Erantzun IDa
+        ip_hash: IP Helbidearen Hash
+        question: Galdera
+        registered: Erregistratuta
+        session_token: Erabiltzailearen identifikatzailea
+        unregistered: Erregistratu gabe
+        user_status: Erabiltzailearen egoera