decidim-core 0.28.0 → 0.28.1

data/lib/decidim/core/test/shared_examples/amendable/amendment_created_event_examples.rb

@@ -12,36 +12,16 @@ shared_examples "amendment created event" do
   end
 
   it_behaves_like "a simple event"
+  it_behaves_like "a simple event email"
+  it_behaves_like "a simple event notification"
 
   let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
   let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
 
-  describe "email_subject" do
-    it "is generated correctly" do
-      expect(subject.email_subject).to eq("New amendment for #{amendable_title}")
-    end
-  end
-
-  describe "email_intro" do
-    it "is generated correctly" do
-      expect(subject.email_intro)
-        .to eq("A new amendment has been created for #{amendable_title}. You can see it from this page:")
-    end
-  end
-
-  describe "email_outro" do
-    it "is generated correctly" do
-      expect(subject.email_outro)
-        .to eq("You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link.")
-    end
-  end
-
-  describe "notification_title" do
-    it "is generated correctly" do
-      expect(subject.notification_title)
-        .to eq("A new amendment has been created for <a href=\"#{amendable_path}\">#{amendable_title}</a>.")
-    end
-  end
+  let(:email_subject) { "New amendment for #{amendable_title}" }
+  let(:email_intro) { "A new amendment has been created for #{amendable_title}. You can see it from this page:" }
+  let(:email_outro) { "You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link." }
+  let(:notification_title) { "A new amendment has been created for <a href=\"#{amendable_path}\">#{amendable_title}</a>." }
 end

data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb

@@ -7,36 +7,18 @@ shared_examples "amendment promoted event" do
   let(:event_name) { "decidim.events.amendments.amendment_promoted" }
 
   it_behaves_like "a simple event"
+  it_behaves_like "a simple event email"
+  it_behaves_like "a simple event notification"
 
   let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
   let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
   let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
   let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
 
-  describe "email_subject" do
-    it "is generated correctly" do
-      expect(subject.email_subject).to eq("An amendment from #{emendation_author_nickname} has been published as a new proposal")
-    end
-  end
-
-  describe "email_intro" do
-    it "is generated correctly" do
-      expect(subject.email_intro)
-        .to eq("A rejected amendment for #{amendable_title} has been published as a new #{amendable_type}. You can see it from this page:")
-    end
-  end
-
-  describe "email_outro" do
-    it "is generated correctly" do
-      expect(subject.email_outro)
-        .to eq("You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link.")
-    end
-  end
-
-  describe "notification_title" do
-    it "is generated correctly" do
-      expect(subject.notification_title)
-        .to eq("A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>.") # rubocop:disable Layout/LineLength
-    end
-  end
+  let(:email_subject) { "An amendment from #{emendation_author_nickname} has been published as a new proposal" }
+  let(:email_intro) { "A rejected amendment for #{amendable_title} has been published as a new #{amendable_type}. You can see it from this page:" }
+  let(:email_outro) { "You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link." }
+  # rubocop:disable Layout/LineLength
+  let(:notification_title) { "A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>." }
+  # rubocop:enable Layout/LineLength
 end

data/lib/decidim/core/test/shared_examples/has_attachment_collections.rb

@@ -13,13 +13,13 @@ shared_examples_for "has attachment collections" do
     end
 
     it "shows them" do
-      expect(page).to have_content(/#{translated(attachment_collection.name, locale: :en)}/i)
+      expect(page).to have_content(translated(attachment_collection.name))
     end
 
     it "show their documents" do
       within "[id*=documents-#{attachment_collection.id}]", visible: false do
-        expect(page).to have_content(:all, /#{translated(document.title, locale: :en)}/i)
-        expect(page).not_to have_content(:all, /#{translated(other_document.title, locale: :en)}/i)
+        expect(page).to have_content(:all, translated(document.title))
+        expect(page).not_to have_content(:all, translated(other_document.title))
       end
     end
   end
@@ -36,7 +36,9 @@ shared_examples_for "has attachment collections" do
     end
 
     it "shows them ordered" do
-      expect(translated(first_attachment_collection.name, locale: :en)).to appear_before(translated(last_attachment_collection.name, locale: :en))
+      expect(decidim_escape_translated(first_attachment_collection.name).gsub(""",
+                                                                              "\"")).to appear_before(decidim_escape_translated(last_attachment_collection.name).gsub(""",
+                                                                                                                                                                      "\""))
     end
   end
 
@@ -50,8 +52,8 @@ shared_examples_for "has attachment collections" do
     end
 
     it "is not present" do
-      expect(page).to have_content(/#{translated(attachment_collection.name, locale: :en)}/i)
-      expect(page).not_to have_content(/#{translated(empty_attachment_collection.name, locale: :en)}/i)
+      expect(page).to have_content(translated(attachment_collection.name))
+      expect(page).not_to have_content(translated(empty_attachment_collection.name))
     end
   end
 end

data/lib/decidim/core/test/shared_examples/has_attachments.rb

@@ -14,7 +14,7 @@ shared_examples_for "has attachments content blocks" do
 
     it "shows them" do
       within "[data-content] .documents__container" do
-        expect(page).to have_content(/#{translated(document.title, locale: :en)}/i)
+        expect(page).to have_content(translated(document.title))
       end
 
       within "[data-content] [data-gallery]" do
@@ -27,7 +27,7 @@ shared_examples_for "has attachments content blocks" do
     let!(:last_document) { create(:attachment, :with_pdf, attached_to:, weight: 2) }
     let!(:first_document) { create(:attachment, :with_pdf, attached_to:, weight: 1) }
     let!(:last_image) { create(:attachment, attached_to:, weight: 2) }
-    let!(:fist_image) { create(:attachment, attached_to:, weight: 1) }
+    let!(:first_image) { create(:attachment, attached_to:, weight: 1) }
 
     before do
       visit current_path
@@ -35,11 +35,11 @@ shared_examples_for "has attachments content blocks" do
 
     it "shows them ordered" do
       within "[data-content] .documents__container" do
-        expect(translated(first_document.title, locale: :en)).to appear_before(translated(last_document.title, locale: :en))
+        expect(decidim_escape_translated(first_document.title).gsub(""", "\"")).to appear_before(decidim_escape_translated(last_document.title).gsub(""", "\""))
       end
 
       within "[data-content] [data-gallery]" do
-        expect(strip_tags(translated(fist_image.title, locale: :en))).to appear_before(strip_tags(translated(last_image.title, locale: :en)))
+        expect(strip_tags(translated(first_image.title, locale: :en))).to appear_before(strip_tags(translated(last_image.title, locale: :en)))
       end
     end
   end
@@ -58,7 +58,7 @@ shared_examples_for "has attachments tabs" do
     it "shows them" do
       find("li [data-controls='panel-documents']").click
       within "#panel-documents" do
-        expect(page).to have_content(/#{translated(document.title, locale: :en)}/i)
+        expect(page).to have_content(translated(document.title))
       end
 
       find("li [data-controls='panel-images']").click
@@ -72,7 +72,7 @@ shared_examples_for "has attachments tabs" do
     let!(:last_document) { create(:attachment, :with_pdf, attached_to:, weight: 2) }
     let!(:first_document) { create(:attachment, :with_pdf, attached_to:, weight: 1) }
     let!(:last_image) { create(:attachment, attached_to:, weight: 2) }
-    let!(:fist_image) { create(:attachment, attached_to:, weight: 1) }
+    let!(:first_image) { create(:attachment, attached_to:, weight: 1) }
 
     before do
       visit current_path
@@ -81,12 +81,12 @@ shared_examples_for "has attachments tabs" do
     it "shows them ordered" do
       find("li [data-controls='panel-documents']").click
       within "#panel-documents" do
-        expect(translated(first_document.title, locale: :en)).to appear_before(translated(last_document.title, locale: :en))
+        expect(decidim_escape_translated(first_document.title).gsub(""", "\"")).to appear_before(decidim_escape_translated(last_document.title).gsub(""", "\""))
       end
 
       find("li [data-controls='panel-images']").click
       within "#panel-images" do
-        expect(strip_tags(translated(fist_image.title, locale: :en))).to appear_before(strip_tags(translated(last_image.title, locale: :en)))
+        expect(strip_tags(translated(first_image.title, locale: :en))).to appear_before(strip_tags(translated(last_image.title, locale: :en)))
       end
     end
   end

data/lib/decidim/core/test/shared_examples/has_category.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 shared_examples_for "has category" do
+  let(:participatory_space) { subject.participatory_space }
+
   context "when the category is from another organization" do
     before do
       subject.category = create(:category)
@@ -8,4 +10,29 @@ shared_examples_for "has category" do
 
     it { is_expected.not_to be_valid }
   end
+
+  context "when the category is from the same organization" do
+    before do
+      subject.category = create(:category, participatory_space:)
+    end
+
+    it { is_expected.to be_valid }
+  end
+
+  context "when the resource is being deleted" do
+    before do
+      subject.category = create(:category, participatory_space:)
+      subject.save!
+    end
+
+    it "persists the categorization" do
+      expect(subject.categorization).to be_persisted
+    end
+
+    it "deletes the categorization" do
+      expect(Decidim::Categorization.count).to eq(1)
+      expect { subject.destroy }.to change(Decidim::Categorization, :count).by(-1)
+      expect(Decidim::Categorization.count).to eq(0)
+    end
+  end
 end

data/lib/decidim/core/test/shared_examples/has_reference.rb

@@ -8,7 +8,7 @@ shared_examples_for "has reference" do
 
     context "when there is not a custom resource reference generator present" do
       it "generates a valid reference" do
-        expect(subject.reference).to match(/[A-z]+/)
+        expect(subject.reference).to match(/[a-zA-Z]+/)
       end
     end
 

data/lib/decidim/core/test/shared_examples/has_space_in_mcell_examples.rb

@@ -8,7 +8,7 @@ shared_examples_for "has space in m-cell" do
     let(:show_space) { true }
 
     it "renders the space where the model belongs to" do
-      expect(cell_html).to have_content(translated(model.component.participatory_space.title, locale: :en))
+      expect(cell_html).to have_content(decidim_escape_translated(model.component.participatory_space.title))
     end
   end
 end

data/lib/decidim/core/test/shared_examples/map_examples.rb

@@ -99,6 +99,8 @@ shared_context "with frontend map elements" do
   let(:html_body) { "" }
 
   before do
+    # Create a favicon so it does not fail when trying to fetch it
+    favicon = ""
     # Create a temporary route to display the generated HTML in a correct site
     # context.
     final_html = html_document
@@ -106,6 +108,7 @@ shared_context "with frontend map elements" do
       get "maptiles/:z/:x/:y.png", to: ->(_) { [200, {}, [final_html]] }
       get "test_dynamic_map", to: ->(_) { [200, {}, [final_html]] }
       get "offline", to: ->(_) { [200, {}, [""]] }
+      get "/favicon.ico", to: ->(_) { [200, {}, [favicon]] }
     end
 
     visit "/test_dynamic_map"

data/lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb

@@ -35,17 +35,20 @@ shared_examples_for "resource endorsed event" do
   end
 
   describe "email_intro" do
+    let(:resource_title) { decidim_sanitize_translated(resource.title) }
     it "is generated correctly" do
       expect(subject.email_intro)
         .to eq("#{author.name} #{author_presenter.nickname}, who you are following, " \
-               "has just endorsed \"#{translated resource.title}\" and we think it may be interesting to you. Check it out and contribute:")
+               "has just endorsed \"#{resource_title}\" and we think it may be interesting to you. Check it out and contribute:")
     end
   end
 
   describe "notification_title" do
+    let(:resource_title) { decidim_sanitize_translated(resource.title) }
+
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to include("The <a href=\"#{resource_path}\">#{translated resource.title}</a> #{resource_type} has been endorsed by ")
+        .to include("The <a href=\"#{resource_path}\">#{resource_title}</a> #{resource_type} has been endorsed by ")
 
       expect(subject.notification_title)
         .to include("<a href=\"/profiles/#{author.nickname}\">#{author.name} #{author_presenter.nickname}</a>.")

data/lib/decidim/core/test/shared_examples/resource_locator_presenter_examples.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "generates routes without query strings on slug" do
+  let(:organization) { create(:organization, host: "1.lvh.me") }
+  let(:participatory_space) { create(factory_name, organization:) }
+  let(:component) { create(:component, id: 1, participatory_space:) }
+  let(:resource) { create(:dummy_resource, id: 1, component:) }
+
+  context "with a component resource" do
+    describe "#url" do
+      subject { described_class.new(resource).url }
+
+      it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/#{route_fragment}/f/1/dummy_resources/1") }
+
+      context "when specific port configured" do
+        before do
+          allow(ActionMailer::Base)
+            .to receive(:default_url_options)
+            .and_return(port: 3000)
+        end
+
+        it { is_expected.to eq("http://1.lvh.me:3000/#{route_fragment}/f/1/dummy_resources/1") }
+      end
+    end
+
+    describe "#path" do
+      subject { described_class.new(resource).path }
+
+      it { is_expected.to eq("/#{route_fragment}/f/1/dummy_resources/1") }
+    end
+
+    describe "#show" do
+      subject { described_class.new(participatory_space).show }
+
+      it { is_expected.to eq("/admin/#{admin_route_fragment}") }
+    end
+
+    describe "#edit" do
+      subject { described_class.new(participatory_space).edit }
+
+      it { is_expected.to eq("/admin/#{admin_route_fragment}/edit") }
+    end
+  end
+
+  context "with a polymorphic resource" do
+    let(:nested_resource) do
+      create(:nested_dummy_resource, id: 1, dummy_resource: resource)
+    end
+
+    describe "#url" do
+      subject { described_class.new([resource, nested_resource]).url }
+
+      it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources/1") }
+
+      context "when specific port configured" do
+        before do
+          allow(ActionMailer::Base)
+            .to receive(:default_url_options)
+            .and_return(port: 3000)
+        end
+
+        it { is_expected.to eq("http://1.lvh.me:3000/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources/1") }
+      end
+    end
+
+    describe "#path" do
+      subject { described_class.new([resource, nested_resource]).path }
+
+      it { is_expected.to eq("/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources/1") }
+    end
+
+    describe "#index" do
+      subject { described_class.new([resource, nested_resource]).index }
+
+      it { is_expected.to eq("/#{route_fragment}/f/1/dummy_resources/1/nested_dummy_resources") }
+    end
+
+    describe "#admin_index" do
+      subject { described_class.new([resource, nested_resource]).admin_index }
+
+      it { is_expected.to eq("/admin/#{admin_route_fragment}/components/1/manage/dummy_resources/1/nested_dummy_resources") }
+    end
+
+    describe "#show" do
+      subject { described_class.new([resource, nested_resource]).show }
+
+      it { is_expected.to eq("/admin/#{admin_route_fragment}/components/1/manage/dummy_resources/1/nested_dummy_resources/1") }
+    end
+
+    describe "#edit" do
+      subject { described_class.new([resource, nested_resource]).edit }
+
+      it { is_expected.to eq("/admin/#{admin_route_fragment}/components/1/manage/dummy_resources/1/nested_dummy_resources/1/edit") }
+    end
+  end
+
+  context "with a participatory_space" do
+    describe "#url" do
+      subject { described_class.new(participatory_space).url }
+
+      it { is_expected.to eq("http://1.lvh.me:#{Capybara.server_port}/#{route_fragment}") }
+
+      context "when specific port configured" do
+        before do
+          allow(ActionMailer::Base)
+            .to receive(:default_url_options)
+            .and_return(port: 3000)
+        end
+
+        it { is_expected.to eq("http://1.lvh.me:3000/#{route_fragment}") }
+      end
+    end
+
+    describe "#path" do
+      subject { described_class.new(participatory_space).path }
+
+      it { is_expected.to eq("/#{route_fragment}") }
+    end
+
+    describe "#show" do
+      subject { described_class.new(participatory_space).show }
+
+      it { is_expected.to eq("/admin/#{admin_route_fragment}") }
+    end
+
+    describe "#edit" do
+      subject { described_class.new(participatory_space).edit }
+
+      it { is_expected.to eq("/admin/#{admin_route_fragment}/edit") }
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/simple_event.rb

@@ -28,10 +28,10 @@ shared_context "when a simple event" do
   let(:extra) { {} }
   let(:resource_path) { resource_locator(resource).path }
   let(:resource_url) { resource_locator(resource).url }
-  let(:resource_title) { resource.title["en"] }
+  let(:resource_title) { decidim_sanitize_translated(resource.title) }
   # to be used when resource is a component resource, not a participatory space, in which case should be overriden
   let(:participatory_space) { resource.participatory_space }
-  let(:participatory_space_title) { participatory_space.title["en"] }
+  let(:participatory_space_title) { decidim_sanitize_translated(participatory_space.title) }
   let(:participatory_space_path) { Decidim::ResourceLocatorPresenter.new(participatory_space).path }
   let(:participatory_space_url) { Decidim::ResourceLocatorPresenter.new(participatory_space).url }
   let(:author) do
@@ -65,6 +65,7 @@ shared_examples_for "a simple event" do |skip_space_checks|
     it "is generated correctly" do
       expect(subject.email_subject).to be_kind_of(String)
       expect(subject.email_subject).not_to include("translation missing")
+      expect(subject.email_subject).not_to include("script")
     end
   end
 
@@ -100,6 +101,7 @@ shared_examples_for "a simple event" do |skip_space_checks|
     it "is generated correctly" do
       expect(subject.notification_title).to be_kind_of(String)
       expect(subject.notification_title).not_to include("translation missing")
+      expect(subject.notification_title).not_to include("script")
     end
   end
 
@@ -129,6 +131,12 @@ shared_examples_for "a simple event" do |skip_space_checks|
         expect(subject.participatory_space_url).to start_with("http")
       end
     end
+
+    describe "participatory_space_title" do
+      it "is generated correctly" do
+        expect(translated(participatory_space.title)).to include("script")
+      end
+    end
   end
 
   describe "i18n_options" do
@@ -158,6 +166,10 @@ shared_examples_for "a simple event email" do
     it "is generated correctly" do
       expect(subject.email_subject).to eq(email_subject)
     end
+
+    it "is html safe" do
+      expect(subject.email_subject).not_to include("script")
+    end
   end
 
   describe "email_intro" do
@@ -179,5 +191,9 @@ shared_examples_for "a simple event notification" do
       expect(subject.notification_title)
         .to eq(notification_title)
     end
+
+    it "is html safe" do
+      expect(subject.notification_title).not_to include("script")
+    end
   end
 end

data/lib/decidim/core/test.rb

@@ -77,3 +77,4 @@ require "decidim/core/test/shared_examples/digest_mail_examples"
 require "decidim/core/test/shared_examples/hideable_resource_examples"
 require "decidim/core/test/shared_examples/active_support_examples"
 require "decidim/core/test/shared_examples/statistics_cell_examples"
+require "decidim/core/test/shared_examples/resource_locator_presenter_examples"

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.28.0"
+      "0.28.1"
     end
   end
 end

data/lib/decidim/core.rb

@@ -122,6 +122,7 @@ module Decidim
   autoload :ModerationTools, "decidim/moderation_tools"
   autoload :ContentSecurityPolicy, "decidim/content_security_policy"
   autoload :IconRegistry, "decidim/icon_registry"
+  autoload :HasConversations, "decidim/has_conversations"
 
   include ActiveSupport::Configurable
   # Loads seeds from all engines.

data/lib/decidim/engine_router.rb

@@ -16,7 +16,7 @@ module Decidim
     #
     # @return [EngineRouter] The new engine router
     def self.main_proxy(target)
-      new(target.mounted_engine, target.mounted_params)
+      new(target.mounted_engine, target.mounted_params, target)
     end
 
     # Instantiates a router to the backend engine for an object.
@@ -25,12 +25,13 @@ module Decidim
     #
     # @return [EngineRouter] The new engine router
     def self.admin_proxy(target)
-      new(target.mounted_admin_engine, target.mounted_params)
+      new(target.mounted_admin_engine, target.mounted_params, target)
     end
 
-    def initialize(engine, default_url_options)
+    def initialize(engine, default_url_options, target = nil)
       @engine = engine
       @default_url_options = default_url_options
+      @target = target
     end
 
     def default_url_options
@@ -44,11 +45,23 @@ module Decidim
     def method_missing(method_name, *args)
       return super unless route_helper?(method_name)
 
-      send(@engine).send(method_name, *args)
+      filter_slug_params!(method_name)
+
+      send(engine).send(method_name, *args)
     end
 
     private
 
+    attr_reader :engine, :target
+
+    def filter_slug_params!(method_name)
+      return if target.nil?
+      return unless target.respond_to?(:mounted_params)
+
+      skip_space_slug = target.respond_to?(:slug_param_name) && target.respond_to?(:skip_space_slug?) && target.skip_space_slug?(method_name)
+      @default_url_options.except!(target.slug_param_name) if skip_space_slug == true
+    end
+
     def route_helper?(method_name)
       method_name.to_s.match?(/_(url|path)$/)
     end

data/lib/decidim/events/base_event.rb

@@ -7,7 +7,7 @@ module Decidim
     # notifications dashboard and to generate other notifications (emails, for example).
     class BaseEvent
       extend ActiveModel::Translation
-      include Decidim::TranslatableAttributes
+      include Decidim::SanitizeHelper
 
       class_attribute :types
       self.types = []
@@ -103,9 +103,9 @@ module Decidim
         return unless resource
 
         title = if resource.respond_to?(:title)
-                  translated_attribute(resource.title)
+                  decidim_sanitize_translated(resource.title)
                 elsif resource.respond_to?(:name)
-                  translated_attribute(resource.name)
+                  decidim_sanitize_translated(resource.name)
                 end
 
         Decidim::ContentProcessor.render_without_format(title, links: false).html_safe

data/lib/decidim/events/simple_event.rb

@@ -11,7 +11,6 @@ module Decidim
       include Decidim::Events::EmailEvent
       include Decidim::Events::NotificationEvent
       include Decidim::ComponentPathHelper
-      include Decidim::SanitizeHelper
 
       delegate :created_at, to: :resource
 
@@ -34,14 +33,7 @@ module Decidim
       end
 
       def email_subject
-        I18n.t("email_subject", **email_subject_i18n_options).html_safe
-      end
-
-      def email_subject_i18n_options
-        sanitized_values = { resource_title: decidim_sanitize(resource_title) }
-        sanitized_values[:mentioned_proposal_title] = decidim_sanitize(mentioned_proposal_title) if i18n_options.has_key?(:mentioned_proposal_title)
-        sanitized_values[:participatory_space_title] = decidim_sanitize(participatory_space_title) if i18n_options.has_key?(:participatory_space_title)
-        i18n_options.merge(sanitized_values)
+        I18n.t("email_subject", **i18n_options).html_safe
       end
 
       def email_intro
@@ -77,13 +69,7 @@ module Decidim
 
       # Public: The Hash of options to pass to the I18.t method.
       def i18n_options
-        default_i18n_options.merge(event_interpolations).transform_values do |value|
-          if value.is_a?(String)
-            decidim_html_escape(value)
-          else
-            value
-          end
-        end
+        default_i18n_options.merge(event_interpolations)
       end
 
       # Caches the path for the given resource when it is a Decidim::Component.
@@ -136,7 +122,7 @@ module Decidim
       end
 
       def participatory_space_title
-        translated_attribute(participatory_space.try(:title))
+        decidim_sanitize_translated(participatory_space.try(:title))
       end
     end
   end