decidim-surveys 0.27.8 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 681036a925a6e0dccf6ae195a948341db0d1386d5039b744be3d485675a9c6a7
-  data.tar.gz: b98e8f1c6f2d845892853d17f45dfca30793123f48667e27c3a82500d6d47ba6
+  metadata.gz: 7874e24e08c90cf8af0ec1aca5a00f267f096ad120499535d96b69e7802b46db
+  data.tar.gz: c1eca241078860c82e7ed73c79c1af7daeb89026faf448a80a51e5b1f312ca8f
 SHA512:
-  metadata.gz: a9cf96c1c29855f381c9c894db10a4a1fc5f0dd5d116baf332148b7ad7d3c09612f269fa8ccd7032e4ba3f7ab45156b6451759adbc4a19539bd1fa65dab68372
-  data.tar.gz: 0a4f302edb68c76b9d42546d9a47f8afac57128fd20856de918a2ce710752a337f96031742c5911c879fe26f079b8d0947d14051aaa7be530d87917aee16f379
+  metadata.gz: f032b64acb18f6c34a25ca8a26b639ee7cd180da8a0bc7cc82ca4d8d6ae6d1400cf7a1b37033768e641509dd74e502818dbc2928bbee823cbab224d7f99f1268
+  data.tar.gz: 50f2739293a75989c5a33d404b466a5bb356916c91146deca381d5adf91fde45d12f01bcef73975042f517393f31bf4491fa6310ca6cddcaae562110357457d2

data/README.md

@@ -14,7 +14,7 @@ Surveys will be available as a Component for a Participatory Process.
 
 ## Installation
 
-This is on the default Decidim installation so you shouldn't change anything to use this component.
+This is on the default Decidim installation so you should not change anything to use this component.
 
 ## Screenshots
 

data/app/cells/decidim/surveys/survey_activity_cell.rb

@@ -7,10 +7,7 @@ module Decidim
       include Decidim::ComponentPathHelper
 
       def title
-        I18n.t(
-          "decidim.surveys.last_activity.new_survey_at_html",
-          link: participatory_space_link
-        )
+        I18n.t("decidim.surveys.last_activity.new_survey")
       end
 
       def activity_link_path

data/app/controllers/decidim/surveys/admin/surveys_controller.rb

@@ -8,6 +8,12 @@ module Decidim
         include Decidim::Forms::Admin::Concerns::HasQuestionnaire
         include Decidim::Forms::Admin::Concerns::HasQuestionnaireAnswers
 
+        def edit
+          enforce_permission_to(:update, :questionnaire, questionnaire:)
+
+          @form = form(Decidim::Forms::Admin::QuestionnaireForm).from_model(questionnaire)
+        end
+
         def questionnaire_for
           survey
         end
@@ -19,7 +25,7 @@ module Decidim
 
         # Specify where to redirect after exporting a user response
         def questionnaire_participant_answers_url(session_token)
-          Decidim::EngineRouter.admin_proxy(survey.component).show_survey_path(session_token: session_token)
+          Decidim::EngineRouter.admin_proxy(survey.component).show_survey_path(session_token:)
         end
 
         def edit_questionnaire_title

data/app/controllers/decidim/surveys/surveys_controller.rb

@@ -6,7 +6,9 @@ module Decidim
     class SurveysController < Decidim::Surveys::ApplicationController
       include Decidim::Forms::Concerns::HasQuestionnaire
       include Decidim::ComponentPathHelper
-      helper Decidim::Surveys::SurveyHelper
+      include Decidim::Surveys::SurveyHelper
+
+      helper_method :authorizations
 
       delegate :allow_unregistered?, to: :current_settings
 

data/app/helpers/decidim/surveys/survey_helper.rb

@@ -4,9 +4,7 @@ module Decidim
   module Surveys
     module SurveyHelper
       def no_permission
-        render(
-          partial: "decidim/authorization_modals/content"
-        )
+        cell "decidim/authorization_modal", authorizations
       end
 
       def resource

data/app/jobs/decidim/surveys/clean_survey_answers_job.rb

@@ -7,7 +7,7 @@ module Decidim
         @component = data[:resource]
         return unless component&.manifest_name == "surveys"
 
-        @survey = Survey.find_by(component: component)
+        @survey = Survey.find_by(component:)
         return unless survey&.questionnaire
 
         case data[:event_class]

data/app/jobs/decidim/surveys/settings_change_job.rb

@@ -19,8 +19,8 @@ module Decidim
         return unless event && event_class
 
         Decidim::EventsManager.publish(
-          event: event,
-          event_class: event_class,
+          event:,
+          event_class:,
           resource: component,
           followers: component.participatory_space.followers
         )

data/app/mailers/decidim/surveys/survey_confirmation_mailer.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    class SurveyConfirmationMailer < ApplicationMailer
+      include TranslatableAttributes
+      helper Decidim::SanitizeHelper
+
+      def confirmation(user, questionnaire, answers)
+        return if answers.blank? || user.nil?
+
+        with_user(user) do
+          @user = user
+          @questionnaire_title = translated_attribute(questionnaire.title)
+          @participatory_space_title = translated_attribute(questionnaire.questionnaire_for.component.participatory_space.title)
+          @organization = user.organization
+
+          add_file_with_answers(answers)
+
+          mail(to: "#{@user.name} <#{@user.email}>", subject: t(".subject", questionnaire_title: @questionnaire_title))
+        end
+      end
+
+      private
+
+      def add_file_with_answers(answers)
+        export_name = t("decidim.surveys.survey_confirmation_mailer.export_name")
+        serializer = Decidim::Forms::UserAnswersSerializer
+
+        export_data = Decidim::Exporters::FormPDF.new(answers, serializer).export
+
+        filename = export_data.filename(export_name)
+        filename_without_extension = export_data.filename(export_name, extension: false)
+
+        attachments["#{filename_without_extension}.zip"] = FileZipper.new(filename, export_data.read).zip
+      end
+    end
+  end
+end

data/app/serializers/decidim/surveys/data_serializer.rb

@@ -10,7 +10,7 @@ module Decidim
       #     or nil if none exists.
       def serialize
         component = resource
-        surveys = Decidim::Surveys::Survey.where(component: component)
+        surveys = Decidim::Surveys::Survey.where(component:)
         surveys.collect do |survey|
           next if survey.questionnaire.nil?
 

data/app/views/decidim/surveys/admin/component/_actions.html.erb

@@ -1,43 +1,44 @@
 <% if component.manifest.admin_engine %>
-  <%= icon_link_to "pencil", manage_component_path(component), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
+  <%= icon_link_to "pencil-line", manage_component_path(component), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
 <% else %>
   <span class="action-space icon"></span>
 <% end %>
 
-<% if allowed_to?(:update, :component, component: component) %>
-  <% if component.published? %>
-    <%= icon_link_to "x", url_for(action: :unpublish, id: component, controller: "components"), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :put %>
-  <% else %>
-    <%= icon_link_to "check", url_for(action: :publish, id: component, controller: "components"), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :put, data: { confirm: t(".answers_alert") } %>
-  <% end %>
+<% if allowed_to? :share, :component, component: component %>
+  <%= icon_link_to "share-line", url_for(action: :share, id: component, controller: "components"), t("actions.share", scope: "decidim.admin"), target: :blank, class: "action-icon--share" %>
 <% else %>
   <span class="action-space icon"></span>
 <% end %>
-
 <% if allowed_to? :update, :component, component: component %>
-  <%= icon_link_to "cog", url_for(action: :edit, id: component, controller: "components"), t("actions.configure", scope: "decidim.admin"), class: "action-icon--configure" %>
+  <%= icon_link_to "settings-4-line", url_for(action: :edit, id: component, controller: "components"), t("actions.configure", scope: "decidim.admin"), class: "action-icon--configure" %>
 <% else %>
   <span class="action-space icon"></span>
 <% end %>
 
-<% if allowed_to? :update, :component, component: component %>
-  <% if component.manifest.actions.empty? %>
-    <%= icon "key", class: "action-icon action-icon--disabled" %>
+<% if allowed_to?(:update, :component, component: component) %>
+  <% if component.published? %>
+    <%= icon_link_to "close-circle-line", url_for(action: :unpublish, id: component, controller: "components"), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :put %>
   <% else %>
-    <%= icon_link_to "key", url_for(action: :edit, component_id: component, controller: "component_permissions"), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+    <%= icon_link_to "check-line", url_for(action: :publish, id: component, controller: "components"), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :put, data: { confirm: t(".answers_alert") } %>
   <% end %>
 <% else %>
   <span class="action-space icon"></span>
 <% end %>
 
-<% if allowed_to? :share, :component, component: component %>
-  <%= icon_link_to "share", url_for(action: :share, id: component, controller: "components"), t("actions.share", scope: "decidim.admin"), class: "action-icon--share", target: "_blank" %>
+<%= icon_link_to "eye-line", main_component_path(component), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+
+<% if allowed_to? :update, :component, component: component %>
+  <% if component.manifest.actions.empty? %>
+    <%= icon "key-2-line", class: "action-icon action-icon--disabled" %>
+  <% else %>
+    <%= icon_link_to "key-2-line", url_for(action: :edit, component_id: component, controller: "component_permissions"), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+  <% end %>
 <% else %>
   <span class="action-space icon"></span>
 <% end %>
 
 <% if allowed_to? :destroy, :component, component: component %>
-  <%= icon_link_to "circle-x", url_for(action: :destroy, id: component, controller: "components"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>
+  <%= icon_link_to "delete-bin-line", url_for(action: :destroy, id: component, controller: "components"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>
 <% else %>
   <span class="action-space icon"></span>
 <% end %>

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

@@ -0,0 +1,40 @@
+<% add_decidim_page_title(t("decidim.forms.admin.questionnaires.edit.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">
+    <h2 class="item_show__header-title">
+      <%= edit_questionnaire_title %>
+
+      <% if allowed_to? :preview, :questionnaire %>
+        <%= link_to t("preview", scope: "decidim.forms.admin.questionnaires.form"), public_url, class: "button button__sm button__secondary", target: :_blank, data: { "external-link": false } %>
+      <% end %>
+      <% if questionnaire.answers.any? %>
+        <%= export_dropdown(current_component, questionnaire.id) if allowed_to? :export_answers, :questionnaire %>
+        <% if allowed_to? :show, :questionnaire_answers %>
+          <%= link_to t("actions.show", scope: "decidim.forms.admin.questionnaires"), questionnaire_participants_url, class: "button button__sm button__secondary new whitespace-nowrap" %>
+        <% end %>
+      <% else %>
+        <button class="button button__sm button__secondary whitespace-nowrap" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></button>
+      <% end %>
+      <%= render partial: "decidim/admin/components/resource_action" %>
+
+    </h2>
+  </div>
+
+  <div class="item__edit item__edit-1col">
+    <div class="item__edit-form">
+      <%= decidim_form_for(@form, url: update_url, method: :put, html: { class: "form-defaults form edit_questionnaire" }) do |form| %>
+        <%= render partial: "decidim/forms/admin/questionnaires/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>
+  </div>
+
+<% end %>

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

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

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

@@ -2,7 +2,7 @@
   <div class="columns large-6 medium-centered">
     <div class="card">
       <div class="card__content">
-        <%= render partial: "decidim/authorization_modals/content" %>
+        <%= cell "decidim/authorization_modal", authorizations %>
       </div>
     </div>
   </div>

data/config/assets.rb

@@ -3,4 +3,3 @@
 base_path = File.expand_path("..", __dir__)
 
 Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/surveys/surveys")

data/config/locales/ar.yml

@@ -58,8 +58,6 @@ ar:
           update:
             invalid: كانت هناك مشكلة في إنقاذ المسح.
             success: تم حفظ الاستطلاع بنجاح.
-      last_activity:
-        new_survey_at_html: "<span>استطلاع جديد في %{link}</span>"
       surveys:
         answer:
           invalid: كانت هناك مشكلة في الإجابة على الاستبيان.

data/config/locales/bg.yml

@@ -2,71 +2,10 @@
 bg:
   activemodel:
     models:
-      decidim/surveys/closed_survey_event: Анкетата приключи
+      decidim/surveys/closed_survey_event: Анкетата завърши
       decidim/surveys/opened_survey_event: Анкетата започна
   activerecord:
     models:
       decidim/surveys/survey:
         one: Анкета
         other: Анкети
-      decidim/surveys/survey_answer:
-        one: Отговор
-        other: Отговори
-  decidim:
-    components:
-      surveys:
-        actions:
-          answer: Отговор
-        name: Анкета
-        settings:
-          global:
-            announcement: Съобщение
-            clean_after_publish: Изтриване на отговорите при публикуване на проучването
-            ends_at: Отговорите се приемат до
-            ends_at_help: Оставете празно при липса на конкретна дата
-            scope_id: Обхват
-            scopes_enabled: Обхватите са активирани
-            starts_at: Отговорите се приемат от
-            starts_at_help: Оставете празно при липса на конкретна дата
-          step:
-            allow_answers: Разрешаване на отговори
-            allow_unregistered: Разрешаване на нерегистрирани потребители да отговарят на въпросите в проучването
-            allow_unregistered_help: Ако е активно, няма да се изисква влизане, за да се отговори на анкетата. Това може да доведе до лоши или ненадеждни данни и ще e по-уязвимo на автоматизирани атаки. Използвайте с повишено внимание! Имайте предвид, че участник може да отговори на едно и също проучване няколко пъти, като използва различни браузъри или функцията за „частно сърфиране“ на своя уеб браузър.
-            announcement: Съобщение
-    events:
-      surveys:
-        survey_closed:
-          email_intro: Анкетата %{resource_title} в(ъв) %{participatory_space_title} беше затворена.
-          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> приключи.
-        survey_opened:
-          email_intro: 'Анкетата %{resource_title} в(ъв) %{participatory_space_title} вече е отворена. Можете да участвате в нея от тази страница:'
-          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:
-        component:
-          actions:
-            answers_alert: Ако публикувате компонента, всички резултати ще бъдат премахнати.
-        exports:
-          survey_user_answers: Отговори на участник в анкети
-        surveys:
-          update:
-            invalid: Възникна проблем при запазването на анкетата.
-            success: Анкетата беше запазена успешно.
-      last_activity:
-        new_survey_at_html: "<span>Ново допитване на %{link}</span>"
-      surveys:
-        answer:
-          invalid: Възникна проблем при попълването на отговорите на анкетата.
-          spam_detected: Възникна проблем при попълването на отговорите във формуляра. Навярно сте били твърде бързи, бихте ли опитали отново?
-          success: Отговорите на анкетата са попълнени успешно.

data/config/locales/ca.yml

@@ -37,12 +37,12 @@ ca:
       surveys:
         survey_closed:
           email_intro: L'enquesta %{resource_title} a %{participatory_space_title} ha estat tancada.
-          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_outro: Has rebut aquesta notificació perquè estàs seguint %{participatory_space_title}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
           email_subject: S'ha acabat una enquesta a %{participatory_space_title}
           notification_title: L'enquesta <a href="%{resource_path}">%{resource_title}</a> a <a href="%{participatory_space_url}">%{participatory_space_title}</a> ha acabat.
         survey_opened:
           email_intro: 'L''enquesta %{resource_title} a %{participatory_space_title} ja està oberta. Pots participar-hi des d''aquesta pàgina:'
-          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_outro: Has rebut aquesta notificació perquè estàs seguint %{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:
@@ -64,9 +64,14 @@ ca:
             invalid: S'ha produït un error en desar l'enquesta.
             success: Enquesta desada correctament.
       last_activity:
-        new_survey_at_html: "<span>Nova enquesta a %{link}</span>"
+        new_survey: 'Nova enquesta:'
+      survey_confirmation_mailer:
+        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
       surveys:
         answer:
           invalid: S'ha produït un error en respondre l'enquesta.
-          spam_detected: Hi ha hagut un problema contestant el formulari. Potser has estat massa ràpid, ho pots tornar a intentar?
+          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.

data/config/locales/cs.yml

@@ -68,9 +68,14 @@ cs:
             invalid: Při ukládání průzkumu došlo k chybám.
             success: Průzkum byl úspěšně uložen.
       last_activity:
-        new_survey_at_html: "<span>Nový průzkum na %{link}</span>"
+        new_survey: 'Nový průzkum:'
+      survey_confirmation_mailer:
+        confirmation:
+          body: Úspěšně jste odpověděli na anketu %{questionnaire_title} v rámci %{participatory_space}
+          subject: Potvrzení odpovědi na dotazník %{questionnaire_title}
+        export_name: Odpovědi na dotazník
       surveys:
         answer:
           invalid: Při odpovědi na průzkum došlo k chybám.
-          spam_detected: Při vyplňování formuláře došlo k potížím. Možná jste byli příliš rychlí, můžete to zkusit znovu?
+          spam_detected: Vyskytl se problém s odpovědí na formulář. Možná jste byl příliš rychlý, můžete to zkusit znovu?
           success: Průzkum úspěšně odpověděl.

data/config/locales/de.yml

@@ -64,9 +64,14 @@ de:
             invalid: Beim Speichern der Umfrage sind Fehler aufgetreten.
             success: Umfrage wurde erfolgreich gespeichert.
       last_activity:
-        new_survey_at_html: "<span>Neue Umfrage auf %{link}</span>"
+        new_survey: 'Neue Umfrage:'
+      survey_confirmation_mailer:
+        confirmation:
+          body: Sie haben die Umfrage %{questionnaire_title} auf %{participatory_space} erfolgreich beantwortet
+          subject: 'Umfrage "%{questionnaire_title}": Bestätigung Ihrer Antwort'
+        export_name: Umfrageantworten
       surveys:
         answer:
           invalid: Bei der Beantwortung der Umfrage sind Fehler aufgetreten.
-          spam_detected: Bei der Beantwortung des Fragebogens sind Fehler aufgetreten. Möglicherweise waren Sie zu schnell. Versuchen Sie es vielleicht erneut.
+          spam_detected: Bei der Beantwortung der Umfrage ist ein Fehler aufgetreten. Möglicherweise waren Sie zu schnell, können Sie es erneut versuchen?
           success: Umfrage erfolgreich beantwortet.

data/config/locales/el.yml

@@ -61,9 +61,9 @@ el:
             invalid: Υπήρξε ένα πρόβλημα κατά την αποθήκευση της έρευνας.
             success: Η έρευνα αποθηκεύτηκε με επιτυχία.
       last_activity:
-        new_survey_at_html: "<span>Νέα έρευνα σε %{link}</span>"
+        new_survey: 'Νέα έρευνα:'
       surveys:
         answer:
           invalid: Υπήρξε ένα πρόβλημα κατά την απάντηση στην έρευνα.
-          spam_detected: Υπήρξε ένα πρόβλημα κατά την απάντηση της φόρμας. Ίσως απαντήσατε πολύ γρήγορα, μπορείτε να δοκιμάσετε ξανά;
+          spam_detected: Υπήρχε ένα πρόβλημα στην απάντηση της φόρμας. Ίσως είστε πολύ γρήγοροι, μπορείτε να δοκιμάσετε ξανά;
           success: Η έρευνα απαντήθηκε με επιτυχία.

data/config/locales/en.yml

@@ -64,9 +64,14 @@ en:
             invalid: There was a problem saving the survey.
             success: Survey successfully saved.
       last_activity:
-        new_survey_at_html: "<span>New survey at %{link}</span>"
+        new_survey: 'New survey:'
+      survey_confirmation_mailer:
+        confirmation:
+          body: You have successfully answered the %{questionnaire_title} survey within %{participatory_space}
+          subject: Questionnaire %{questionnaire_title} answering confirmation
+        export_name: Survey answers
       surveys:
         answer:
           invalid: There was a problem answering the survey.
-          spam_detected: There was a problem answering the form. Maybe you've been too quick, can you try again?
+          spam_detected: There was a problem answering the form. Maybe you have been too quick, can you try again?
           success: Survey successfully answered.

data/config/locales/es-MX.yml

@@ -64,9 +64,14 @@ es-MX:
             invalid: Se han producido errores al guardar la encuesta.
             success: Encuesta guardada correctamente.
       last_activity:
-        new_survey_at_html: "<span>Nueva encuesta en %{link}</span>"
+        new_survey: 'Nueva encuesta:'
+      survey_confirmation_mailer:
+        confirmation:
+          body: Has respondido con éxito a la encuesta %{questionnaire_title} dentro de %{participatory_space}
+          subject: Confirmación de respuesta al cuestionario %{questionnaire_title}
+        export_name: Respuestas a la encuesta
       surveys:
         answer:
           invalid: Se han producido errores al responder a la encuesta.
-          spam_detected: Hubo un problema al responder al formulario. Tal vez hayas ido demasiado rápido, ¿puedes intentarlo de nuevo?
+          spam_detected: Hubo un problema respondiendo al formulario. Tal vez has sido demasiado rápido, ¿puedes intentarlo de nuevo?
           success: La encuesta ha sido respondida con éxito.

data/config/locales/es-PY.yml

@@ -64,9 +64,14 @@ es-PY:
             invalid: Se han producido errores al guardar la encuesta.
             success: Encuesta guardada correctamente.
       last_activity:
-        new_survey_at_html: "<span>Nueva encuesta en %{link}</span>"
+        new_survey: 'Nueva encuesta:'
+      survey_confirmation_mailer:
+        confirmation:
+          body: Has respondido con éxito a la encuesta %{questionnaire_title} dentro de %{participatory_space}
+          subject: Confirmación de respuesta al cuestionario %{questionnaire_title}
+        export_name: Respuestas a la encuesta
       surveys:
         answer:
           invalid: Se han producido errores al responder a la encuesta.
-          spam_detected: Hubo un problema al responder al formulario. Tal vez hayas ido demasiado rápido, ¿puedes intentarlo de nuevo?
+          spam_detected: Hubo un problema respondiendo al formulario. Tal vez has sido demasiado rápido, ¿puedes intentarlo de nuevo?
           success: La encuesta ha sido respondida con éxito.

data/config/locales/es.yml

@@ -37,12 +37,12 @@ es:
       surveys:
         survey_closed:
           email_intro: La encuesta %{resource_title} en %{participatory_space_title} se ha cerrado.
-          email_outro: Has recibido esta notificación porqué estás siguiendo el espacio "%{participatory_space_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_outro: Has recibido esta notificación porqué estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
           email_subject: Ha terminado una encuesta en %{participatory_space_title}
           notification_title: La encuesta <a href="%{resource_path}">%{resource_title}</a> en <a href="%{participatory_space_url}">%{participatory_space_title}</a> ha terminado.
         survey_opened:
           email_intro: 'Ya está abierta la encuesta %{resource_title} en %{participatory_space_title}. Puedes participar desde esta página:'
-          email_outro: Has recibido esta notificación porque estás siguiendo el espacio "%{participatory_space_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_outro: Has recibido esta notificación porque estás siguiendo %{participatory_space_title}. Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
           email_subject: Nueva encuesta en %{participatory_space_title}
           notification_title: Ya está abierta la encuesta <a href="%{resource_path}">%{resource_title}</a> en <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
     metrics:
@@ -64,9 +64,14 @@ es:
             invalid: Se ha producido un error al guardar la encuesta.
             success: Encuesta guardada correctamente.
       last_activity:
-        new_survey_at_html: "<span>Nueva encuesta en %{link}</span>"
+        new_survey: 'Nueva encuesta:'
+      survey_confirmation_mailer:
+        confirmation:
+          body: Has respondido con éxito a la encuesta %{questionnaire_title} dentro de %{participatory_space}
+          subject: Confirmación de respuesta al cuestionario %{questionnaire_title}
+        export_name: Respuestas a la encuesta
       surveys:
         answer:
           invalid: Se ha producido un error al responder la encuesta.
-          spam_detected: Hubo un problema al responder al formulario. Tal vez hayas ido demasiado rápido, ¿puedes intentarlo de nuevo?
+          spam_detected: Hubo un problema respondiendo al formulario. Tal vez has sido demasiado rápido, ¿puedes intentarlo de nuevo?
           success: La encuesta se ha respondido correctamente.

data/config/locales/eu.yml

@@ -37,7 +37,7 @@ eu:
       surveys:
         survey_closed:
           email_intro: '%{resource_title} inkesta %{participatory_space_title} itxi egin da.'
-          email_outro: Jakinarazpen hau jaso duzu %{participatory_space_title} jarraitzen ari zarelako. Aurreko estekan jakinarazpenak jasotzeari utzi ahal diozu.
+          email_outro: Jakinarazpen hau jaso duzu %{participatory_space_title} jarraitzen ari zarelako. Aurreko estekan sartuz jakinarazpenak jasotzeari utzi ahal diozu.
           email_subject: Inkesta bat itxi da %{participatory_space_title} espazioan
           notification_title: <a href="%{resource_path}">%{resource_title}</a> inkesta <a href="%{participatory_space_url}">%{participatory_space_title}</a> espazioan amaitu da.
         survey_opened:
@@ -64,7 +64,12 @@ eu:
             invalid: Arazo bat egon da inkesta gordetzean.
             success: Inkesta ondo gorde da.
       last_activity:
-        new_survey_at_html: "<span>Inkesta berria hemen: %{link}</span>"
+        new_survey: 'Beste inkesta bat:'
+      survey_confirmation_mailer:
+        confirmation:
+          body: Zuzen erantzun duzu %{participatory_space} espazioko %{questionnaire_title} inkesta
+          subject: '%{questionnaire_title} galdetegiaren erantzun-baieztapena'
+        export_name: Inkestaren erantzunak
       surveys:
         answer:
           invalid: Arazo bat egon da inkesta erantzutean.

data/config/locales/fi-plain.yml

@@ -64,9 +64,14 @@ fi-pl:
             invalid: Kyselyn tallennus epäonnistui.
             success: Kysely tallennettu onnistuneesti.
       last_activity:
-        new_survey_at_html: "<span>Uusi kysely osoitteessa %{link}</span>"
+        new_survey: 'Uusi kysely:'
+      survey_confirmation_mailer:
+        confirmation:
+          body: Vastauksesi kyselyyn "%{questionnaire_title}" onnistui osallistumistilassa "%{participatory_space}"
+          subject: Kyselyn "%{questionnaire_title}" vastaamisen vahvistus
+        export_name: Kyselyn vastaukset
       surveys:
         answer:
           invalid: Kyselyyn vastaaminen epäonnistui.
-          spam_detected: Kyselyn vastaamisessa tapahtui virhe. Ehkä olit liian nopea, voisitko yrittää uudestaan?
+          spam_detected: Lomakkeeseen vastaaminen epäonnistui. Saatoit toimia liian nopeasti. Yrittäisitkö uudestaan?
           success: Kyselyyn vastattu onnistuneesti.

data/config/locales/fi.yml

@@ -64,9 +64,14 @@ fi:
             invalid: Kyselyn tallennus epäonnistui.
             success: Kyselyn tallennus onnistui.
       last_activity:
-        new_survey_at_html: "<span>Uusi kysely osoitteessa %{link}</span>"
+        new_survey: 'Uusi kysely:'
+      survey_confirmation_mailer:
+        confirmation:
+          body: Vastauksesi kyselyyn "%{questionnaire_title}" onnistui osallistumistilassa "%{participatory_space}"
+          subject: Kyselyn "%{questionnaire_title}" vastaamisen vahvistus
+        export_name: Kyselyn vastaukset
       surveys:
         answer:
           invalid: Kyselyyn vastaaminen epäonnistui.
-          spam_detected: Kyselyn vastaaminen epäonnistui. Ehkä olit liian nopea, voisitko yrittää uudestaan?
+          spam_detected: Lomakkeeseen vastaaminen epäonnistui. Saatoit toimia liian nopeasti. Yrittäisitkö uudestaan?
           success: Kyselyyn vastaaminen onnistui.

data/config/locales/fr-CA.yml

@@ -64,9 +64,12 @@ fr-CA:
             invalid: Erreurs lors de la sauvegarde de l'enquête.
             success: Enquête enregistrée avec succès.
       last_activity:
-        new_survey_at_html: "<span>Nouvelle enquête à %{link}</span>"
+        new_survey: 'Nouvelle enquête :'
+      survey_confirmation_mailer:
+        confirmation:
+          body: Vous avez répondu avec succès à l'enquête %{questionnaire_title} dans %{participatory_space}
       surveys:
         answer:
           invalid: Votre réponse à l'enquête comporte des erreurs.
-          spam_detected: Il y a eu un problème lors de la réponse au questionnaire. Peut-être avez-vous été trop rapide, pouvez-vous réessayer ?
+          spam_detected: Une erreur est survenue lorsque vous avez répondu au questionnaire. Pouvez-vous réessayer ?
           success: Votre réponse à l'enquête a bien été enregistrée.