From a3c5bbbbb63f05dcd3fee542b6eb1985b82d2b72 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:21:34 -0400 Subject: [PATCH 01/14] spelling: (self reference is superfluous) Signed-off-by: Josh Soref --- app/views/users/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 302ec5bd3..dac0ff5b5 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -4,7 +4,7 @@

<%= @user.display_name %> <%= role_icons(@user) %>

<% if current_user and @user.id == current_user.id %> - +
  • <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %> From 907587e74534e1073d63336a5ab63cc81dbcfa5d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:21:35 -0400 Subject: [PATCH 02/14] spelling: abcdefghijklmnopqrstuvwxyz Signed-off-by: Josh Soref --- lib/osm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/osm.rb b/lib/osm.rb index b6dd64b99..005d3ebb8 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -474,7 +474,7 @@ module OSM # Construct a random token of a given length def self.make_token(length = 30) - chars = "abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" + chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" token = "" length.times do From 232233f0375afbdaf562e2525a1ee60017140c90 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:21:42 -0400 Subject: [PATCH 03/14] spelling: beekeeper Signed-off-by: Josh Soref --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 72f02fbf1..ba4c9b201 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -722,7 +722,7 @@ en: sport: "Sportsclub" "yes": "Club" craft: - beekeper: "Beekeeper" + beekeeper: "Beekeeper" blacksmith: "Blacksmith" brewery: "Brewery" carpenter: "Carpenter" From 5ca19befbbcdb96ade6332b4db9413f951447fbc Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:22:37 -0400 Subject: [PATCH 04/14] spelling: extinguisher Signed-off-by: Josh Soref --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index ba4c9b201..1f8786dfe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -752,7 +752,7 @@ en: ambulance_station: "Ambulance Station" assembly_point: "Assembly Point" defibrillator: "Defibrillator" - fire_xtinguisher: "Fire Extinguisher" + fire_extinguisher: "Fire Extinguisher" fire_water_pond: "Fire Water Pond" landing_site: "Emergency Landing Site" life_ring: "Emergency Life Ring" From ff8e1b074a8805df22a4734d72c3b88fbbc91bbf Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:21:55 -0400 Subject: [PATCH 05/14] spelling: forbidden Signed-off-by: Josh Soref --- test/controllers/api/nodes_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/api/nodes_controller_test.rb b/test/controllers/api/nodes_controller_test.rb index b085dee9d..95658842b 100644 --- a/test/controllers/api/nodes_controller_test.rb +++ b/test/controllers/api/nodes_controller_test.rb @@ -86,7 +86,7 @@ module Api end def test_create_invalid_xml - ## Only test public user here, as test_create should cover what's the forbiddens + ## Only test public user here, as test_create should cover what's the forbidden ## that would occur here user = create(:user) From ac155178795d9460c523567fe24cab46b84aa686 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:21:56 -0400 Subject: [PATCH 06/14] spelling: kindergarten Signed-off-by: Josh Soref --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 1f8786dfe..afcac2add 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -697,7 +697,7 @@ en: houseboat: "Houseboat" hut: "Hut" industrial: "Industrial Building" - kindergarten: "Kindergarden Building" + kindergarten: "Kindergarten Building" manufacture: "Manufacturing Building" office: "Office Building" public: "Public Building" From 51ba80dab3951e1847f414152a88c84941bc2e20 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:21:57 -0400 Subject: [PATCH 07/14] spelling: languages Signed-off-by: Josh Soref --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8df126a04..6fc31953d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -17,7 +17,7 @@ class ApplicationController < ActionController::Base helper_method :current_user helper_method :oauth_token - helper_method :preferred_langauges + helper_method :preferred_languages private From 2c93b6e8e10ded721d2a9a088dbcf3158f46f1b1 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:21:58 -0400 Subject: [PATCH 08/14] spelling: layman's Signed-off-by: Josh Soref --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index afcac2add..fce1f8913 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -152,7 +152,7 @@ en: trace: tagstring: comma delimited user_block: - reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms. + reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms. needs_view: Does the user need to log in before this block will be cleared? user: email_confirmation: 'Your address is not displayed publicly, see our privacy policy for more information.' From eee739356fefbd022be57cd2da0fffa53b5e27a2 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:22:01 -0400 Subject: [PATCH 09/14] spelling: modify Signed-off-by: Josh Soref --- test/controllers/api/changesets_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index 567f77fd3..c527c47e5 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -1326,7 +1326,7 @@ module Api - + From 7c7a6b13cc3805a5102c3d89955708cac1dcc41c Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:22:02 -0400 Subject: [PATCH 10/14] spelling: nonexistent Signed-off-by: Josh Soref --- test/system/issues_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb index 4c84d44fc..55e8b1b26 100644 --- a/test/system/issues_test.rb +++ b/test/system/issues_test.rb @@ -58,7 +58,7 @@ class IssuesTest < ApplicationSystemTestCase # User doesn't exist visit issues_path - fill_in "search_by_user", :with => "Nonexistant User" + fill_in "search_by_user", :with => "Nonexistent User" click_on "Search" assert page.has_content?(I18n.t("issues.index.user_not_found")) assert page.has_content?(I18n.t("issues.index.issues_not_found")) From 7ff3d82c03dbea5fb2187b3403ff21eca13ed9e7 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:22:06 -0400 Subject: [PATCH 11/14] spelling: shouldn't Signed-off-by: Josh Soref --- test/controllers/api/changesets_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index c527c47e5..1c5529b50 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -700,7 +700,7 @@ module Api # upload it post changeset_upload_path(changeset), :params => diff, :headers => auth_header assert_response :bad_request, - "shoudln't be able to upload too long a tag to changeset: #{@response.body}" + "shouldn't be able to upload too long a tag to changeset: #{@response.body}" end ## From fc0aee74af892154525ed0183d95eacda0bd16ad Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:22:07 -0400 Subject: [PATCH 12/14] spelling: success Signed-off-by: Josh Soref --- test/controllers/api/changesets_controller_test.rb | 2 +- test/controllers/api/map_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index 1c5529b50..8e8f4c185 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -63,7 +63,7 @@ module Api "" put changeset_create_path, :params => xml, :headers => auth_header - assert_response :success, "Creation of changeset did not return sucess status" + assert_response :success, "Creation of changeset did not return success status" newid = @response.body.to_i # check end time, should be an hour ahead of creation time diff --git a/test/controllers/api/map_controller_test.rb b/test/controllers/api/map_controller_test.rb index 433e7a2af..1e96e353c 100644 --- a/test/controllers/api/map_controller_test.rb +++ b/test/controllers/api/map_controller_test.rb @@ -129,7 +129,7 @@ module Api print @request.to_yaml print @response.body end - assert_response :success, "Expected scucess with the map call" + assert_response :success, "Expected success with the map call" assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do assert_select "bounds[minlon='#{format('%.7f', :lon => minlon)}']" \ "[minlat='#{format('%.7f', :lat => minlat)}']" \ From 590f94f5311a013b91c0ee37189d8425ff0e01e7 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:22:12 -0400 Subject: [PATCH 13/14] spelling: uniqueness Signed-off-by: Josh Soref --- test/models/relation_tag_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/relation_tag_test.rb b/test/models/relation_tag_test.rb index 429e77a92..02d6d95c7 100644 --- a/test/models/relation_tag_test.rb +++ b/test/models/relation_tag_test.rb @@ -37,7 +37,7 @@ class RelationTagTest < ActiveSupport::TestCase assert tag.errors[:relation].any? end - def test_uniquness + def test_uniqueness existing = create(:relation_tag) tag = RelationTag.new tag.relation_id = existing.relation_id From 8e951a8340aeab4ecc039fd4d87280bf1a817961 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 25 Jun 2021 00:22:13 -0400 Subject: [PATCH 14/14] spelling: unknown Signed-off-by: Josh Soref --- test/controllers/friendships_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/friendships_controller_test.rb b/test/controllers/friendships_controller_test.rb index b25986d84..6273caaf2 100644 --- a/test/controllers/friendships_controller_test.rb +++ b/test/controllers/friendships_controller_test.rb @@ -110,7 +110,7 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear end - def test_make_friend_unkown_user + def test_make_friend_unknown_user # Should error when a bogus user is specified session_for(create(:user)) get make_friend_path(:display_name => "No Such User") @@ -188,7 +188,7 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest assert_nil Friendship.where(:befriender => user, :befriendee => friend).first end - def test_remove_friend_unkown_user + def test_remove_friend_unknown_user # Should error when a bogus user is specified session_for(create(:user)) get remove_friend_path(:display_name => "No Such User")