Merge branch 'master' into overpass
[rails.git] / app / helpers / title_helper.rb
index c9b979ad5ed28ea88c4f129710633183a5ec6c39..a1a2125a173f81a72f2b53dcdccecdb3b9322e3f 100644 (file)
@@ -1,11 +1,15 @@
+require 'htmlentities'
+
 module TitleHelper
 module TitleHelper
+  @@coder = HTMLEntities.new
+
   def set_title(title = false)
     if title
   def set_title(title = false)
     if title
-      title = t('layouts.project_name.title') + ' | ' + title
+      @title = @@coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
+      response.headers["X-Page-Title"] = t('layouts.project_name.title') + ' | ' + @title
     else
     else
-      title = t('layouts.project_name.title')
+      @title = title
+      response.headers["X-Page-Title"] = t('layouts.project_name.title')
     end
     end
-    response.headers["X-Page-Title"] = title 
-    @title = title
   end
 end
   end
 end