decidim-forms 0.28.5 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bf104fe1ce831d58e8bc9fe97d78fcd2a940bbf93e3c2d2aa54fb8d66c6d987
-  data.tar.gz: 60bb8c3c47ee274b1192ab2563427505f349458e127b7e00fdf16abcedfbed26
+  metadata.gz: 2293a9e3534dc50768b5ed1a7ac9e501ec9a531089ac49a33e31cf7c4660d7ed
+  data.tar.gz: da021b4ab46c20cdb1aaeaa1f5a8cd1aedd46cd411c22b74b6cfdf72c4440592
 SHA512:
-  metadata.gz: 149592e31f688b16bb774d32e0acd8d969f4e7fe0b0543f6cca7f8fd0d8d0ea35e41a70f89be188dedb385cdd60e8077ba1aa1ac4e3ec2a23b6cf1bf23586768
-  data.tar.gz: cd477eb26d1073f3ed51ca537ca59dfe6fca10d061a912407c146b4290cdcd5c7b2cf09ec32fc883594df40f8d37c73b39d437ca1f0d45eae27d818c76164717
+  metadata.gz: d72b88bb788cb143ff3c422f0f9df2a1dedeac476b30c0c393d6cee92a0664a48ab1ad4dd0ac55313a5b902c1efaa5f7b8d9a9b4086320aa35a14bb42f6d3344
+  data.tar.gz: d2c4966ec421a62dda538e4257934223a1708eb8f7c20b9c31947d5e87f67bf261ca669d7cd0ee790397353017df8c62936fd7a02aef6702f424c3a6a6ea58f5

data/app/cells/decidim/forms/question_readonly_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   module Forms
     # This cell renders a question (readonly) of a questionnaire
     class QuestionReadonlyCell < Decidim::ViewModel
-      include Decidim::SanitizeHelper
-
       def show
         return if model.separator?
         return render :title_and_description if model.title_and_description?

data/app/cells/decidim/forms/step_navigation/show.erb

@@ -1,6 +1,6 @@
-<div class="form-general-submit answer-questionnaire__submit">
+<div class="answer-questionnaire__submit layout-aside__ctas-buttons survey-section-buttons" data-sticky-buttons>
   <% if !first_step? %>
-    <button type="button" class="button button__sm button__text-secondary" data-toggle="<%= [previous_step_dom_id, current_step_dom_id].join(" ") %>">
+    <button type="button" class="button button__sm button__transparent-secondary" data-toggle="<%= [previous_step_dom_id, current_step_dom_id].join(" ") %>" data-survey-buttons>
       <%= icon "arrow-left-line", class: "fill-current" %>
       <%= t("decidim.forms.step_navigation.show.back") %>
     </button>
@@ -14,7 +14,7 @@
       **confirm_data
     ) %>
   <% else %>
-    <button type="button" class="button button__sm button__secondary" data-toggle="<%= [next_step_dom_id, current_step_dom_id].join(" ") %>">
+    <button type="button" class="button button__sm button__secondary" data-toggle="<%= [next_step_dom_id, current_step_dom_id].join(" ") %>" data-survey-buttons>
       <%= t("decidim.forms.step_navigation.show.continue") %>
       <%= icon "arrow-right-line", class: "fill-current" %>
     </button>

data/app/cells/decidim/forms/step_navigation_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   module Forms
     # This cell renders the navigation of a questionnaire step.
     class StepNavigationCell < Decidim::ViewModel
-      include Decidim::LayoutHelper
-
       def current_step_index
         model
       end
@@ -45,7 +43,8 @@ module Decidim
       def confirm_data
         { data: {
           confirm: t("decidim.forms.step_navigation.show.are_you_sure"),
-          disable: true
+          disable: true,
+          data: "survey-buttons"
         } }
       end
     end

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

@@ -4,15 +4,15 @@ module Decidim
   module Forms
     # This command is executed when the user answers a Questionnaire.
     class AnswerQuestionnaire < Decidim::Command
+      delegate :current_user, to: :form
       include ::Decidim::MultipleAttachmentsMethods
 
       # Initializes a AnswerQuestionnaire Command.
       #
       # form - The form from which to get the data.
       # questionnaire - The current instance of the questionnaire to be answered.
-      def initialize(form, current_user, questionnaire)
+      def initialize(form, questionnaire)
         @form = form
-        @current_user = current_user
         @questionnaire = questionnaire
       end
 
@@ -34,7 +34,7 @@ module Decidim
         end
       end
 
-      attr_reader :form, :questionnaire, :current_user
+      attr_reader :form, :questionnaire
 
       private
 
@@ -82,7 +82,7 @@ module Decidim
         Answer.transaction(requires_new: true) do
           form.responses_by_step.flatten.select(&:display_conditions_fulfilled?).each do |form_answer|
             answer = Answer.new(
-              user: @current_user,
+              user: current_user,
               questionnaire: @questionnaire,
               question: form_answer.question,
               body: form_answer.body,

data/app/controllers/decidim/forms/concerns/has_questionnaire.rb

@@ -30,7 +30,7 @@ module Decidim
 
             @form = form(Decidim::Forms::QuestionnaireForm).from_params(params, session_token:, ip_hash:)
 
-            Decidim::Forms::AnswerQuestionnaire.call(@form, current_user, questionnaire) do
+            Decidim::Forms::AnswerQuestionnaire.call(@form, questionnaire) do
               on(:ok) do
                 # i18n-tasks-use t("decidim.forms.questionnaires.answer.success")
                 flash[:notice] = I18n.t("answer.success", scope: i18n_flashes_scope)

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

@@ -8,8 +8,8 @@ module Decidim
         include TranslatableAttributes
 
         translatable_attribute :title, String
-        translatable_attribute :description, Decidim::Attributes::RichText
-        translatable_attribute :tos, Decidim::Attributes::RichText
+        translatable_attribute :description, String
+        translatable_attribute :tos, String
 
         attribute :published_at, Decidim::Attributes::TimeWithZone
         attribute :questions, Array[QuestionForm]

data/app/forms/decidim/forms/answer_form.rb

@@ -108,9 +108,9 @@ module Decidim
 
       def max_choices
         if matrix?
-          errors.add(:choices, :too_many) if grouped_choices.any? { |choices| choices.count > question.max_choices }
+          errors.add(:choices, :too_many, count: question.max_choices) if grouped_choices.any? { |choices| choices.count > question.max_choices }
         elsif selected_choices.size > question.max_choices
-          errors.add(:choices, :too_many)
+          errors.add(:choices, :too_many, count: question.max_choices)
         end
       end
 

data/app/forms/decidim/forms/questionnaire_form.rb

@@ -33,7 +33,7 @@ module Decidim
         context.responses = attributes[:responses]
       end
 
-      # Public: Splits reponses by step, keeping the separator.
+      # Public: Splits responses by step, keeping the separator.
       #
       # Returns an array of steps. Each step is a list of the questions in that
       # step, including the separator.

data/app/helpers/decidim/forms/application_helper.rb

@@ -8,11 +8,11 @@ module Decidim
       def show_represent_user_group?
         model_name = questionnaire_for.model_name.element
 
-        permited_models.include?(model_name)
+        permitted_models.include?(model_name)
       end
       alias show_public_participation? show_represent_user_group?
 
-      def permited_models
+      def permitted_models
         %(meeting)
       end
     end

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

@@ -17,8 +17,6 @@ module Decidim
                  optional: true
 
       validates :matrix_row, presence: true, if: -> { answer.question.matrix? }
-
-      default_scope { left_outer_joins(:matrix_row).order(arel_table[:position].asc, Decidim::Forms::QuestionMatrixRow.arel_table[:position].asc, arel_table[:id].asc) }
     end
   end
 end

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

@@ -9,7 +9,7 @@ module Decidim
 
       translatable_fields :body
 
-      belongs_to :question, class_name: "Question", foreign_key: "decidim_question_id"
+      belongs_to :question, class_name: "Question", foreign_key: "decidim_question_id", counter_cache: true
 
       has_many :display_conditions,
                class_name: "DisplayCondition",

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

@@ -7,16 +7,24 @@ module Decidim
     # that we want to display or hide based on some conditions, and :condition_question
     # is the question the answers of which are checked against the conditions.
     # Conditions can be whether the question is answered ("answered") or it is not ("not_answered"),
-    # if the selected answer option is ("equal") or is not ("not_equal") a given one, or whethe
+    # if the selected answer option is ("equal") or is not ("not_equal") a given one, or whether
     # the text value of the answer matches a string ("match").
     class DisplayCondition < Forms::ApplicationRecord
       enum condition_type: [:answered, :not_answered, :equal, :not_equal, :match], _prefix: true
 
       # Question which will be displayed or hidden
-      belongs_to :question, class_name: "Question", foreign_key: "decidim_question_id", inverse_of: :display_conditions
+      belongs_to :question,
+                 class_name: "Question",
+                 foreign_key: "decidim_question_id",
+                 inverse_of: :display_conditions,
+                 counter_cache: :display_conditions_count
 
       # Question the answers of which are checked against conditions
-      belongs_to :condition_question, class_name: "Question", foreign_key: "decidim_condition_question_id", inverse_of: :display_conditions_for_other_questions
+      belongs_to :condition_question,
+                 class_name: "Question",
+                 foreign_key: "decidim_condition_question_id",
+                 inverse_of: :display_conditions_for_other_questions,
+                 counter_cache: :display_conditions_for_other_questions_count
 
       # Answer option provided to check for "equal" or "not_equal" (optional)
       belongs_to :answer_option, class_name: "AnswerOption", foreign_key: "decidim_answer_option_id", optional: true

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

@@ -7,7 +7,7 @@ module Decidim
       include Decidim::TranslatableResource
 
       translatable_fields :body
-      belongs_to :question, class_name: "Question", foreign_key: "decidim_question_id"
+      belongs_to :question, class_name: "Question", foreign_key: "decidim_question_id", counter_cache: :matrix_rows_count
 
       delegate :answer_options, :mandatory, :max_choices, to: :question
 

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

@@ -34,26 +34,26 @@ module Decidim
         end
 
         def answers
-          sibilings.map { |answer| QuestionnaireAnswerPresenter.new(answer:) }
+          siblings.map { |answer| QuestionnaireAnswerPresenter.new(answer:) }
         end
 
         def first_short_answer
-          short = sibilings.where(decidim_forms_questions: { question_type: %w(short_answer) })
+          short = siblings.where(decidim_forms_questions: { question_type: %w(short_answer) })
           short.first
         end
 
         def completion
-          with_body = sibilings.where(decidim_forms_questions: { question_type: %w(short_answer long_answer) })
-                               .where.not(body: "").count
-          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 = siblings.where(decidim_forms_questions: { question_type: %w(short_answer long_answer) })
+                              .where.not(body: "").count
+          with_choices = siblings.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.not_title_and_description.count * 100
         end
 
         private
 
-        def sibilings
+        def siblings
           Answer.not_separator
                 .not_title_and_description
                 .where(questionnaire:, session_token: participant.session_token)

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

@@ -5,7 +5,7 @@
     <h2 class="card-title">
     <span><%= t(".answer_option") %></span>
     <% if editable %>
-      <button class="button button__sm button__transparent-secondary small alert hollow remove-answer-option button--title mb-2">
+      <button class="button button__sm button__transparent-secondary small alert remove-answer-option button--title mb-2">
         <%= icon("delete-bin-line") %>
         <%= t(".remove") %>
       </button>

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

@@ -5,7 +5,7 @@
     <h2 class="card-title">
     <span><%= t(".display_condition") %></span>
     <% if editable %>
-      <button class="button button__sm button__transparent-secondary small alert hollow remove-display-condition button--title">
+      <button class="button button__sm button__transparent-secondary small alert remove-display-condition button--title">
         <%= icon("delete-bin-line") %>
         <%= t(".remove") %>
       </button>
@@ -14,7 +14,7 @@
   </div>
   <div class="card-section">
     <div class="row column">
-      <small class="text-muted">
+      <small>
         <%= t(".save_warning") %>
       </small>
     </div>

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

@@ -5,7 +5,7 @@
     <h2 class="card-title">
     <span><%= t(".matrix_row") %></span>
     <% if editable %>
-      <button class="button button__sm button__transparent-secondary small alert hollow remove-matrix-row button--title mb-2">
+      <button class="button button__sm button__transparent-secondary small alert remove-matrix-row button--title mb-2">
         <%= icon("delete-bin-line") %>
         <%= t(".remove") %>
       </button>

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

@@ -2,7 +2,7 @@
 <% is_expanded = question.errors.any? %>
 <div class="card questionnaire-question" id="accordion-<%= id %>-field">
   <div class="form__wrapper" data-component="accordion">
-    <div class="card-divider question-divider">
+    <div class="card-divider">
       <h2 class="card-title flex items-center">
         <span>
           <% if editable %>
@@ -23,17 +23,17 @@
           </button>
 
           <% if editable %>
-            <button class="button button__sm button__transparent-secondary small alert hollow move-up-question button--title">
+            <button class="button button__sm button__transparent-secondary small alert move-up-question button--title">
               <%= icon("arrow-up-line") %>
               <%= t(".up") %>
             </button>
 
-            <button class="button button__sm button__transparent-secondary small alert hollow move-down-question button--title">
+            <button class="button button__sm button__transparent-secondary small alert move-down-question button--title">
               <%= icon("arrow-down-line") %>
               <%= t(".down") %>
             </button>
 
-            <button class="button button__sm button__transparent-secondary small alert hollow remove-question button--title">
+            <button class="button button__sm button__transparent-secondary small alert remove-question button--title">
               <%= icon("delete-bin-line") %>
               <%= t(".remove") %>
             </button>

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

@@ -1,7 +1,7 @@
 <% question = form.object %>
 
 <div class="card questionnaire-question" id="<%= id %>-field">
-  <div class="card-divider question-divider">
+  <div class="card-divider">
     <h2 class="card-title flex items-center">
     <span>
       <% if editable %>
@@ -12,15 +12,15 @@
 
       <div class="flex items-center gap-x-4 ml-auto">
         <% if editable %>
-          <button class="button button__sm button__transparent button__transparent-secondary small alert hollow move-up-question button--title">
+          <button class="button button__sm button__transparent button__transparent-secondary small alert move-up-question button--title">
             <%== "#{icon("arrow-up-line")} #{t(".up")}" %>
           </button>
 
-          <button class="button button__sm button__transparent button__transparent-secondary small alert hollow move-down-question button--title">
+          <button class="button button__sm button__transparent button__transparent-secondary small alert move-down-question button--title">
             <%== "#{icon("arrow-down-line")} #{t(".down")}" %>
           </button>
 
-          <button class="button button__sm button__transparent button__transparent-secondary small alert hollow remove-question button--title">
+          <button class="button button__sm button__transparent button__transparent-secondary small alert remove-question button--title">
             <%= t(".remove") %>
           </button>
         <% end %>

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

@@ -3,7 +3,7 @@
 
 <div class="card questionnaire-question" id="accordion-<%= id %>-field">
   <div data-component="accordion">
-    <div class="card-divider question-divider">
+    <div class="card-divider">
       <h2 class="card-title flex items-center">
         <span>
           <% if editable %>
@@ -23,17 +23,17 @@
           </button>
 
           <% if editable %>
-            <button class="button button__sm button__transparent button__transparent-secondary small alert hollow move-up-question button--title">
+            <button class="button button__sm button__transparent button__transparent-secondary small alert move-up-question button--title">
               <%= icon("arrow-up-line") %>
               <%= t(".up") %>
             </button>
 
-            <button class="button button__sm button__transparent button__transparent-secondary small alert hollow move-down-question button--title">
+            <button class="button button__sm button__transparent button__transparent-secondary small alert move-down-question button--title">
               <%= icon("arrow-down-line") %>
               <%= t(".down") %>
             </button>
 
-            <button class="button button__sm button__transparent button__transparent-secondary small alert hollow remove-question button--title">
+            <button class="button button__sm button__transparent button__transparent-secondary small alert remove-question button--title">
               <%= icon("delete-bin-line") %>
               <%= t(".remove") %>
             </button>

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

@@ -29,17 +29,7 @@
     }
     label_options[:for] = nil if %w(matrix_single matrix_multiple single_option multiple_option).include?(answer.question.question_type)
     %>
-
-    <%= label_tag field_id, **label_options do %>
-      <%= translated_attribute(answer.question.body) %>
-      <% if answer.question.mandatory? %>
-        <%= answer_form.send(:required_indicator) %>
-      <% end %>
-      <% if answer.question.max_choices %>
-        <%= " (#{answer.send(:max_choices_label)})" %>
-      <% end %>
-    <% end %>
-
+    <%= label_tag field_id, answer.label, **label_options %>
     <% if translated_attribute(answer.question.description).present? %>
       <div class="answer-questionnaire__question-description">
         <%= decidim_sanitize_editor_admin translated_attribute(answer.question.description) %>

data/config/initializers/wicked_pdf.rb

@@ -14,12 +14,14 @@ require "wicked_pdf"
 #
 # https://github.com/mileszs/wicked_pdf/blob/master/README.md
 
-WickedPdf.config = {
+WickedPdf.configure do |config|
   # Path to the wkhtmltopdf executable: This usually is not needed if using
   # one of the wkhtmltopdf-binary family of gems.
-  # exe_path: '/usr/local/bin/wkhtmltopdf',
+  #   or
+  # config.exe_path = '/usr/local/bin/wkhtmltopdf',
+  config.exe_path = Gem.bin_path("wkhtmltopdf-binary", "wkhtmltopdf")
 
   # Layout file to be used for all PDFs
   # (but can be overridden in `render :pdf` calls)
-  # layout: 'pdf.html',
-}
+  # config.layout = 'pdf.html'
+end

data/config/locales/ar.yml

@@ -16,7 +16,6 @@ ar:
           attributes:
             choices:
               missing: ليست كاملة
-              too_many: كثير جدا
   decidim:
     forms:
       admin:
@@ -30,9 +29,6 @@ ar:
             free_text: نص حر
             remove: إزالة
             statement: بيان
-          answers:
-            actions:
-              export: تصدير
           display_condition:
             condition_question: سؤال
             remove: حذف
@@ -40,6 +36,7 @@ ar:
             save: حفظ
           form:
             add_question: أضف سؤال
+            already_answered_warning: تمت الإجابة على النموذج من قبل بعض المستخدمين حتى لا تتمكن من تعديل أسئلته.
           matrix_row:
             remove: إزالة
             statement: بيان
@@ -85,6 +82,7 @@ ar:
           tos_agreement: من خلال المشاركة ، فإنك تقبل شروط الخدمة
       step_navigation:
         show:
+          are_you_sure: لا يمكن التراجع عن هذا الإجراء ولن تتمكن من تعديل إجاباتك. هل أنت واثق؟
           submit: خضع
       user_answers_serializer:
         created_at: أجاب على

data/config/locales/bg.yml

@@ -22,7 +22,7 @@ bg:
               too_long: твърде дълъг
             choices:
               missing: не са завършени
-              too_many: са твърде много
+              too_many: Можете да изберете максимум %{count}.
         questionnaire:
           request_invalid: Възникна грешка при обработката на заявката. Моля, опитайте отново.
   decidim:
@@ -81,10 +81,14 @@ bg:
             title: Редактиране на въпросника
           form:
             add_question: Добавяне на въпрос
+            add_separator: Добавяне на разделител
+            add_title_and_description: Добавете заглавие и описание
+            already_answered_warning: Няколко потребители вече са попълнили въпросника, поради което не можете да промените въпросите в него.
             collapse: Свиване на всички въпроси
             expand: Разгъване на всички въпроси
             preview: Преглед
             title: Редактирайте формуляра за %{questionnaire_for}
+            unpublished_warning: Формулярът не е публикуван. Можете да промените въпросите в него, но така ще се изтрият текущите въпроси.
           matrix_row:
             matrix_row: Ред
             remove: Премахни
@@ -154,7 +158,6 @@ bg:
           answer_questionnaire:
             already_have_an_account?: Вече имате профил?
             are_you_new?: Нов потребител?
-            sign_in_description: Влезте, за да участвате в анкетата
             sign_up_description: Създайте акаунт на участник, за да участвате в анкетата
             title: Попълване на отговори във формуляра
           current_step: Стъпка %{step}
@@ -177,6 +180,7 @@ bg:
           tos_agreement: С участието си приемате Условията на ползване
       step_navigation:
         show:
+          are_you_sure: Това действие не може да се отмени и Вие не можете да редактирате отговорите си. Сигурни ли сте?
           back: Назад
           continue: Продължи
           submit: Изпрати

data/config/locales/ca.yml

@@ -22,7 +22,7 @@ ca:
               too_long: és massa llarg
             choices:
               missing: no estan complets
-              too_many: en són masses
+              too_many: Pots triar un màxim de %{count} opcions.
         questionnaire:
           request_invalid: Hi ha hagut un problema gestionant la petició. Si us plau, torna-ho a provar.
   decidim:
@@ -83,12 +83,12 @@ ca:
             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è algunes participants ja han respost el formulari.
+            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
             preview: Previsualitzar
             title: Editar formulari per %{questionnaire_for}
-            unpublished_warning: El formulari no està publicat. Pots modificar les preguntes, però en fer-ho s'esborraran les respostes actuals.
+            unpublished_warning: El formulari no està publicat. Pots modificar les preguntes, però al fer-ho s'esborraran les respostes actuals.
           matrix_row:
             matrix_row: Fila
             remove: Elimina
@@ -181,7 +181,7 @@ ca:
           tos_agreement: En participar acceptes els Termes i condicions d'ús
       step_navigation:
         show:
-          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les respostes. Segur que vols continuar?
+          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les teves respostes. Segur?
           back: Enrere
           continue: Continuar
           submit: Enviar respostes

data/config/locales/cs.yml

@@ -22,7 +22,6 @@ cs:
               too_long: je příliš dlouhý
             choices:
               missing: nejsou úplné
-              too_many: jsou příliš mnoho
         questionnaire:
           request_invalid: Při zpracování požadavku došlo k chybě. Zkuste to prosím znovu.
   decidim:

data/config/locales/de.yml

@@ -22,7 +22,7 @@ de:
               too_long: ist zu lang
             choices:
               missing: sind nicht vollständig
-              too_many: sind zu viele
+              too_many: Sie können ein Maximum von %{count} auswählen.
         questionnaire:
           request_invalid: Beim Bearbeiten der Anfrage ist ein Fehler aufgetreten. Bitte versuchen Sie es nochmal.
   decidim:
@@ -82,13 +82,13 @@ de:
           form:
             add_question: Frage hinzufügen
             add_separator: Trennzeichen hinzufügen
-            add_title_and_description: Titel und Beschreibung 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
             preview: Vorschau
             title: Formular für %{questionnaire_for} bearbeiten
-            unpublished_warning: Das Formular ist nicht veröffentlicht. Sie können die Fragen ändern, aber dadurch werden die aktuellen Antworten gelöscht.
+            unpublished_warning: Das Formular ist nicht öffentlich. Sie können die Fragen ändern, dabei werden allerdings die aktuellen Antworten gelöscht.
           matrix_row:
             matrix_row: Zeile
             remove: Löschen
@@ -178,10 +178,10 @@ de:
             title: JavaScript ist deaktiviert
           questionnaire_not_published:
             body: Dieses Formular ist noch nicht veröffentlicht.
-          tos_agreement: 'Mit Ihrer Teilnahme stimmen Sie folgenden Nutzungsbedingungen zu:'
+          tos_agreement: Mit der Teilnahme stimmen Sie den Nutzungsbedingungen zu
       step_navigation:
         show:
-          are_you_sure: Diese Aktion kann nicht rückgängig gemacht werden und Sie können Ihre Antworten nicht mehr bearbeiten. Sind Sie sicher?
+          are_you_sure: Diese Aktion kann nicht rückgängig gemacht werden und Sie können Ihre Antworten nicht bearbeiten. Sind Sie sich sicher?
           back: Zurück
           continue: Weiter
           submit: einreichen

data/config/locales/el.yml

@@ -22,7 +22,6 @@ el:
               too_long: είναι πολύ μεγάλο
             choices:
               missing: δεν έχουν ολοκληρωθεί
-              too_many: είναι πάρα πολλά
         questionnaire:
           request_invalid: Παρουσιάστηκε σφάλμα κατά τον χειρισμό του αιτήματος. Παρακαλώ δοκιμάστε ξανά.
   decidim:
@@ -81,10 +80,14 @@ el:
             title: Επεξεργασία ερωτηματολογίου
           form:
             add_question: Προσθήκη ερώτησης
+            add_separator: Προσθήκη διαχωριστικού
+            add_title_and_description: Προσθήκη τίτλου και περιγραφής
+            already_answered_warning: Η φόρμα έχει ήδη απαντηθεί από ορισμένους χρήστες, επομένως δεν μπορείτε να τροποποιήσετε τις ερωτήσεις της.
             collapse: Σύμπτυξη όλων των ερωτήσεων
             expand: Ανάπτυξη όλων των ερωτήσεων
             preview: Προεπισκόπηση
             title: Επεξεργασία φόρμας για %{questionnaire_for}
+            unpublished_warning: Η φόρμα δεν έχει δημοσιευτεί. Μπορείτε να τροποποιήσετε τις ερωτήσεις της, αλλά με αυτόν τον τρόπο θα διαγράψετε τις τρέχουσες απαντήσεις.
           matrix_row:
             matrix_row: Γραμμή
             remove: Κατάργηση
@@ -154,7 +157,6 @@ el:
           answer_questionnaire:
             already_have_an_account?: Έχετε ήδη λογαριασμό;
             are_you_new?: Νέος χρήστης;
-            sign_in_description: Συνδεθείτε για να πραγματοποιήσετε την έρευνα
             sign_up_description: Δημιουργήστε ένα λογαριασμό συμμετέχοντα για να κάνετε την έρευνα
             title: Απαντήστε στη φόρμα
           current_step: Βήμα %{step}
@@ -176,6 +178,7 @@ el:
           tos_agreement: Με τη συμμετοχή σας, αποδέχεστε τους Όρους παροχής υπηρεσίας
       step_navigation:
         show:
+          are_you_sure: Αυτή η ενέργεια δεν μπορεί να αναιρεθεί και δεν θα μπορείτε να επεξεργαστείτε τις απαντήσεις σας. Είστε βέβαιοι;
           back: Πίσω
           continue: Συνέχεια
           submit: Υποβολή

data/config/locales/en.yml

@@ -22,7 +22,7 @@ en:
               too_long: is too long
             choices:
               missing: are not complete
-              too_many: are too many
+              too_many: You can choose a maximum of %{count}.
         questionnaire:
           request_invalid: There was an error handling the request. Please try again.
   decidim:
@@ -158,7 +158,7 @@ en:
           answer_questionnaire:
             already_have_an_account?: Already have an account?
             are_you_new?: New user?
-            sign_in_description: Login to take the survey
+            sign_in_description: Log in to take the survey
             sign_up_description: Create a participant account to take the survey
             title: Answer the form
           current_step: Step %{step}