X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a6b84a0294a2929006ff056f56103be549c5b5a2..c47a40c1db59f0d0f836fbcd1b876390befe796e:/app/helpers/title_helper.rb

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