X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d187c5c711c5381872c21309fa74087b4896c49..f0764d3ecae3aa9251eadff96990f4afe530924d:/app/helpers/title_helper.rb

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index 8cacdf208..93f1b9ea5 100644
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,11 +1,17 @@
 module TitleHelper
-  def set_title(title = false)
+  def self.coder
+    @coder ||= HTMLEntities.new
+  end
+
+  def set_title(title = nil)
+    project_title = t("layouts.project_name.title")
+
     if title
-      @title = title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c")
-      response.headers["X-Page-Title"] = t('layouts.project_name.title') + ' | ' + @title
+      @title = TitleHelper.coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
+      response.headers["X-Page-Title"] = ERB::Util.u("#{@title} | #{project_title}")
     else
       @title = title
-      response.headers["X-Page-Title"] = t('layouts.project_name.title')
+      response.headers["X-Page-Title"] = ERB::Util.u(project_title)
     end
   end
 end