decidim-templates 0.31.8 → 0.32.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a717705c80a5671f20a63354adc618c9130dd6916e4820849a3213b39a83f76
-  data.tar.gz: 0f4b37b60ed78f0e9dd8ad9ad59c1385cc60636d7a96f18bb6435c68d5bd07b9
+  metadata.gz: 16236ee594d068cf0992ba09e9e83cea49220d5cea16e4ef116c1cb8daac853b
+  data.tar.gz: dc72ebb0cfc076d11100f8d3d4c97ad235ee0e29f7d342e11d041bbce15b4e2b
 SHA512:
-  metadata.gz: 7b816297bf9e51f78472533b290ee08545fe8fdf11f6d1440f88dc4ff4273cd4a2bee861f4e631a25a125c163d6f89bc99b2126fd19af15ff4f2e2ce9b956dd1
-  data.tar.gz: 63884e90127c69bff4243a7356f22aa926305afed6b87ebb101c22f36213e7541c83dee0295ce56260a499d9da58ec4f7c838a22a19e08409e2f1f6f23081d49
+  metadata.gz: 5e096d90c8bf514e8d00342e0dad59cffdff9e9ec497f68c95f672954b91d35cf1351f73372f6189d1056a4ce8637f1424662b03d3719d520310b49408bf3fb0
+  data.tar.gz: 78302f59fba1aa1f0cbf13d4b31a055877750d8bfa932f811642a73fa9ab4b4942572361919f2f602af785fc2f236a247926f79c62cb790e8d7903c1a4a05967

data/README.md

@@ -1,24 +1,18 @@
-# Decidim::Templates
+# decidim-templates
 
 This module provides a solution to create templates for different Decidim models, such as Proposals and Questionnaires.
 
 ## Usage
 
-Templates will be available in their own section in the admin
+Templates will be available in their own section in the admin.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'decidim-templates'
-```
-
-And then execute:
+To install this module, run in your console:
 
 ```bash
-bundle
-bundle exec rails decidim_templates:install:migrations
+bundle add decidim-templates
+bundle exec rails decidim:upgrade
 bundle exec rails db:migrate
 ```
 
@@ -28,4 +22,4 @@ See [Decidim](https://github.com/decidim/decidim).
 
 ## License
 
-This engine is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
+See [Decidim](https://github.com/decidim/decidim).

data/app/commands/decidim/templates/admin/questionnaire_copier.rb

@@ -7,8 +7,8 @@ module Decidim
       module QuestionnaireCopier
         def copy_questionnaire_questions(original_questionnaire, new_questionnaire)
           # start by copying the questions so that they already exist when cross referencing them in the conditions
-          original_questions = original_questionnaire.reload.questions.includes(:response_options, :matrix_rows, display_conditions: [:condition_question, :response_option]).to_a
-          original_questions.each do |original_question|
+          original_questionnaire.reload.questions.includes(:response_options, :matrix_rows, :display_conditions)
+          original_questionnaire.questions.each do |original_question|
             new_question = original_question.dup
             new_question.questionnaire = new_questionnaire
             new_question.assign_attributes(
@@ -21,12 +21,9 @@ module Decidim
             copy_questionnaire_response_options(original_question, new_question)
             copy_questionnaire_matrix_rows(original_question, new_question)
           end
-          # once all questions are copied, copy display conditions. The destination
-          # questions are looked up by position (and their response options by body)
-          # while cross referencing the conditions, so eager load them to avoid N+1s.
-          destination_questions = new_questionnaire.questions.includes(:response_options).to_a
-          original_questions.zip(destination_questions).each do |original_question, new_question|
-            copy_question_display_conditions(original_question, new_question, destination_questions)
+          # once all questions are copied, copy display conditions
+          original_questionnaire.questions.zip(new_questionnaire.questions.load).each do |original_question, new_question|
+            copy_question_display_conditions(original_question, new_question)
           end
         end
 
@@ -46,12 +43,12 @@ module Decidim
           end
         end
 
-        def copy_question_display_conditions(original_question, destination_question, destination_questions)
+        def copy_question_display_conditions(original_question, destination_question)
           original_question.display_conditions.each do |original_display_condition|
             new_display_condition = original_display_condition.dup
             new_display_condition.question = destination_question
 
-            destination_question_to_be_checked = find_question_by_position(destination_questions, original_display_condition.condition_question.position)
+            destination_question_to_be_checked = find_question_by_position(destination_question.questionnaire.questions, original_display_condition.condition_question.position)
             new_display_condition.condition_question = destination_question_to_be_checked
 
             if original_display_condition.response_option
@@ -59,6 +56,7 @@ module Decidim
                                                                                    original_display_condition.response_option.body)
             end
             new_display_condition.save!
+            destination_question.display_conditions << new_display_condition
           end
         end
 

data/app/controllers/decidim/templates/admin/application_controller.rb

@@ -17,8 +17,6 @@ module Decidim
                              ::Decidim::Templates::Admin::Permissions,
                              ::Decidim::Admin::Permissions)
 
-        protected
-
         def permission_class_chain
           ::Decidim.permissions_registry.chain_for(::Decidim::Templates::Admin::ApplicationController)
         end

data/app/controllers/decidim/templates/admin/block_user_templates_controller.rb

@@ -62,7 +62,7 @@ module Decidim
             on(:invalid) do |template|
               @template = template
               flash.now[:error] = I18n.t("templates.update.error", scope: "decidim.admin")
-              render action: :edit, status: :unprocessable_entity
+              render action: :edit, status: :unprocessable_content
             end
           end
         end
@@ -85,7 +85,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("templates.create.error", scope: "decidim.admin")
-              render :new, status: :unprocessable_entity
+              render :new, status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/templates/admin/concerns/templatable.rb

@@ -13,8 +13,6 @@ module Decidim
           included do
             helper_method :templates, :choose_template?
 
-            protected
-
             def templates
               @templates = current_organization.templates.where(templatable_type:)
               @templates = @templates.where.not(id: params[:id]) if templates_path?
@@ -31,6 +29,8 @@ module Decidim
               templates.any? && templatable.pristine?
             end
 
+            protected
+
             def templatable
               raise NotImplementedError, "Please set the templatable resource in your controller"
             end

data/app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb

@@ -39,7 +39,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("templates.create.error", scope: "decidim.admin")
-              render :new, status: :unprocessable_entity
+              render :new, status: :unprocessable_content
             end
           end
         end
@@ -58,7 +58,7 @@ module Decidim
         def fetch
           enforce_permission_to(:read, :template, template:, proposal:)
 
-          return render json: { msg: I18n.t("templates.fetch.error", scope: "decidim.admin") }, status: :unprocessable_entity if template.blank? || proposal.blank?
+          return render json: { msg: I18n.t("templates.fetch.error", scope: "decidim.admin") }, status: :unprocessable_content if template.blank?
 
           state = fetch_proposal_state(template)
 
@@ -86,7 +86,7 @@ module Decidim
             on(:invalid) do |template|
               @template = template
               flash.now[:error] = I18n.t("templates.update.error", scope: "decidim.admin")
-              render action: :edit, status: :unprocessable_entity
+              render action: :edit, status: :unprocessable_content
             end
           end
         end
@@ -136,16 +136,11 @@ module Decidim
         end
 
         def available_states(component_id = nil)
-          Decidim::Proposals::ProposalState.where(decidim_component_id: component_id) # rubocop:disable Decidim/OrganizationScopedFinder -- component_id comes from template.templatable_id, templates are scoped to current_organization
+          Decidim::Proposals::ProposalState.where(decidim_component_id: component_id)
         end
 
         def proposal
-          @proposal ||= begin
-            component_ids = current_organization.participatory_spaces
-                                                .flat_map { |s| s.components.where(manifest_name: :proposals).pluck(:id) }
-            Decidim::Proposals::Proposal.where(decidim_component_id: component_ids) # rubocop:disable Decidim/OrganizationScopedFinder -- scoped via component_ids derived from current_organization.participatory_spaces
-                                        .find_by(id: params[:proposalId].to_i)
-          end
+          @proposal ||= Decidim::Proposals::Proposal.find(params[:proposalId])
         end
 
         def availability_option_as_text(template)
@@ -160,7 +155,7 @@ module Decidim
 
         def availability_options
           @availability_options = []
-          Decidim::Component.includes(:participatory_space).where(manifest_name: [:proposals]) # rubocop:disable Decidim/OrganizationScopedFinder -- result is filtered in-memory below by current_organization
+          Decidim::Component.includes(:participatory_space).where(manifest_name: [:proposals])
                             .select { |a| a.participatory_space.decidim_organization_id == current_organization.id }.each do |component|
             @availability_options.push [formatted_name(component), component.id]
           end
@@ -174,7 +169,7 @@ module Decidim
         end
 
         def template
-          @template ||= current_organization.templates.find_by(id: params[:id])
+          @template ||= Template.find_by(id: params[:id])
         end
 
         def collection

data/app/controllers/decidim/templates/admin/questionnaire_templates/questionnaires_controller.rb

@@ -10,8 +10,6 @@ module Decidim
 
           helper Decidim::Admin::ExportsHelper
 
-          protected
-
           def questionnaire_for
             template
           end
@@ -32,22 +30,10 @@ module Decidim
             t(:title, scope: "decidim.templates.admin.questionnaire_templates.form", questionnaire_for: translated_attribute(template.name))
           end
 
-          def response_options_url(params)
-            url_for(params.merge(controller: "decidim/templates/admin/questionnaire_templates/questionnaires", action: "response_options", format: :json, template_id: template.id))
-          end
-
           private
 
           def template
-            @template ||= current_organization.templates.where(templatable_type: "Decidim::Forms::Questionnaire").find(template_id)
-          end
-
-          def template_id
-            if action_name == "response_options"
-              params.require(:template_id)
-            else
-              params.require(:id)
-            end
+            @template ||= current_organization.templates.where(templatable_type: "Decidim::Forms::Questionnaire").find(params[:id])
           end
         end
       end

data/app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb

@@ -8,6 +8,7 @@ module Decidim
       class QuestionnaireTemplatesController < Decidim::Templates::Admin::ApplicationController
         include Decidim::TranslatableAttributes
         include Decidim::Forms::Admin::Concerns::HasQuestionnaire
+
         helper Decidim::Forms::Admin::ApplicationHelper
 
         helper_method :template, :questionnaire
@@ -48,7 +49,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("templates.create.error", scope: "decidim.admin")
-              render :new, status: :unprocessable_entity
+              render :new, status: :unprocessable_content
             end
           end
         end
@@ -87,7 +88,7 @@ module Decidim
             on(:invalid) do |template|
               @template = template
               flash.now[:error] = I18n.t("templates.update.error", scope: "decidim.admin")
-              render action: :edit, status: :unprocessable_entity
+              render action: :edit, status: :unprocessable_content
             end
           end
         end
@@ -104,19 +105,13 @@ module Decidim
         end
 
         def apply
-          questionnaire = find_questionnaire(params[:questionnaire_id])
-          enforce_permission_to :apply, :questionnaire_template, questionnaire:, component: questionnaire_component(questionnaire)
-          template = collection.find_by(id: params.dig(:questionnaire, :questionnaire_template_id))
-
-          if questionnaire.blank?
-            flash[:alert] = I18n.t("templates.apply.error", scope: "decidim.admin")
-            return redirect_to(internal_redirect_path || { action: :index })
-          end
+          questionnaire = Decidim::Forms::Questionnaire.find_by(id: params[:questionnaire_id])
+          template = Decidim::Templates::Template.find_by(id: params.dig(:questionnaire, :questionnaire_template_id))
 
           ApplyQuestionnaireTemplate.call(questionnaire, template) do
             on(:ok) do
               flash[:notice] = I18n.t("templates.apply.success", scope: "decidim.admin")
-              redirect_to(internal_redirect_path || { action: :index })
+              redirect_to URI.parse(params[:url]).path
             end
             on(:invalid) do
               flash[:error] = I18n.t("templates.apply.error", scope: "decidim.admin")
@@ -126,7 +121,6 @@ module Decidim
         end
 
         def preview
-          enforce_permission_to :preview, :questionnaire_template
           respond_to do |format|
             format.js do
               @template = template
@@ -137,81 +131,23 @@ module Decidim
         end
 
         def skip
-          questionnaire = find_questionnaire(params[:questionnaire_id])
-          enforce_permission_to :skip, :questionnaire_template, questionnaire:, component: questionnaire_component(questionnaire)
-
-          return redirect_to(internal_redirect_path || { action: :index }) unless questionnaire
-
+          questionnaire = Decidim::Forms::Questionnaire.find_by(id: params[:questionnaire_id])
           # rubocop:disable Rails/SkipsModelValidations
           questionnaire.touch
           # rubocop:enable Rails/SkipsModelValidations
-          redirect_to(internal_redirect_path || { action: :index })
+          redirect_to URI.parse(params[:url]).path
         end
 
-        protected
-
         def edit_questions_template
           "decidim/templates/admin/questionnaire_templates/edit_questions"
         end
 
-        def response_options_url(params)
-          url_for(params.merge(controller: "decidim/templates/admin/questionnaire_templates/questionnaires", action: "response_options", format: :json, template_id: template.id))
-        end
-
         def after_update_url
           edit_questionnaire_template_path(template)
         end
 
         private
 
-        def find_questionnaire(id)
-          questionnaire = Decidim::Forms::Questionnaire.find_by(id:) # rubocop:disable Decidim/OrganizationScopedFinder -- scoping requires polymorphic questionnaire_for chain; org ownership validated via questionnaire_for_in_organization?
-          return unless questionnaire
-          return unless questionnaire_for_in_organization?(questionnaire)
-
-          questionnaire
-        end
-
-        def questionnaire_component(questionnaire)
-          questionnaire&.questionnaire_for.try(:component)
-        end
-
-        def questionnaire_for_in_organization?(questionnaire)
-          questionnaire_for = questionnaire.questionnaire_for
-          return false unless questionnaire_for
-          return false unless questionnaire_for.respond_to?(:organization)
-
-          questionnaire_for.organization == current_organization
-        end
-
-        # Returns the path of the `url` param only when it points to the same
-        # origin. Absolute same-origin URLs and root-relative paths are
-        # accepted; protocol-relative, external and malformed URLs are rejected
-        # so they can never be used to redirect the user to another site.
-        def internal_redirect_path
-          url = params[:url].to_s
-          return if url.blank?
-
-          uri = URI.parse(url)
-          return if uri.host.present? && !same_origin?(uri)
-
-          safe_path(uri.path)
-        rescue URI::Error
-          nil
-        end
-
-        def same_origin?(uri)
-          uri.host == request.host && (uri.scheme.nil? || uri.scheme == request.scheme)
-        end
-
-        def safe_path(path)
-          return if path.blank? || !path.start_with?("/")
-          return if path.start_with?("//", "/\\") || path.include?("\\")
-          return if path.match?(/[\u0000-\u001f\u007f]/)
-
-          path
-        end
-
         def questionnaire
           template.templatable
         end

data/app/permissions/decidim/templates/admin/permissions.rb

@@ -9,9 +9,11 @@ module Decidim
           return permission_action unless user
           return permission_action if context[:current_organization] != user.organization
 
-          if read_template_action? || allows_questionnaire_template_action?
+          if user_has_a_role? && (permission_action.subject == :template && permission_action.action == :read)
             allow!
-          elsif user.admin?
+          else
+            return permission_action unless user.admin?
+
             case permission_action.subject
             when :template
               allow! if [:read, :create, :update, :destroy, :copy].include? permission_action.action
@@ -19,8 +21,6 @@ module Decidim
               allow! if permission_action.action == :index
             when :questionnaire
               allow!
-            when :questionnaire_template
-              allow! if [:preview, :apply, :skip].include? permission_action.action
             end
           end
 
@@ -42,50 +42,6 @@ module Decidim
 
           user_roles.exists?(user:)
         end
-
-        def read_template_action?
-          user_has_a_role? && permission_action.subject == :template && permission_action.action == :read
-        end
-
-        # Allows a user who is able to edit the target questionnaire to preview,
-        # apply or skip questionnaire templates. Organization admins can always
-        # perform these actions. "preview" has no target questionnaire to scope
-        # to, so it is allowed to any user holding a role in a participatory
-        # space, as it is only reachable from an already authorized form.
-        def allows_questionnaire_template_action?
-          return false unless permission_action.subject == :questionnaire_template
-          return false unless [:preview, :apply, :skip].include?(permission_action.action)
-          return true if user.admin?
-
-          if (component = context[:component]).present?
-            return user_can_manage_component?(component)
-          end
-
-          permission_action.action == :preview && user_has_any_role?(user, nil, broad_check: true)
-        end
-
-        # Checks the user can manage the given component by delegating the
-        # `:manage, :component` action to the component's own permission chain,
-        # so that space admins are authorized while other roles are not.
-        def user_can_manage_component?(component)
-          [
-            component.manifest.permissions_class,
-            component.participatory_space.manifest.permissions_class,
-            Decidim::Admin::Permissions
-          ].inject(permission_action_for_manage_component) do |action, permission_class|
-            permission_class.new(
-              user,
-              action,
-              context.merge(component:, current_participatory_space: component.participatory_space)
-            ).permissions
-          end.allowed?
-        rescue Decidim::PermissionAction::PermissionNotSetError
-          false
-        end
-
-        def permission_action_for_manage_component
-          Decidim::PermissionAction.new(scope: :admin, action: :manage, subject: :component)
-        end
       end
     end
   end

data/app/views/decidim/templates/admin/block_user_templates/index.html.erb

@@ -25,7 +25,7 @@
               <%= link_to translated_attribute(template.name), edit_block_user_template_path(template) %>
             </td>
             <td data-label="<%= t("template.fields.created_at", scope: "decidim.models") %>">
-              <%= l template.created_at, format: :long %>
+              <%= l template.created_at, format: :decidim_short %>
             </td>
             <td data-label="<%= t("decidim.admin.actions.actions") %>" class="table-list__actions">
               <button type="button" data-controller="dropdown" data-target="actions-block-user-template-<%= template.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: template.name) %>">

data/app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb

@@ -25,7 +25,7 @@
           <% @templates.each do |template| %>
             <tr data-proposal_answer-id="<%= template.id %>">
               <td data-label="<%= t("template.name", scope: "decidim.models") %>">
-                <%= link_to_if allowed_to?(:update, :template, template: template), translated_attribute(template.name), edit_proposal_answer_template_path(template) %>
+                <%= link_to_if allowed_to?(:update, :template, template:), translated_attribute(template.name), edit_proposal_answer_template_path(template) %>
               </td>
               <td data-label="<%= t(".proposal_state_id") %>">
                 <%= proposal_state(template) %>
@@ -34,7 +34,7 @@
                 <%= availability_option_as_text(template) %>
               </td>
               <td data-label="<%= t("template.fields.created_at", scope: "decidim.models") %>">
-                <%= l template.created_at, format: :long %>
+                <%= l template.created_at, format: :decidim_short %>
               </td>
               <td data-label="<%= t("decidim.admin.actions.actions") %>" class="table-list__actions">
                 <button type="button" data-controller="dropdown" data-target="actions-proposal-answer-template-<%= template.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: template.name) %>">

data/app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb

@@ -11,7 +11,7 @@
     <% response_idx = 0 %>
     <% cleaned_response_idx = 0 %>
     <% @preview_form.responses_by_step.each_with_index do |step_responses, step_index| %>
-      <div id="step-<%= step_index %>" class="questionnaire-step" <%= "hidden" if step_index.positive? %>>
+      <div id="step-<%= step_index %>" class="<%= step_index.zero? ? "questionnaire-step" : "questionnaire-step hide" %>" data-toggler=".hide">
         <div class="form__wrapper">
           <% if @preview_form.total_steps > 1 %>
             <h4>

data/app/views/decidim/templates/admin/questionnaire_templates/index.html.erb

@@ -33,7 +33,7 @@
                 <%= template.templatable.questions.count.to_i %>
               </td>
               <td data-label="<%= t("template.fields.created_at", scope: "decidim.models") %>">
-                <%= l template.created_at, format: :long %>
+                <%= l template.created_at, format: :decidim_short %>
               </td>
               <td data-label="<%= t("decidim.admin.actions.actions") %>" class="table-list__actions">
                 <button type="button" data-controller="dropdown" data-target="actions-template-<%= template.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: template.name) %>">

data/config/locales/ar.yml

@@ -1,4 +1,3 @@
----
 ar:
   activemodel:
     attributes:

data/config/locales/bg.yml

@@ -1,4 +1,3 @@
----
 bg:
   activemodel:
     attributes:

data/config/locales/ca-IT.yml

@@ -1,4 +1,3 @@
----
 ca-IT:
   activemodel:
     attributes:

data/config/locales/ca.yml

@@ -1,4 +1,3 @@
----
 ca:
   activemodel:
     attributes:

data/config/locales/cs.yml

@@ -1,4 +1,3 @@
----
 cs:
   activemodel:
     attributes:

data/config/locales/de.yml

@@ -1,4 +1,3 @@
----
 de:
   activemodel:
     attributes:

data/config/locales/es-MX.yml

@@ -1,4 +1,3 @@
----
 es-MX:
   activemodel:
     attributes:

data/config/locales/es-PY.yml

@@ -1,4 +1,3 @@
----
 es-PY:
   activemodel:
     attributes:

data/config/locales/es.yml

@@ -1,4 +1,3 @@
----
 es:
   activemodel:
     attributes:

data/config/locales/eu.yml

@@ -1,4 +1,3 @@
----
 eu:
   activemodel:
     attributes:
@@ -27,7 +26,7 @@ eu:
           success: Txantiloia zuzen ezabatua.
         empty: Oraindik ez dago txantiloirik.
         fetch:
-          error: Ezin da txantiloi hau aurkitu. Mesedez kargatu berriro orria.
+          error: Ezin da plantilla hau aurkitu. Kargatu orria, mesedez.
         missing_resource: "(baliabide galdua)"
         update:
           error: Arazo bat egon da eztabaida hau eguneratzean.
@@ -43,7 +42,7 @@ eu:
           title: Galdeketaren Izenburua
       template:
         fields:
-          created_at: Sortze-data
+          created_at: Noiz sortua
         name: Txantiloia
     templates:
       admin:
@@ -61,24 +60,24 @@ eu:
             select_template: Hautatu txantiloi-fitxategi bat
         proposal_answer_templates:
           edit:
-            title: Editatu proposamenaren erantzun-txantiloia
+            title: Editatu proposamenaren erantzun-txantilioia
           form:
             component_constraint_help: Kontuan izan soilik zerrendatuko direla "proposamenak" motako osagaiak dituzten parte hartzeko espazioak.
             hint1_html: "\n<strong>%{organization}</strong>  erakundearen izenak ordezkatuko du."
-            hint2_html: "<strong>%{name}</strong> egilearen izenak ordezkatuko du"
-            hint3_html: "<strong>%{admin}</strong> administratzailearen izenak ordezkatuko du (proposamenari erantzuten diona)"
+            hint2_html: "<strong>%{name}</strong> egilearen izenak ordezkatuko du."
+            hint3_html: "<strong>%{admin}</strong> administratzailearen izenak ordezkatuko du (proposamenari erantzuten diona)."
             hint_html: "<strong>Iradokizuna</strong> Aldagarri hauek erantzunaren txantiloiaren edozein lekutan erabil ditzakezu, txantiloia erabiltzean ordezkatuko baitira"
             save: Gorde
           index:
-            component_constraint: Gehitu hertsapena
+            component_constraint: Gehitu hertsapena.
             confirm_delete: Ziur zaude txantiloi hau ezabatu nahi duzula?
             missing_state: Egoera desagertua
             proposal_state_id: Barne egoera
             title: Proposamenen erantzunak
           new:
-            title: Proposamenaren erantzun-txantiloi berria
+            title: Proposamenaren erantzun-txantilioi berria
           template_chooser:
-            select_template: Aukeratu erantzun-txantiloi bat
+            select_template: Aukeratu erantzun-txantiloi bat.
         questionnaire_templates:
           choose:
             continue: Jarraitu
@@ -93,7 +92,7 @@ eu:
             empty: Oraindik ez dago galderarik.
             manage_questions: Galderak
             questionnaire: Galdetegia
-            title: Editatu galdetegiaren txantiloia
+            title: Galdetegiaren txantiloia editatu
           edit_questions:
             add_question: Gehitu galdera
             add_separator: Gehitu banatzailea
@@ -107,7 +106,7 @@ eu:
             title: Beste galdetegi-txantiloi bat
           preview:
             current_step: '%{step} urratsa'
-            of_total_steps: guztira %{total_steps}
+            of_total_steps: '%{total_steps} etik'
             tos_agreement: Parte hartzean erabilera-irizpideak eta baldintzak onartzen dituzu
       admin_log:
         template:

data/config/locales/fi-plain.yml

@@ -1,4 +1,3 @@
----
 fi-pl:
   activemodel:
     attributes:

data/config/locales/fi.yml

@@ -1,4 +1,3 @@
----
 fi:
   activemodel:
     attributes:

data/config/locales/fr-CA.yml

@@ -1,4 +1,3 @@
----
 fr-CA:
   activemodel:
     attributes:

data/config/locales/fr.yml

@@ -1,4 +1,3 @@
----
 fr:
   activemodel:
     attributes: