From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 22 Nov 2017 14:42:16 +0000 (+0000)
Subject: Merge branch 'pull/843' into titles
X-Git-Tag: live~3228
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cb87f02642d0097ebc067ca1f9371dde274a41e3?hp=-c

Merge branch 'pull/843' into titles
---

cb87f02642d0097ebc067ca1f9371dde274a41e3
diff --combined app/helpers/title_helper.rb
index ebe5c3a26,e72069ff0..88a5a2a74
--- a/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 --combined test/helpers/title_helper_test.rb
index 25486f799,97ccd7537..c30f793d3
--- a/test/helpers/title_helper_test.rb
+++ b/test/helpers/title_helper_test.rb
@@@ -1,26 -1,17 +1,26 @@@
 -require 'test_helper'
 +
 +require "test_helper"
  
  class TitleHelperTest < ActionView::TestCase
    def test_set_title
 +    set_title
 +    assert_equal "OpenStreetMap", response.header["X-Page-Title"]
 +    assert_nil @title
 +
      set_title(nil)
      assert_equal "OpenStreetMap", response.header["X-Page-Title"]
      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
 +
 +    set_title("Tést & Tïtlè")
-     assert_equal "OpenStreetMap%20%7C%20T%C3%A9st%20%26%20T%C3%AFtl%C3%A8", response.header["X-Page-Title"]
++    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