decidim-core 0.31.5 → 0.32.0.rc2

data/app/controllers/decidim/devise/omniauth_registrations_controller.rb

@@ -34,7 +34,7 @@ module Decidim
 
           on(:invalid) do
             set_flash_message :notice, :success, kind: @form.provider.capitalize
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
 
           on(:add_tos_errors) do

data/app/controllers/decidim/devise/passwords_controller.rb

@@ -36,7 +36,7 @@ module Decidim
           on(:invalid) do
             flash.now[:alert] = t("passwords.update.error", scope: "decidim")
             resource.errors.errors.concat(@form.errors.errors)
-            render action: "edit", status: :unprocessable_entity
+            render action: "edit", status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/devise/registrations_controller.rb

@@ -40,7 +40,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("error", scope: "decidim.devise.registrations.create")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/devise/sessions_controller.rb

@@ -48,7 +48,7 @@ module Decidim
 
       def redirect_to_referer_or_path
         set_flash_message(:alert, "csrf_token", scope: "devise.failure")
-        redirect_back(fallback_location: root_path) && return
+        redirect_back_or_to(root_path) && return
       end
 
       def check_sign_in_enabled

data/app/controllers/decidim/download_your_data_controller.rb

@@ -37,7 +37,7 @@ module Decidim
       DownloadYourDataExportJob.perform_later(current_user)
 
       flash[:notice] = t("decidim.account.download_your_data_export.notice")
-      redirect_back(fallback_location: download_your_data_path)
+      redirect_back_or_to(download_your_data_path)
     end
 
     def download_file

data/app/controllers/decidim/editor_images_controller.rb

@@ -16,7 +16,7 @@ module Decidim
         end
 
         on(:invalid) do |_message|
-          render json: { message: I18n.t("error", scope: "decidim.editor_images.create") }, status: :unprocessable_entity
+          render json: { message: I18n.t("error", scope: "decidim.editor_images.create") }, status: :unprocessable_content
         end
       end
     end

data/app/controllers/decidim/follows_controller.rb

@@ -3,6 +3,7 @@
 module Decidim
   class FollowsController < Decidim::ApplicationController
     include FormFactory
+
     before_action :authenticate_user!
     helper_method :resource, :button_cell, :button_cell_mobile
 
@@ -16,7 +17,7 @@ module Decidim
         end
 
         on(:invalid) do
-          render json: { error: I18n.t("follows.destroy.error", scope: "decidim") }, status: :unprocessable_entity
+          render json: { error: I18n.t("follows.destroy.error", scope: "decidim") }, status: :unprocessable_content
         end
       end
     end
@@ -31,7 +32,7 @@ module Decidim
         end
 
         on(:invalid) do
-          render json: { error: I18n.t("follows.create.error", scope: "decidim") }, status: :unprocessable_entity
+          render json: { error: I18n.t("follows.create.error", scope: "decidim") }, status: :unprocessable_content
         end
       end
     end
@@ -43,7 +44,7 @@ module Decidim
     end
 
     def button_options
-      params.require(:follow).permit(:button_classes).to_h.symbolize_keys
+      params.expect(follow: [:button_classes]).to_h.symbolize_keys
     end
 
     def button_cell_mobile

data/app/controllers/decidim/geolocation_controller.rb

@@ -8,7 +8,7 @@ module Decidim
       enforce_permission_to :locate, :geolocation
 
       unless Decidim::Map.configured?
-        return render(json: { message: I18n.t("not_configured", scope: "decidim.application.geocoding"), found: false }, status: :unprocessable_entity)
+        return render(json: { message: I18n.t("not_configured", scope: "decidim.application.geocoding"), found: false }, status: :unprocessable_content)
       end
 
       geocoder = Decidim::Map.utility(:geocoding, organization: current_organization)

data/app/controllers/decidim/likes_controller.rb

@@ -5,6 +5,7 @@ module Decidim
   class LikesController < Decidim::Components::BaseController
     # we need to +include+ to be able to call :like_button from the view
     include Decidim::LikeableHelper
+
     helper_method :like_button
     # we need to declare with +helper+ to be able to call :render_like_identity from the views
     helper Decidim::LikeableHelper
@@ -22,7 +23,7 @@ module Decidim
         end
 
         on(:invalid) do
-          render json: { error: I18n.t("resource_likes.create.error", scope: "decidim") }, status: :unprocessable_entity
+          render json: { error: I18n.t("resource_likes.create.error", scope: "decidim") }, status: :unprocessable_content
         end
       end
     end

data/app/controllers/decidim/locales_controller.rb

@@ -7,20 +7,12 @@ module Decidim
 
     def create
       enforce_permission_to :create, :locales
-      current_user.update!(locale: params["locale"]) if current_user && params["locale"] && available_locales.include?(params["locale"])
-
-      redirect_to referer_with_new_locale
-    end
 
-    private
+      desired_locale = params["locale"] if params["locale"] && available_locales.include?(params["locale"])
 
-    def referer_with_new_locale
-      uri = URI(request.referer || "/")
-      query = uri.query.to_s.gsub(/locale=[a-zA-Z-]{2,5}/, "")
-      params = URI.decode_www_form(query) << ["locale", current_locale]
-      uri.query = URI.encode_www_form(params)
+      current_user.update!(locale: params["locale"]) if current_user && params["locale"] && available_locales.include?(params["locale"])
 
-      uri.to_s
+      redirect_to canonical_url(request.referer || "/", desired_locale || default_locale)
     end
   end
 end

data/app/controllers/decidim/messaging/conversations_controller.rb

@@ -30,7 +30,7 @@ module Decidim
           conversation = conversation_between(current_user, @form.recipient)
         end
 
-        return redirect_back(fallback_location: profile_path(current_user.nickname)) if @form.recipient.empty?
+        return redirect_back_or_to(profile_path(current_user.nickname)) if @form.recipient.empty?
 
         return redirect_to conversation_path(conversation) if conversation
 
@@ -53,7 +53,7 @@ module Decidim
             render action: :error, locals: {
               error: I18n.t("messaging.conversations.create.error", scope: "decidim"),
               messages:
-            }, status: :unprocessable_entity
+            }, status: :unprocessable_content
           end
         end
       end
@@ -89,7 +89,7 @@ module Decidim
             render action: :error, locals: {
               error: I18n.t("messaging.conversations.update.error", scope: "decidim"),
               messages:
-            }, status: :unprocessable_entity
+            }, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/newsletters_controller.rb

@@ -34,7 +34,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("newsletters.unsubscribe.error", scope: "decidim")
-            render action: :unsubscribe, status: :unprocessable_entity
+            render action: :unsubscribe, status: :unprocessable_content
           end
         end
       else

data/app/controllers/decidim/notifications_settings_controller.rb

@@ -22,7 +22,7 @@ module Decidim
 
         on(:invalid) do
           flash.now[:alert] = t("notifications_settings.update.error", scope: "decidim")
-          render action: :show, status: :unprocessable_entity
+          render action: :show, status: :unprocessable_content
         end
       end
     end

data/app/controllers/decidim/notifications_subscriptions_controller.rb

@@ -18,7 +18,7 @@ module Decidim
     private
 
     def unsupported_browser
-      render json: { error: I18n.t("notifications_settings.show.push_notifications_unsupported_browser", scope: "decidim") }, status: :unprocessable_entity
+      render json: { error: I18n.t("notifications_settings.show.push_notifications_unsupported_browser", scope: "decidim") }, status: :unprocessable_content
     end
   end
 end

data/app/controllers/decidim/open_data_controller.rb

@@ -15,7 +15,7 @@ module Decidim
       else
         schedule_open_data_generation(resource)
         flash[:alert] = t("decidim.open_data.not_available_yet")
-        redirect_back fallback_location: open_data_path
+        redirect_back_or_to(open_data_path)
       end
     end
 

data/app/controllers/decidim/report_users_controller.rb

@@ -18,13 +18,13 @@ module Decidim
           if @form.block?
             redirect_to decidim_admin.new_user_block_path(user_id: reportable.id, hide: form.hide?)
           else
-            redirect_back fallback_location: root_path
+            redirect_back_or_to(root_path)
           end
         end
 
         on(:invalid) do
           flash[:alert] = I18n.t("decidim.reports.create.error")
-          redirect_back fallback_location: root_path
+          redirect_back_or_to(root_path)
         end
       end
     end

data/app/controllers/decidim/reports_controller.rb

@@ -26,7 +26,7 @@ module Decidim
 
         on(:invalid) do
           flash[:alert] = I18n.t("decidim.reports.create.error")
-          redirect_back fallback_location: root_path
+          redirect_back_or_to(root_path)
         end
       end
     end

data/app/controllers/decidim/user_activities_controller.rb

@@ -56,8 +56,7 @@ module Decidim
 
     def resource_types
       @resource_types = begin
-        array = %w(Decidim::Proposals::CollaborativeDraft
-                   Decidim::Comments::Comment
+        array = %w(Decidim::Comments::Comment
                    Decidim::Debates::Debate
                    Decidim::Initiative
                    Decidim::Meetings::Meeting

data/app/events/decidim/welcome_notification_event.rb

@@ -45,7 +45,7 @@ module Decidim
       template
         .gsub("{{name}}", user.presenter.name)
         .gsub("{{organization}}", organization_name(organization))
-        .gsub("{{help_url}}", url_helpers.pages_url(host: organization.host))
+        .gsub("{{help_url}}", url_helpers.pages_url(host: organization.host, locale: I18n.locale))
         .gsub("{{badges_url}}", url_helpers.gamification_badges_url(host: organization.host))
         .html_safe
     end

data/app/forms/decidim/upload_validation_form.rb

@@ -54,7 +54,7 @@ module Decidim
 
     def form_object_class
       @form_object_class ||= begin
-        form_class.constantize if form_class.present?
+        form_class.presence&.constantize
       rescue NameError
         nil
       end

data/app/helpers/concerns/decidim/flash_helper_extensions.rb

@@ -57,6 +57,7 @@ module Decidim
       # @param closable [Boolean] - Whether the close icon is added.
       #
       # @return [String] the HTML with the alert box
+      # @param [Hash{Symbol => Object}] opts
       def alert_box(value, alert_class, closable, opts = {})
         options = {
           class: "flash #{alert_class}",

data/app/helpers/decidim/active_link_to_helper.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Overrides {ActiveLinkTo#is_active_link?} to handle locale-prefixed URLs.
+  #
+  # Decidim adds the locale as a URL path segment (e.g. `/en/processes`), so
+  # the URL passed to the helper and `request.original_fullpath` both carry a
+  # locale prefix. This module normalizes the URL argument to always carry the
+  # current locale prefix before delegating to the gem, so active-state
+  # detection works correctly regardless of whether the caller already included
+  # the locale in the URL or not.
+  #
+  # When the locale is part of the Rails script name rather than the path
+  # (i.e. the application is mounted at a locale-prefixed mount point), no
+  # normalization is performed and the original gem behaviour is preserved.
+  #
+  # Include this module *after* {ActiveLinkTo} so that this override takes
+  # precedence.
+  module ActiveLinkToHelper
+    # Overrides {ActiveLinkTo#is_active_link?} to normalise locale-prefixed
+    # URLs before comparison.
+    #
+    # @param url [String] the URL to check
+    # @param condition [Boolean, Symbol, Regexp, Array, Hash, nil] the active
+    #   condition, same as accepted by the `active_link_to` gem
+    #
+    # @return [Boolean] whether the link is considered active
+    def is_active_link?(url, condition = nil) # rubocop:disable Naming/PredicatePrefix
+      super(locale_prefixed_url(url), condition)
+    end
+
+    private
+
+    # Normalizes a URL so its path carries the current locale prefix, but only
+    # when the current request path itself has a locale prefix. This preserves
+    # correct behaviour in engines mounted without a locale segment (e.g. the
+    # admin engine at +/admin+) where neither the request path nor the
+    # generated paths contain a locale segment.
+    #
+    # When normalization does apply, any existing locale prefix is stripped
+    # first to avoid double-prefixing.
+    #
+    # Returns the URL unchanged for non-String values, when no locale segments
+    # are configured, when the locale lives in the script name, or when the
+    # current request path has no locale prefix.
+    #
+    # @param url [String] the URL to normalize
+    #
+    # @return [String] the normalized URL
+    def locale_prefixed_url(url)
+      locale_pattern = locale_prefix_pattern
+      return url unless normalizable_url?(url, locale_pattern)
+
+      current = try(:current_locale) || I18n.locale.to_s
+      return url if current.blank?
+
+      rewrite_url_with_locale(url, locale_pattern, current)
+    end
+
+    # Determines whether a URL string should be normalized with a locale prefix.
+    #
+    # Returns +false+ when any of the following conditions are true:
+    # - +url+ is not a +String+
+    # - the locale lives in the script name (via +locale_in_script_name?+)
+    # - +locale_pattern+ is +nil+ (no locales are configured)
+    # - the current request path does not begin with a locale segment
+    #
+    # @param url [String] the URL candidate for normalization
+    # @param locale_pattern [Regexp, nil] the pattern built by {#locale_prefix_pattern},
+    #   or +nil+ when no locales are available
+    #
+    # @return [Boolean] +true+ when the URL should be rewritten with a locale prefix
+    def normalizable_url?(url, locale_pattern)
+      return false unless url.is_a?(String)
+      return false if try(:locale_in_script_name?)
+      return false if locale_pattern.nil?
+
+      current_path = try(:request)&.original_fullpath.to_s
+      current_path.match?(locale_pattern)
+    end
+
+    # Builds a +Regexp+ that matches any available locale code at the start of a
+    # URL path segment (e.g. +/en+, +/zh-TW+).
+    #
+    # Locales are sorted longest-first so that longer codes such as +zh-TW+ are
+    # tried before shorter ones like +zh+, preventing partial matches.
+    #
+    # @return [Regexp, nil] the locale-matching pattern, or +nil+ when no locales
+    #   are configured
+    def locale_prefix_pattern
+      locales = available_locale_segments
+      return if locales.empty?
+
+      %r{\A/(#{Regexp.union(locales)})(?=/|\z)}
+    end
+
+    # Rewrites the path component of +url+ so it begins with the +current+ locale
+    # prefix. Any preexisting locale prefix is stripped first to prevent
+    # double-prefixing (e.g. +/en/en/foo+ would never be produced).
+    #
+    # Returns +url+ unchanged when the URI cannot be parsed.
+    #
+    # @param url [String] the URL whose path should be rewritten
+    # @param locale_pattern [Regexp] the pattern used to strip an existing locale prefix
+    # @param current [String] the locale code to prepend (e.g. +"en"+ or +"zh-TW"+)
+    #
+    # @return [String] the URL with its path rewritten to carry +current+ as the
+    #   leading segment, or the original +url+ if parsing fails
+    def rewrite_url_with_locale(url, locale_pattern, current)
+      uri = Addressable::URI.parse(url)
+      return url if uri.nil?
+
+      stripped_path = uri.path.to_s.sub(locale_pattern, "")
+      stripped_path = "/" if stripped_path.empty?
+
+      uri.path = "/#{current}#{stripped_path}"
+      uri.to_s
+    rescue Addressable::URI::InvalidURIError
+      url
+    end
+
+    # Returns the list of available locale codes sorted longest-first.
+    #
+    # Sorting longest-first ensures that longer locale codes (e.g. +zh-TW+) are
+    # matched before shorter ones (e.g. +zh+) when building a {#locale_prefix_pattern}.
+    #
+    # Falls back to {Decidim.available_locales} when +available_locales+ is not
+    # defined on the including context (e.g. outside a controller).
+    #
+    # @return [Array<String>] locale code strings sorted by descending length
+    def available_locale_segments
+      locales = try(:available_locales) || Decidim.available_locales
+      locales.map(&:to_s).sort_by(&:length).reverse
+    end
+  end
+end

data/app/helpers/decidim/amendments_helper.rb

@@ -17,9 +17,9 @@ module Decidim
     end
 
     # Checks if the user can participate in a participatory space
-    # based on its settings related with Decidim::HasPrivateUsers.
-    def can_participate_in_private_space?
-      return true unless current_participatory_space.class.included_modules.include?(HasPrivateUsers)
+    # based on its settings related with Decidim::ParticipatorySpace::HasMembers.
+    def can_participate_in_restricted_space?
+      return true unless current_participatory_space.class.included_modules.include?(Decidim::ParticipatorySpace::HasMembers)
 
       current_participatory_space.can_participate?(current_user)
     end

data/app/helpers/decidim/check_boxes_tree_helper.rb

@@ -18,12 +18,12 @@ module Decidim
         label_options: {
           "data-children-checkbox": parent_id,
           value:,
-          for: "#{options[:namespace]}_#{options[:id]}"
+          for: options[:id]
         }
       }
       options.merge!(checkbox_options)
       # as taxonomies work with a nested array of values, we need to manually check if the value is checked
-      matches = options[:id]&.match(/^with_any_taxonomies_([0-9]+)__taxonomy-([0-9_]+)/)
+      matches = options[:id]&.match(/^with_any_taxonomies_taxonomy-([0-9]+)_([0-9_]+)/)
       if matches.present? && object.respond_to?(:with_any_taxonomies) && object.with_any_taxonomies&.dig(matches[1]).is_a?(Array)
         options[:checked] = object.with_any_taxonomies[matches[1]].include?(value.to_s)
       end

data/app/helpers/decidim/component_path_helper.rb

@@ -8,8 +8,11 @@ module Decidim
     # component - the Component we want to find the root path for.
     #
     # Returns a relative url.
-    def main_component_path(component)
+    def main_component_path(component, desired_params = {})
       current_params = try(:params) || {}
+      current_params = current_params.merge(locale: I18n.locale)
+                                     .merge(desired_params)
+
       EngineRouter.main_proxy(component).root_path(locale: current_params[:locale])
     end
 
@@ -18,8 +21,11 @@ module Decidim
     # component - the Component we want to find the root path for.
     #
     # Returns an absolute url.
-    def main_component_url(component)
+    def main_component_url(component, desired_params = {})
       current_params = try(:params) || {}
+      current_params = current_params.merge(locale: I18n.locale)
+                                     .merge(desired_params)
+
       EngineRouter.main_proxy(component).root_url(locale: current_params[:locale])
     end
 
@@ -29,8 +35,7 @@ module Decidim
     #
     # Returns a relative url.
     def manage_component_path(component)
-      current_params = try(:params) || {}
-      EngineRouter.admin_proxy(component).root_path(locale: current_params[:locale])
+      EngineRouter.admin_proxy(component).root_path
     end
 
     # Returns whether the component can be managed or not by checking if it has

data/app/helpers/decidim/filters_helper.rb

@@ -44,8 +44,6 @@ module Decidim
         I18n.t("decidim/meetings/meeting.other", scope: "activerecord.models")
       when "debates"
         I18n.t("decidim/debates/debate.other", scope: "activerecord.models")
-      when "sortitions"
-        I18n.t("decidim/sortitions/sortition.other", scope: "activerecord.models")
       when "surveys"
         I18n.t("decidim/surveys/survey.other", scope: "activerecord.models")
       when "projects"

data/app/helpers/decidim/menu_helper.rb

@@ -70,11 +70,11 @@ module Decidim
         # The queries already include the order by weight
         Decidim::ParticipatoryProcesses::OrganizationParticipatoryProcesses.new(current_organization) |
           Decidim::ParticipatoryProcesses::PromotedParticipatoryProcesses.new
-      ).select(&:published?).map { |process| remove_private_space_if_not_private_user(process) }&.compact&.first
+      ).select(&:published?).map { |process| remove_restricted_space_if_not_member(process) }&.compact&.first
     end
 
-    def remove_private_space_if_not_private_user(process)
-      return nil if process.private_space == true && !process.can_participate?(current_user)
+    def remove_restricted_space_if_not_member(process)
+      return nil if process.restricted? && !process.can_participate?(current_user)
 
       process
     end

data/app/helpers/decidim/meta_tags_helper.rb

@@ -8,8 +8,6 @@ module Decidim
     # the other methods to see how they work.
     #
     # @param [Hash] tags - A Hash containing the meta tag name as keys and its content as values.
-    # @param [Object, nil] resource - The resource object that may contain the image.
-    #
     # @return [nil]
     def add_decidim_meta_tags(tags)
       add_decidim_page_title(tags[:title])

data/app/helpers/decidim/paginate_helper.rb

@@ -16,9 +16,22 @@ module Decidim
       content_tag :div, class: "flex flex-col-reverse md:flex-row items-center justify-between gap-1 py-8 md:py-16 md:flex-wrap", data: { pagination: "" } do
         template = ""
         template += render(partial: "decidim/shared/results_per_page", locals: { per_page: }, formats: [:html]) if collection.total_pages.positive?
-        template += paginate collection, window: 2, outer_window: 1, theme: "decidim", params: paginate_params
+        template += paginate collection, window: 2, outer_window: 1, theme: "decidim", params: pagination_params(paginate_params)
         template.html_safe
       end
     end
+
+    private
+
+    def pagination_params(paginate_params)
+      request_params = params.to_unsafe_h.except("locale", :locale)
+      request_params["q"] = request_params["q"].except("locale", :locale) if request_params["q"].is_a?(Hash)
+      request_params[:locale] = nil if admin_controller_with_locale_prefix?
+      request_params.merge(paginate_params)
+    end
+
+    def admin_controller_with_locale_prefix?
+      request.path_parameters[:locale].present? && controller_path.to_s.include?("/admin/")
+    end
   end
 end

data/app/helpers/decidim/sanitize_helper.rb

@@ -131,6 +131,7 @@ module Decidim
     # @param method [Symbol] Method name
     #
     # @return ActiveSupport::SafeBuffer
+    # @param [Object, nil] presenter_class
     def render_sanitized_content(resource, method, presenter_class: nil)
       content = present(resource, presenter_class:).send(method, links: true, strip_tags: !try(:safe_content?))
 

data/app/helpers/decidim/short_link_helper.rb

@@ -10,11 +10,11 @@ module Decidim
     # also resolves the current mounted route name to make it possible to refer
     # to the same context when redirecting the short URL to correct full URL.
     #
-    # @option kwargs [Boolean] :route_name the route name to which the short
-    #   link should link to
-    # @option kwargs [Float] :params the URL query parameters that should be
-    #   included in the URL where the short link redirects to
-    # @return [String] The short URL
+    # Accepts keyword arguments such as:
+    #   - `route_name`: the route name to link to
+    #   - `params`: query parameters for the redirect
+    #
+    # @return [String] The short URL.
     def short_url(**)
       target = respond_to?(:current_component) && current_component
       target ||= respond_to?(:current_participatory_space) && current_participatory_space

data/app/helpers/decidim/translations_helper.rb

@@ -30,8 +30,8 @@ module Decidim
     #
     # Returns a Hash with the locales as keys and the empty strings as values.
     def empty_translatable(locales = Decidim.available_locales)
-      locales.each_with_object({}) do |locale, result|
-        result[locale.to_s] = ""
+      locales.to_h do |locale|
+        [locale.to_s, ""]
       end
     end
 
@@ -49,8 +49,8 @@ module Decidim
     def ensure_translatable(value, locales = Decidim.available_locales)
       return empty_translatable(locales) unless value.is_a?(Hash)
 
-      locales.each_with_object({}) do |locale, result|
-        result[locale.to_s] = value[locale.to_s] || value[locale] || ""
+      locales.to_h do |locale|
+        [locale.to_s, value[locale.to_s] || value[locale] || ""]
       end
     end
 

data/app/jobs/decidim/delete_inactive_participants_job.rb

@@ -14,9 +14,9 @@ module Decidim
 
     private
 
-    def enqueue_jobs(users, action, *args)
+    def enqueue_jobs(users, action, *)
       users.find_each do |user|
-        ProcessInactiveParticipantJob.perform_later(user.id, action, *args)
+        ProcessInactiveParticipantJob.perform_later(user.id, action, *)
       end
     end
 

data/app/mailers/decidim/application_mailer.rb

@@ -9,10 +9,11 @@ module Decidim
     include Decidim::SanitizeHelper
     include Decidim::MailerHelper
     include Decidim::OrganizationHelper
-    helper_method :organization_name, :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute, :decidim_sanitize, :decidim_sanitize_newsletter
 
     helper Decidim::SanitizeHelper
     helper Decidim::MailerHelper
+    helper_method :organization_name, :current_locale, :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute, :decidim_sanitize,
+                  :decidim_sanitize_newsletter
 
     after_action :set_smtp
     after_action :set_from
@@ -24,10 +25,14 @@ module Decidim
 
     attr_reader :organization
 
+    def current_locale
+      I18n.locale || I18n.default_locale
+    end
+
     def set_smtp
       return if organization.nil? || organization.smtp_settings.blank? || organization.smtp_settings.except("from", "from_label", "from_email").all?(&:blank?)
 
-      mail.reply_to = mail.reply_to || Decidim.config.mailer_reply
+      mail.reply_to = mail.reply_to || Decidim.config.mailer_sender
       mail.delivery_method.settings.merge!(
         address: organization.smtp_settings["address"],
         port: organization.smtp_settings["port"],

data/app/mailers/decidim/decidim_devise_mailer.rb

@@ -6,6 +6,7 @@ module Decidim
   class DecidimDeviseMailer < ::Devise::Mailer
     include LocalisedMailer
     include Decidim::SanitizeHelper
+
     helper_method :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute
 
     layout "decidim/mailer"