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

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

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index da4ad8967e3c72616a7232041b319d2aab49af6d..93f1b9ea5d1ea215bd9c13bfc5e9191acd6dd4aa 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,6 +1,17 @@
 module TitleHelper
-  def set_title(title = false)
-    response.headers["X-Page-Title"] = t('layouts.project_name.title') + (title ? ' | ' + title : '')
-    @title = title
+  def self.coder
+    @coder ||= HTMLEntities.new
+  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"))
+      response.headers["X-Page-Title"] = ERB::Util.u("#{@title} | #{project_title}")
+    else
+      @title = title
+      response.headers["X-Page-Title"] = ERB::Util.u(project_title)
+    end
   end
 end