decidim-surveys 0.30.3 → 0.31.0.rc2

data/app/views/decidim/surveys/admin/{surveys → settings/surveys}/_form.html.erb

@@ -1,12 +1,11 @@
-<%= render "decidim/forms/admin/questionnaires/form", form: %>
 <div class="form__wrapper">
   <div class="card pt-4">
     <div class="card-section">
       <div class="row column">
-        <%= form.check_box :allow_answers, label: t("models.components.allow_answers", scope: "decidim.forms.admin"), aria: { label: :allow_answers } %>
+        <%= form.check_box :allow_responses, label: t("models.components.allow_responses", scope: "decidim.forms.admin"), aria: { label: :allow_responses } %>
       </div>
       <div class="row column">
-        <%= form.check_box :allow_editing_answers, label: t("models.components.allow_editing_answers", scope: "decidim.forms.admin"), aria: { label: :allow_editing_answers } %>
+        <%= form.check_box :allow_editing_responses, label: t("models.components.allow_editing_responses", scope: "decidim.forms.admin"), aria: { label: :allow_editing_responses } %>
       </div>
       <div class="row column">
         <%= form.check_box :allow_unregistered, label: t("models.components.allow_unregistered", scope: "decidim.forms.admin"), aria: { label: :allow_unregistered }, help_text: t("models.components.allow_unregistered_help", scope: "decidim.forms.admin") %>

data/app/views/decidim/surveys/admin/settings/surveys/edit.html.erb

@@ -0,0 +1,23 @@
+<% add_decidim_page_title(t(".title")) %>
+
+<div class="item_show__header" style="border-bottom: none;">
+  <h1 class="item_show__header-title">
+    <%= t(".title") %>
+  </h1>
+</div>
+
+<%= render "decidim/surveys/admin/surveys/tabs_menu" %>
+
+<div class="grid-cols-1 2xl:mr-80">
+  <div class="item__edit-form pb-24">
+    <%= decidim_form_for(@form, url: settings_survey_path, html: { id: "survey-form", class: "form-defaults form edit_questionnaire" }) do |form| %>
+      <%= render partial: "form", object: form %>
+    <% end %>
+  </div>
+
+  <div class="item__edit-sticky">
+    <div class="item__edit-sticky-container">
+      <%= button_tag t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button button__sm button__secondary", form: "survey-form" %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/surveys/admin/surveys/_tabs_menu.html.erb

@@ -0,0 +1,11 @@
+<% show_button = local_assigns.fetch(:show_button, true) %>
+
+<div class="main-tabs-menu">
+  <div class="main-tabs-menu__tabs">
+    <%= admin_tabs(:admin_surveys_menu).render %>
+  </div>
+
+  <div class="main-tabs-menu__buttons">
+    <%= yield if block_given? %>
+  </div>
+</div>

data/app/views/decidim/surveys/admin/surveys/edit.html.erb

@@ -1,23 +1,23 @@
 <% add_decidim_page_title(t(".title")) %>
 
-<% if templates_defined? && choose_template? %>
-  <%= render partial: "decidim/templates/admin/questionnaire_templates/choose", locals: { target: questionnaire, form_title: t("decidim.forms.admin.questionnaires.edit.title") } %>
-<% else %>
-  <div class="item_show__header">
-    <h1 class="item_show__header-title">
-      <%= t(".title") %>
-    </h1>
+<div class="item_show__header" style="border-bottom: none;">
+  <h1 class="item_show__header-title">
+    <%= t(".title") %>
+  </h1>
+</div>
+
+<%= render "decidim/surveys/admin/surveys/tabs_menu" %>
+
+<div class="grid-cols-1 2xl:mr-80">
+  <div class="item__edit-form pb-24">
+    <%= decidim_form_for(@form, url: survey_path(@survey), html: { id: "survey-form", class: "form-defaults form edit_questionnaire" }) do |form| %>
+      <%= render "decidim/forms/admin/questionnaires/form", form: %>
+    <% end %>
   </div>
-  <div class="item__edit item__edit-1col">
-    <div class="item__edit-form">
-      <%= decidim_form_for(@form, url: survey_path(@survey), html: { class: "form-defaults form edit_questionnaire" }) do |form| %>
-        <%= render partial: "form", object: form %>
-        <div class="item__edit-sticky">
-          <div class="item__edit-sticky-container">
-            <%= form.submit t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button button__sm button__secondary" %>
-          </div>
-        </div>
-      <% end %>
+
+  <div class="item__edit-sticky">
+    <div class="item__edit-sticky-container">
+      <%= button_tag t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button button__sm button__secondary", form: "survey-form" %>
     </div>
   </div>
-<% end %>
+</div>

data/app/views/decidim/surveys/admin/surveys/index.html.erb

@@ -3,45 +3,123 @@
   <div class="item_show__header item_show__header--with-action-options">
     <h1 class="item_show__header-title">
       <%= t(".title") %>
-      <%= link_to t("actions.new_survey", scope: "decidim.surveys"), surveys_path, method: :post, class: "button button__sm button__secondary" %>
+      <%= link_to t("actions.new_survey", scope: "decidim.surveys"), new_survey_path, class: "button button__sm button__secondary" %>
       <%= render partial: "decidim/admin/components/resource_action" %>
     </h1>
   </div>
-  <div class="table-scroll mt-8">
+  <div class="table-stacked mt-8">
     <table class="table-list">
       <thead>
         <tr>
           <th><%= t("models.survey.fields.title", scope: "decidim.surveys") %></th>
           <th><%= t("models.survey.fields.questions", scope: "decidim.surveys") %></th>
-          <th><%= t("models.survey.fields.answers", scope: "decidim.surveys") %></th>
+          <th><%= t("models.survey.fields.responses", scope: "decidim.surveys") %></th>
           <th><%= t("models.survey.fields.status", scope: "decidim.surveys") %></th>
+          <th><%= t("models.survey.fields.published", scope: "decidim.surveys") %></th>
           <th><%= t("actions.title", scope: "decidim.surveys") %></th>
         </tr>
       </thead>
       <tbody>
         <% surveys.each do |survey| %>
           <tr>
-            <td><%= decidim_sanitize_translated(survey.title) %></td>
-            <td><%= survey.questionnaire.questions.size %></td>
-            <td><%= survey.questionnaire.count_participants %></td>
-            <td><%= survey.open? ? t("models.survey.status.open", scope: "decidim.surveys") : t("models.survey.status.closed", scope: "decidim.surveys") %></td>
-            <td class="table-list__actions">
-                <%= icon_link_to "pencil-line", edit_survey_path(survey), t("actions.edit", scope: "decidim.surveys"), class: "action-icon--edit" %>
-                <%= icon_link_to "survey-line", edit_questions_survey_path(survey), t("actions.manage_questions", scope: "decidim.surveys"), class: "action-icon--copy" %>
-                <% if allowed_to? :preview, :questionnaire %>
-                <%= icon_link_to "eye-line", resource_locator(survey).path, t("actions.preview", scope: "decidim.surveys"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
-                <% end %>
-                <% if allowed_to?(:update, :questionnaire) %>
-                  <% if survey.published? %>
-                    <%= icon_link_to "close-circle-line", unpublish_survey_path(survey), t("actions.unpublish", scope: "decidim.admin"), method: :put, class: "action-icon--unpublish" %>
-                  <% elsif survey.clean_after_publish? %>
-                    <%= icon_link_to "check-line", publish_survey_path(survey), t("actions.publish", scope: "decidim.admin"), method: :put, class: "action-icon--publish", data: { confirm: t("actions.answers_alert", scope: "decidim.surveys", answers_count: survey.questionnaire.answers.size) } %>
-                  <% else %>
-                    <%= icon_link_to "check-line", publish_survey_path(survey), t("actions.publish", scope: "decidim.admin"), method: :put, class: "action-icon--publish" %>
+            <td data-label="<%= t("models.survey.fields.title", scope: "decidim.surveys") %>">
+              <%= link_to decidim_sanitize_translated(survey.title), edit_survey_path(survey) %>
+            </td>
+            <td data-label="<%= t("models.survey.fields.questions", scope: "decidim.surveys") %>">
+              <%= survey.questionnaire.questions.size %>
+            </td>
+            <td data-label="<%= t("models.survey.fields.responses", scope: "decidim.surveys") %>">
+              <%= survey.questionnaire.count_participants %>
+            </td>
+            <td data-label="<%= t("models.survey.fields.status", scope: "decidim.surveys") %>">
+              <%= survey.open? ? t("models.survey.status.open", scope: "decidim.surveys") : t("models.survey.status.closed", scope: "decidim.surveys") %>
+            </td>
+            <td data-label="<%= t("models.survey.fields.published", scope: "decidim.surveys") %>">
+              <% if survey.published? %>
+                <span class="label success !text-sm">
+                  <%= t("models.survey.published.published", scope: "decidim.surveys") %>
+                </span>
+              <% else %>
+                <span class="label alert !text-sm">
+                  <%= t("models.survey.published.unpublished", scope: "decidim.surveys") %>
+                </span>
+              <% end %>
+            </td>
+            <td data-label="<%= t("actions.title", scope: "decidim.surveys") %>" class="table-list__actions">
+              <button type="button" data-controller="dropdown" data-target="actions-survey-<%= survey.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: survey.title) %>">
+                <%= icon "more-fill", class: "text-secondary" %>
+              </button>
+
+              <div class="inline-block relative">
+                <ul id="actions-survey-<%= survey.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                  <li class="dropdown__item">
+                    <%= link_to edit_survey_path(survey), class: "dropdown__button" do %>
+                      <%= icon "pencil-line" %>
+                      <%= t("actions.edit", scope: "decidim.surveys") %>
+                    <% end %>
+                  </li>
+
+                  <li class="dropdown__item">
+                    <%= link_to edit_questions_questions_survey_path(survey), class: "dropdown__button" do %>
+                      <%= icon "survey-line" %>
+                      <%= t("actions.manage_questions", scope: "decidim.surveys") %>
+                    <% end %>
+                  </li>
+
+                  <hr>
+
+                  <% if allowed_to?(:update, :questionnaire) %>
+                    <% if survey.published? %>
+                      <li class="dropdown__item">
+                        <%= link_to unpublish_survey_path(survey), method: :put, data: { confirm: t("actions.confirm_unpublish_survey", scope: "decidim.admin") }, class: "dropdown__button" do %>
+                          <%= icon "close-circle-line" %>
+                          <%= t("actions.unpublish", scope: "decidim.admin") %>
+                        <% end %>
+                      </li>
+                    <% elsif survey.clean_after_publish? %>
+                      <li class="dropdown__item">
+                        <%= link_to publish_survey_path(survey), method: :put, data: { confirm: t("actions.responses_alert", scope: "decidim.surveys", responses_count: survey.questionnaire.responses.size) }, class: "dropdown__button" do %>
+                          <%= icon "check-line" %>
+                          <%= t("actions.publish", scope: "decidim.admin") %>
+                        <% end %>
+                      </li>
+                    <% else %>
+                      <li class="dropdown__item">
+                        <%= link_to publish_survey_path(survey), method: :put, class: "dropdown__button" do %>
+                          <%= icon "check-line" %>
+                          <%= t("actions.publish", scope: "decidim.admin") %>
+                        <% end %>
+                      </li>
+                    <% end %>
+
+                    <hr>
+                  <% end %>
+
+                  <% if allowed_to? :preview, :questionnaire %>
+                    <li class="dropdown__item">
+                      <%= link_to resource_locator(survey).path, target: :blank, data: { "external-link": false }, class: "dropdown__button" do %>
+                        <%= icon "eye-line" %>
+                        <%= t("actions.preview", scope: "decidim.surveys") %>
+                      <% end %>
+                    </li>
+
+                    <hr>
                   <% end %>
-                <% end %>
-                <%= resource_permissions_link(survey) %>
-                <%= icon_link_to "delete-bin-line", survey_path(survey), t("actions.destroy", scope: "decidim.surveys"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.surveys") } %>
+
+                  <li class="dropdown__item">
+                    <%= dropdown_resource_permissions_link(survey) %>
+                  </li>
+
+                  <hr>
+
+                  <li class="dropdown__item">
+                    <%= link_to survey_path(survey), method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.surveys") }, class: "dropdown__button" do %>
+                      <%= icon "delete-bin-line" %>
+                      <%= t("actions.destroy", scope: "decidim.surveys") %>
+                    <% end %>
+                  </li>
+                </ul>
+              </div>
             </td>
           </tr>
         <% end %>

data/app/views/decidim/surveys/admin/surveys/new.html.erb

@@ -0,0 +1,23 @@
+<% add_decidim_page_title(t(".title")) %>
+
+<div class="item_show__header" style="border-bottom: none;">
+  <h1 class="item_show__header-title">
+    <%= t(".title") %>
+  </h1>
+</div>
+
+<%= render "decidim/surveys/admin/surveys/tabs_menu" %>
+
+<div class="grid-cols-1 2xl:mr-80">
+  <div class="item__edit-form pb-24">
+    <%= decidim_form_for(@form, html: { id: "survey-form", class: "form-defaults form edit_questionnaire" }) do |form| %>
+      <%= render "decidim/forms/admin/questionnaires/form", form: %>
+    <% end %>
+  </div>
+
+  <div class="item__edit-sticky">
+    <div class="item__edit-sticky-container">
+      <%= button_tag t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button button__sm button__secondary", form: "survey-form" %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/surveys/survey_confirmation_mailer/confirmation.html.erb

@@ -1,3 +1,3 @@
-<p class="confirmation-survey-answers">
+<p class="confirmation-survey-responses">
   <%= t(".body", questionnaire_title: @questionnaire_title, participatory_space: @participatory_space_title) %>
 </p>

data/app/views/decidim/surveys/surveys/{_published_questions_answers.html.erb → _published_questions_responses.html.erb}

@@ -1,11 +1,11 @@
 <% questionnaire.questions.each do |question| %>
   <% next if question.question_type == "separator" %>
-  <% next unless question.survey_answers_published_at %>
+  <% next unless question.survey_responses_published_at %>
 
   <div class="mb-12">
     <div class="mb-4">
       <h2 class="h5 inline"><%= translated_attribute question.body %></h2>
-      <span><%= I18n.t("decidim.surveys.admin.publish_answers.index.answers", count: question.answers.count) %></span>
+      <span><%= I18n.t("decidim.surveys.admin.publish_responses.index.responses", count: question.responses.count) %></span>
     </div>
 
     <%= chart_for_question(question.id) %>

data/app/views/decidim/surveys/surveys/not_allowed.html.erb

@@ -16,7 +16,7 @@
 
   <%= render partial: "decidim/shared/component_announcement" if current_component.manifest_name == "surveys" %>
   <section>
-    <% body = t("decidim.forms.questionnaires.show.questionnaire_answered.body") %>
-    <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_answered.title"), body: body }) %>
+    <% body = t("decidim.forms.questionnaires.show.questionnaire_responded.body") %>
+    <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_responded.title"), body: body }) %>
   </section>
 <% end %>

data/app/views/layouts/decidim/admin/surveys.html.erb

@@ -0,0 +1,18 @@
+<% add_secondary_root_menu(:admin_participatory_process_menu) %>
+
+<% content_for :breadcrumb_context_menu do %>
+  <div class="process-title-content-breadcrumb-container-right">
+    <% if allowed_to? :preview, :questionnaire %>
+      <%= link_to public_url, class: "button button__sm button__transparent process-title-content-breadcrumb-container-right-link", target: :_blank, data: { "external-link": false } do %>
+        <%= icon "eye-line" %>
+        <span>
+          <%= t("actions.see_survey", scope: "decidim.admin") %>
+        </span>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <%= yield %>
+<% end %>

data/config/assets.rb

@@ -2,4 +2,4 @@
 
 base_path = File.expand_path("..", __dir__)
 
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")

data/config/locales/ar.yml

@@ -13,18 +13,9 @@ ar:
         few: الدراسات الاستقصائية
         many: الدراسات الاستقصائية
         other: الدراسات الاستقصائية
-      decidim/surveys/survey_answer:
-        zero: الأجوبة
-        one: إجابة
-        two: الأجوبة
-        few: الأجوبة
-        many: الأجوبة
-        other: الأجوبة
   decidim:
     components:
       surveys:
-        actions:
-          answer: إجابة
         settings:
           global:
             announcement: إعلان
@@ -42,24 +33,13 @@ ar:
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{participatory_space_title}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
           email_subject: استطلاع جديد في %{participatory_space_title}
           notification_title: المسح <a href="%{resource_path}">%{resource_title}</a> في <a href="%{participatory_space_url}">%{participatory_space_title}</a> مفتوح الآن.
-    metrics:
-      survey_answers:
-        description: عدد الاستطلاعات التي أجاب عليها المشاركون
-        object: إجابات على الدراسات الاستقصائية
-        title: إجابات للمسوحات
     surveys:
       actions:
         edit: تعديل
         preview: معاينة
         title: الإجراءات
       admin:
-        exports:
-          survey_user_answers: إجابات المشاركين في الاستطلاع
         surveys:
           update:
             invalid: كانت هناك مشكلة في إنقاذ المسح.
             success: تم حفظ الاستطلاع بنجاح.
-      surveys:
-        answer:
-          invalid: كانت هناك مشكلة في الإجابة على الاستبيان.
-          success: مسح أجاب بنجاح.

data/config/locales/bg.yml

@@ -9,14 +9,9 @@ bg:
       decidim/surveys/survey:
         one: Анкета
         other: Анкети
-      decidim/surveys/survey_answer:
-        one: Отговор
-        other: Отговори
   decidim:
     components:
       surveys:
-        actions:
-          answer: Отговор
         settings:
           global:
             announcement: Съобщение
@@ -34,34 +29,11 @@ bg:
           email_outro: Получавате това известие, защото следвате %{participatory_space_title}. Може да прекратите известията чрез предходния линк.
           email_subject: Нова анкета в(ъв) %{participatory_space_title}
           notification_title: Анкетата <a href="%{resource_path}">%{resource_title}</a> в(ъв) <a href="%{participatory_space_url}">%{participatory_space_title}</a> вече е отворена.
-    metrics:
-      survey_answers:
-        description: Брой на анкетите с отговори от участници
-        object: отговори на анкети
-        title: Отговори на анкети
-    statistics:
-      answers_count: Отговори
     surveys:
       admin:
-        exports:
-          survey_user_answers: Отговори на участник в анкети
         surveys:
           update:
             invalid: Възникна проблем при запазването на анкетата.
             success: Анкетата беше запазена успешно.
       last_activity:
         new_survey: 'Нова анкета:'
-      models:
-        survey:
-          fields:
-            answers: Отговори
-      survey_confirmation_mailer:
-        confirmation:
-          body: Вие успешно отговорихте на анкетата %{questionnaire_title} в %{participatory_space}
-          subject: Въпросникът %{questionnaire_title} се нуждае от потвърждение
-        export_name: Анкетни отговори
-      surveys:
-        answer:
-          invalid: Възникна проблем при попълването на отговорите на анкетата.
-          spam_detected: Възникна проблем при попълването на отговорите във формуляра. Навярно сте били твърде бързи, бихте ли опитали отново?
-          success: Отговорите на анкетата са попълнени успешно.

data/config/locales/ca-IT.yml

@@ -9,18 +9,27 @@ ca-IT:
       decidim/surveys/survey:
         one: Enquesta
         other: Enquestes
-      decidim/surveys/survey_answer:
+      decidim/surveys/survey_response:
         one: Resposta
         other: Respostes
   decidim:
     admin:
+      actions:
+        confirm_unpublish_survey: Segur que vols despublicar aquesta enquesta?
+        see_survey: Veure enquesta
       admin_log:
         changeset:
           surveys: enquestes
+      menu:
+        surveys_menu:
+          main: Principal
+          questions: Preguntes
+          responses: Respostes
+          settings: Configuració
     components:
       surveys:
         actions:
-          answer: Respondre
+          respond: Respondre
         name: Enquestes
         settings:
           announcement: Avís
@@ -40,44 +49,50 @@ ca-IT:
           email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
           email_subject: Una nova enquesta a %{participatory_space_title}
           notification_title: L'enquesta <a href="%{resource_path}">%{resource_title}</a> en <a href="%{participatory_space_url}">%{participatory_space_title}</a> ja està oberta.
-    metrics:
-      survey_answers:
-        description: Nombre d'enquestes contestades per les participants
-        object: respostes a enquestes
-        title: Respostes a enquestes
     statistics:
-      answers_count: Respostes
+      responses: 'Respostes:'
+      responses_count: Respostes
+      surveys_count_tooltip: El nombre d'enquestes fetes i de respostes recollides.
     surveys:
       actions:
-        answers_alert: L'opció d'esborrar les respostes en publicar l'enquesta està activada. Si segueixes, s'esborraran les %{answers_count} existents actualment.
         confirm_destroy: Segur que ho vols eliminar?
         destroy: Eliminar
         edit: Editar
-        manage_questions: Gestionar les preguntes
+        manage_questions: Preguntes
         new_survey: Nova enquesta
         preview: Previsualitzar
+        responses_alert: L'opció d'esborrar les respostes en publicar l'enquesta està activada. Si segueixes, s'esborraran les %{responses_count} existents actualment.
         title: Accions
       admin:
-        answers:
-          index:
-            title: "%{total} respostes en total"
-          show:
-            title: 'Resposta #%{number}'
         exports:
-          survey_user_answers: Respostes de les participants de l'enquesta
-        publish_answers:
+          survey_user_responses: Respostes de les participants de l'enquesta
+        publish_responses:
           index:
-            answers:
-              one: "%{count} resposta"
-              other: "%{count} respostes"
             description: |-
-              Publicant les respostes a les preguntes de l'enquesta, aquestes seran visibles per a les visitants.
-              Pots seleccionar les preguntes de les que vols publicar les respostes marcant el "checkbox" de cadascuna d'elles.
+              Publicant les respostes a les repostes de l'enquesta, aquestes seran visibles per a les visitants.
+              Pots seleccionar les repostes que vols publicar marcant el "checkbox" de cadascuna d'elles.
               Només pots publicar les respostes de les preguntes que són del tipus de resposta: "Opció única", "Opció múltiple", "Matriu (opció única)", "Matriu (opció múltiple), i "Ordenació".
+            responses:
+              one: "%{count} resposta"
+              other: "%{count} respostes"
             status:
               not_published: No publicades
               published: Publicades
-            title: Publicar respostes
+            title: Publicar les respostes
+        questions:
+          surveys:
+            edit:
+              title: Preguntes
+        responses:
+          index:
+            no_responses: Encara no hi ha cap resposta
+            title: "%{total} respostes en total"
+          show:
+            title: 'Resposta #%{number}'
+        settings:
+          surveys:
+            edit:
+              title: Configuració
         surveys:
           create:
             invalid: S'ha produït un error creant l'enquesta.
@@ -88,6 +103,8 @@ ca-IT:
             title: Editar l'enquesta
           index:
             title: Enquestes
+          new:
+            title: Nova enquesta
           publish:
             invalid: S'ha produït un error en publicar aquesta enquesta.
             success: Enquesta publicada correctament.
@@ -113,10 +130,14 @@ ca-IT:
       models:
         survey:
           fields:
-            answers: Respostes
+            published: Publicada
             questions: Preguntes
+            responses: Respostes
             status: Estat
             title: Títol
+          published:
+            published: Publicada
+            unpublished: Despublicada
           status:
             closed: Tancada
             open: Oberta
@@ -124,12 +145,8 @@ ca-IT:
         confirmation:
           body: Has respost amb èxit a l'enquesta %{questionnaire_title} dins de %{participatory_space}
           subject: Confirmació de resposta al qüestionari %{questionnaire_title}
-        export_name: Respostes a l'enquesta
+        export_name: Respuestas a l'encuesta
       surveys:
-        answer:
-          invalid: S'ha produït un error en respondre l'enquesta.
-          spam_detected: Hi ha hagut un problema responent el formulari. Potser has anat massa ràpid, ho pots tornar a intentar?
-          success: Enquesta resposta correctament.
         count:
           surveys_count:
             one: "%{count} enquesta"
@@ -140,6 +157,10 @@ ca-IT:
             closed: Tancada
             open: Obertes
         no_surveys_warning: No hi ha enquestes que coincideixin amb el teu criteri de cerca o no hi ha cap enquesta.
+        response:
+          invalid: S'ha produït un error en respondre l'enquesta.
+          spam_detected: Hi ha hagut un problema responent el formulari. Potser has anat massa ràpid, ho pots tornar a intentar?
+          success: L'enquesta s'ha respost correctament.
         show:
           closed: Tancada
           open: Oberta