Merge remote-tracking branch 'upstream/pull/5387'

[rails.git] / app / helpers / title_helper.rb

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index 16470343656a1880a25eae74e6be6ba4c6417f38..93f1b9ea5d1ea215bd9c13bfc5e9191acd6dd4aa 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -4,12 +4,14 @@ module TitleHelper
   end
 
   def set_title(title = nil)
   end
 
   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"))
     if title
       @title = TitleHelper.coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))

-      response.headers["X-Page-Title"] = ERB::Util.u(@title + " | " + t("layouts.project_name.title"))
+      response.headers["X-Page-Title"] = ERB::Util.u("#{@title} | #{project_title}")

     else
       @title = title
     else
       @title = title

-      response.headers["X-Page-Title"] = ERB::Util.u(t("layouts.project_name.title"))
+      response.headers["X-Page-Title"] = ERB::Util.u(project_title)

     end
   end
 end
     end
   end
 end