openstreetmap · 1ec5 · Jul 28, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024
diff --git a/config/locales/en.yml b/config/locales/en.yml
diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb
@@ -381,7 +381,7 @@ def test_search_osm_nominatim
       post geocoder_search_osm_nominatim_path(:query => "Broxbourne", :zoom => 10,
                                               :minlon => -0.559, :minlat => 51.217,
                                               :maxlon => 0.836, :maxlat => 51.766), :xhr => true
-      results_check({ "prefix" => "Suburb",
+      results_check({ "prefix" => "Urban District",
                       "name" => "Broxbourne, Hertfordshire, East of England, England, United Kingdom",
                       "min-lat" => 51.7265723, "max-lat" => 51.7665723,
                       "min-lon" => -0.0390782, "max-lon" => 0.0009218,
@@ -391,7 +391,7 @@ def test_search_osm_nominatim
                       "min-lat" => 51.6808751, "max-lat" => 51.7806237,
                       "min-lon" => -0.114204, "max-lon" => 0.0145267,
                       "type" => "relation", "id" => 2677978 },
-                    { "prefix" => "Railway Station",
+                    { "prefix" => "Train Station",
                       "name" => "Broxbourne, Stafford Drive, Broxbourne, Hertfordshire, East of England, England, United Kingdom",
                       "min-lat" => 51.7418469, "max-lat" => 51.7518469,
                       "min-lon" => -0.0156773, "max-lon" => -0.0056773,

diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
@@ -245,7 +245,7 @@ def test_reply
     # Check that we can't reply to somebody else's message
     get message_reply_path(message)
     assert_redirected_to login_path(:referer => message_reply_path(message))
-    assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice]
+    assert_equal "You are logged in as \"#{other_user.display_name}\", but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice]
 
     # Login as the right user
     session_for(recipient_user)
@@ -287,7 +287,7 @@ def test_show
     # Check that we can't read the message
     get message_path(message)
     assert_redirected_to login_path(:referer => message_path(message))
-    assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.", flash[:notice]
+    assert_equal "You are logged in as \"#{other_user.display_name}\", but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.", flash[:notice]
 
     # Login as the message sender
     session_for(user)

diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb
@@ -344,7 +344,7 @@ def test_create
                             :user_block_period => "99")
     end
     assert_redirected_to new_user_block_path(target_user)
-    assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
+    assert_equal "The blocking period must be one of the values selectable in the dropdown list.", flash[:error]
 
     # Check that creating a block works
     assert_difference "UserBlock.count", 1 do
@@ -430,7 +430,7 @@ def test_update
       put user_block_path(:id => active_block, :user_block_period => "99")
     end
     assert_redirected_to edit_user_block_path(active_block)
-    assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
+    assert_equal "The blocking period must be one of the values selectable in the dropdown list.", flash[:error]
 
     # Check that updating a block works
     assert_no_difference "UserBlock.count" do

diff --git a/test/controllers/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb
@@ -71,7 +71,7 @@ def test_grant
       post grant_role_path(target_user, "no_such_role")
     end
     assert_redirected_to user_path(target_user)
-    assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
+    assert_equal "The string \"no_such_role\" is not a valid role.", flash[:error]
   end
 
   ##
@@ -131,7 +131,7 @@ def test_revoke
       post revoke_role_path(target_user, "no_such_role")
     end
     assert_redirected_to user_path(target_user)
-    assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
+    assert_equal "The string \"no_such_role\" is not a valid role.", flash[:error]
 
     # Revoking administrator role from current user should fail
     post revoke_role_path(administrator_user, "administrator")

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
@@ -57,7 +57,7 @@ def test_dir
 
   def test_friendly_date
     date = friendly_date(Time.utc(2014, 3, 5, 18, 58, 23))
-    assert_match %r{^<time title=" *5 March 2014 at 18:58" datetime="2014-03-05T18:58:23Z">.*</time>$}, date
+    assert_match %r{^<time title="March  5, 2014, at  6:58 PM" datetime="2014-03-05T18:58:23Z">.*</time>$}, date
 
     date = friendly_date(Time.now.utc - 1.hour)
     assert_match %r{^<time title=".*">about 1 hour</time>$}, date
@@ -74,7 +74,7 @@ def test_friendly_date
 
   def test_friendly_date_ago
     date = friendly_date_ago(Time.utc(2014, 3, 5, 18, 58, 23))
-    assert_match %r{^<time title=" *5 March 2014 at 18:58" datetime="2014-03-05T18:58:23Z">.*</time>$}, date
+    assert_match %r{^<time title="March  5, 2014, at  6:58 PM" datetime="2014-03-05T18:58:23Z">.*</time>$}, date
 
     date = friendly_date_ago(Time.now.utc - 1.hour)
     assert_match %r{^<time title=".*">about 1 hour ago</time>$}, date

diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb
@@ -8,8 +8,8 @@ def test_note_event
     date = Time.utc(2014, 3, 5, 21, 37, 45)
     user = create(:user)
 
-    assert_match %r{^Created by anonymous <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("opened", date, nil)
-    assert_match %r{^Resolved by <a href="/user/#{ERB::Util.u(user.display_name)}">#{user.display_name}</a> <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("closed", date, user)
+    assert_match %r{^Created by anonymous <time title="March  5, 2014, at  9:37 PM" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("opened", date, nil)
+    assert_match %r{^Resolved by <a href="/user/#{ERB::Util.u(user.display_name)}">#{user.display_name}</a> <time title="March  5, 2014, at  9:37 PM" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("closed", date, user)
   end
 
   def test_note_author

diff --git a/test/system/user_blocks_test.rb b/test/system/user_blocks_test.rb
@@ -48,7 +48,7 @@ class ReportNoteTest < ApplicationSystemTestCase
     click_on "Revoke all blocks"
     assert_title "Revoking all blocks on #{blocked_user.display_name}"
     assert_text "Revoking all blocks on #{blocked_user.display_name}"
-    assert_unchecked_field "Are you sure you wish to revoke 1 active block?"
+    assert_unchecked_field "Are you sure you want to revoke 1 active block?"
     assert_button "Revoke!"
   end
 
@@ -65,7 +65,7 @@ class ReportNoteTest < ApplicationSystemTestCase
     click_on "Revoke all blocks"
     assert_title "Revoking all blocks on #{blocked_user.display_name}"
     assert_text "Revoking all blocks on #{blocked_user.display_name}"
-    assert_unchecked_field "Are you sure you wish to revoke 2 active blocks?"
+    assert_unchecked_field "Are you sure you want to revoke 2 active blocks?"
     assert_button "Revoke!"
   end
 end