Page titles: put specific page title at the start not the end

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index a1a2125a173f81a72f2b53dcdccecdb3b9322e3f..e72069ff013a6a51308341f3ca2643f50b2db35a 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -6,7 +6,7 @@ module TitleHelper
   def set_title(title = false)
     if title
       @title = @@coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
   def set_title(title = false)
     if title
       @title = @@coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))

-      response.headers["X-Page-Title"] = t('layouts.project_name.title') + ' | ' + @title
+      response.headers["X-Page-Title"] = @title + ' | ' + t('layouts.project_name.title')

     else
       @title = title
       response.headers["X-Page-Title"] = t('layouts.project_name.title')
     else
       @title = title
       response.headers["X-Page-Title"] = t('layouts.project_name.title')

diff --git a/test/helpers/title_helper_test.rb b/test/helpers/title_helper_test.rb
index 11578cc111d2e65265d7d59e123cf464dc521612..97ccd7537216772d4697480e05e5d6bdb0ffb1f8 100644 (file)
--- a/test/helpers/title_helper_test.rb
+++ b/test/helpers/title_helper_test.rb
@@ -7,11 +7,11 @@ class TitleHelperTest < ActionView::TestCase
     assert_nil @title
 
     set_title("Test Title")
     assert_nil @title
 
     set_title("Test Title")

-    assert_equal "OpenStreetMap | Test Title", response.header["X-Page-Title"]
+    assert_equal "Test Title | OpenStreetMap", response.header["X-Page-Title"]

     assert_equal "Test Title", @title
 
     set_title("Test & Title")
     assert_equal "Test Title", @title
 
     set_title("Test & Title")

-    assert_equal "OpenStreetMap | Test & Title", response.header["X-Page-Title"]
+    assert_equal "Test & Title | OpenStreetMap", response.header["X-Page-Title"]

     assert_equal "Test & Title", @title
   end
 end
     assert_equal "Test & Title", @title
   end
 end