Merge branch 'pull/843' into titles

diff --cc app/helpers/title_helper.rb
index ebe5c3a2631ca27f314d64835c400d35daa25812,e72069ff013a6a51308341f3ca2643f50b2db35a..88a5a2a74ae3a42a6970fdd94239d11d9efcf9c9
--- 1/app/helpers/title_helper.rb
--- 2/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@@ -1,17 -1,15 +1,17 @@@
 -require 'htmlentities'
 +require "htmlentities"
  
  module TitleHelper
 -  @@coder = HTMLEntities.new
 +  def self.coder
 +    @coder ||= HTMLEntities.new
 +  end
  
 -  def set_title(title = false)
 +  def set_title(title = nil)
      if title
 -      @title = @@coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
 -      response.headers["X-Page-Title"] = @title + ' | ' + t('layouts.project_name.title')
 +      @title = TitleHelper.coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
-       response.headers["X-Page-Title"] = ERB::Util.u(t("layouts.project_name.title") + " | " + @title)
++      response.headers["X-Page-Title"] = ERB::Util.u(@title + " | " + t("layouts.project_name.title"))
      else
        @title = title
 -      response.headers["X-Page-Title"] = t('layouts.project_name.title')
 +      response.headers["X-Page-Title"] = ERB::Util.u(t("layouts.project_name.title"))
      end
    end
  end

diff --cc test/helpers/title_helper_test.rb
index 25486f7991227bcf0adb2b529ec2beb1b1676d98,97ccd7537216772d4697480e05e5d6bdb0ffb1f8..c30f793d3f603f079da6199ac9ddd531b1bd4dd2
--- 1/test/helpers/title_helper_test.rb
--- 2/test/helpers/title_helper_test.rb
+++ b/test/helpers/title_helper_test.rb
@@@ -12,15 -7,11 +12,15 @@@ class TitleHelperTest < ActionView::Tes
      assert_nil @title
  
      set_title("Test Title")
-     assert_equal "OpenStreetMap%20%7C%20Test%20Title", response.header["X-Page-Title"]
 -    assert_equal "Test Title | OpenStreetMap", response.header["X-Page-Title"]
++    assert_equal "Test%20Title%20%7C%20OpenStreetMap", response.header["X-Page-Title"]
      assert_equal "Test Title", @title
  
      set_title("Test & Title")
-     assert_equal "OpenStreetMap%20%7C%20Test%20%26%20Title", response.header["X-Page-Title"]
 -    assert_equal "Test & Title | OpenStreetMap", response.header["X-Page-Title"]
++    assert_equal "Test%20%26%20Title%20%7C%20OpenStreetMap", response.header["X-Page-Title"]
      assert_equal "Test & Title", @title
-     assert_equal "OpenStreetMap%20%7C%20T%C3%A9st%20%26%20T%C3%AFtl%C3%A8", response.header["X-Page-Title"]
 +
 +    set_title("Tést & Tïtlè")
++    assert_equal "T%C3%A9st%20%26%20T%C3%AFtl%C3%A8%20%7C%20OpenStreetMap", response.header["X-Page-Title"]
 +    assert_equal "Tést & Tïtlè", @title
    end
  end