X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/da7ed512a89013d97e1b1f87d7ef6136c16864dd..8a6c34fa78cf4fa52332d90448dae50087f2b510:/app/helpers/title_helper.rb

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index e72069ff0..93f1b9ea5 100644
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,15 +1,17 @@
-require 'htmlentities'
-
 module TitleHelper
-  @@coder = HTMLEntities.new
+  def self.coder
+    @coder ||= HTMLEntities.new
+  end
+
+  def set_title(title = nil)
+    project_title = t("layouts.project_name.title")
 
-  def set_title(title = false)
     if title
-      @title = @@coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
-      response.headers["X-Page-Title"] = @title + ' | ' + t('layouts.project_name.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