Merge remote-tracking branch 'upstream/pull/2921' into master

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

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index 88a5a2a74ae3a42a6970fdd94239d11d9efcf9c9..099af86815264d1f8bc4a3bb98e472e63aae7c86 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,5 +1,3 @@
-require "htmlentities"
-
 module TitleHelper
   def self.coder
     @coder ||= HTMLEntities.new
@@ -8,7 +6,7 @@ module TitleHelper
   def set_title(title = nil)
     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} | #{t('layouts.project_name.title')}")
     else
       @title = title
       response.headers["X-Page-Title"] = ERB::Util.u(t("layouts.project_name.title"))