decidim-forms 0.25.0 → 0.26.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931723679f0358853351adc3557731b3a523b30d9da94cddcf7c2ec142667f9d
-  data.tar.gz: f43b8c8c48c9612c9334e36d9fe42448bc0ee66640186f41e67d00f37c0dd3ce
+  metadata.gz: 0b9bda71f82ea8834423fdd0160f804ffd07b4f2463374c06c497fbac9311349
+  data.tar.gz: 734131fa283abc6c4985cccb00221e2899cbe9a51bb6f4526a6235d144a318ad
 SHA512:
-  metadata.gz: a3aa93724afce7f04fd75159b1f960471fab8142d79f16b2c9d43c05ab91e92c8dfd266e78ab0cc859b9759e9fc2baf0fc8d1e0db0bb589e08fde8db821ee52c
-  data.tar.gz: 2ab2812b7a9510c7f1d314ad52cf359fc23a87b952b49d401d337e58904ee2e99fc74e9d52018d54f432cf546bfd3a8597d6ee52660f90251bd8adba25b76423
+  metadata.gz: 0eef2098c5cb0e0239051c2889a1ab727a746622d78ceccaf3b9a74249c0e605d713b4d6189d15c68114fe17cf30cd0ed55105c8e2392c866906bc0efeea6ef9
+  data.tar.gz: 77b2ce921a9dfd4415f59d1227bc24b22c3307a81a5214e8b66fdfe9b12a117ec91d70f0655e9dafaaaf5ba491e1a453053e4008e32744b6280a292d3011bf6b

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/ca.yml

@@ -79,6 +79,7 @@ ca:
           form:
             add_question: Afegeix una pregunta
             add_separator: Afegir separador
+            add_title_and_description: Afegir títol i descripció
             already_answered_warning: No pots modificar les preguntes d'aquest formulari perquè ja ha estat contestat per algunes participants.
             collapse: Redueix totes les preguntes
             expand: Expandeix totes les preguntes
@@ -108,6 +109,15 @@ ca:
             remove: Eliminar
             separator: Separador
             up: Pujar
+          title_and_description:
+            collapse: Replegar
+            description: Descripció
+            down: Baixar
+            expand: Expandir
+            remove: Esborrar
+            title: Títol
+            title_and_description: Títol i descripció
+            up: Pujar
           update:
             invalid: S'ha produït un error en desar el formulari.
             success: Formulari desat correctament.
@@ -131,6 +141,7 @@ ca:
         short_answer: Resposta curta
         single_option: Opció única
         sorting: Ordenació
+        title_and_description: Títol i descripció
       questionnaires:
         answer:
           invalid: S'han produït un error en respondre el formulari.

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-MX.yml

@@ -79,6 +79,7 @@ es-MX:
           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: Algunos usuarios ya han respondido al cuestionario, por lo que no puedes modificar las preguntas.
             collapse: Contraer todas las preguntas
             expand: Expandir todos las preguntas
@@ -108,6 +109,15 @@ es-MX:
             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: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.
@@ -131,6 +141,7 @@ es-MX:
         short_answer: Respuesta corta
         single_option: Opción única
         sorting: Ordenación
+        title_and_description: Titulo y descripción
       questionnaires:
         answer:
           invalid: Ha habido errores al responder al cuestionario.

data/config/locales/es-PY.yml

@@ -79,6 +79,7 @@ es-PY:
           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: Algunos usuarios ya han respondido al cuestionario, por lo que no puedes modificar las preguntas.
             collapse: Contraer todas las preguntas
             expand: Expandir todos las preguntas
@@ -108,6 +109,15 @@ es-PY:
             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: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.
@@ -131,6 +141,7 @@ es-PY:
         short_answer: Respuesta corta
         single_option: Opción única
         sorting: Ordenación
+        title_and_description: Titulo y descripción
       questionnaires:
         answer:
           invalid: Ha habido errores al responder al cuestionario.

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/fi-plain.yml

@@ -79,6 +79,7 @@ fi-pl:
           form:
             add_question: Lisää kysymys
             add_separator: Lisää erotinviiva
+            add_title_and_description: Lisää otsikko ja kuvaus
             already_answered_warning: Jotkut käyttäjät ovat jo vastanneet kyselyyn, joten et voi muokata kysymyksiä.
             collapse: Sulje kaikki kysymykset
             expand: Avaa kaikki kysymykset
@@ -108,6 +109,15 @@ fi-pl:
             remove: Poista
             separator: Erotin
             up: Ylös
+          title_and_description:
+            collapse: Pienennä
+            description: Kuvaus
+            down: Alas
+            expand: Laajenna
+            remove: Poista
+            title: Otsikko
+            title_and_description: Otsikko ja kuvaus
+            up: Ylös
           update:
             invalid: Kyselylomakkeiden tallentamisessa on tapahtunut virheitä.
             success: Lomake tallennettu onnistuneesti.
@@ -131,6 +141,7 @@ fi-pl:
         short_answer: Lyhyt vastaus
         single_option: Yksi vaihtoehto
         sorting: Järjestäminen
+        title_and_description: Otsikko ja kuvaus
       questionnaires:
         answer:
           invalid: Kyselylomakkeeseen vastatessa tapahtui virheitä.

data/config/locales/fi.yml

@@ -79,6 +79,7 @@ fi:
           form:
             add_question: Lisää kysymys
             add_separator: Lisää erotinviiva
+            add_title_and_description: Lisää otsikko ja kuvaus
             already_answered_warning: Jotkut käyttäjät ovat jo vastanneet tähän kyselylomakkeeseen, joten et voi enää muokata kysymyksiä.
             collapse: Sulje kaikki kysymykset
             expand: Avaa kaikki kysymykset
@@ -108,6 +109,15 @@ fi:
             remove: Poista
             separator: Erotin
             up: Ylös
+          title_and_description:
+            collapse: Pienennä
+            description: Kuvaus
+            down: Alas
+            expand: Laajenna
+            remove: Poista
+            title: Otsikko
+            title_and_description: Otsikko ja kuvaus
+            up: Ylös
           update:
             invalid: Kyselylomakkeen tallentaminen epäonnistui.
             success: Lomake tallennettu onnistuneesti.
@@ -131,6 +141,7 @@ fi:
         short_answer: Lyhyt vastaus
         single_option: Yksi vaihtoehto
         sorting: Järjestäminen
+        title_and_description: Otsikko ja kuvaus
       questionnaires:
         answer:
           invalid: Kyselylomakkeeseen vastaaminen epäonnistui.