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~3280
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cb87f02642d0097ebc067ca1f9371dde274a41e3?hp=15b104f4ff4614aa78c01180b6a9b89dd5a1400f

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

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index ebe5c3a26..88a5a2a74 100644
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -8,7 +8,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(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"] = ERB::Util.u(t("layouts.project_name.title"))
diff --git a/test/helpers/title_helper_test.rb b/test/helpers/title_helper_test.rb
index 25486f799..c30f793d3 100644
--- a/test/helpers/title_helper_test.rb
+++ b/test/helpers/title_helper_test.rb
@@ -12,15 +12,15 @@ class TitleHelperTest < ActionView::TestCase
     assert_nil @title
 
     set_title("Test Title")
-    assert_equal "OpenStreetMap%20%7C%20Test%20Title", 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%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