<p></p>
<p><b>@gravitystorm</b> requested changes on this pull request.</p>
<p>These changes are all fine with me. The only one that isn't OK is the helper_method one, so this PR will need one final rebase after <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="949899794" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/3265" data-hovercard-type="pull_request" data-hovercard-url="/openstreetmap/openstreetmap-website/pull/3265/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/pull/3265">#3265</a> is merged.</p><hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3233#discussion_r674151952">app/controllers/application_controller.rb</a>:</p>
<pre style='color:#555'>> @@ -17,7 +17,7 @@ class ApplicationController < ActionController::Base
helper_method :current_user
helper_method :oauth_token
- helper_method :preferred_langauges
+ helper_method :preferred_languages
</pre>
<p>I've fixed this separately in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="949899794" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/3265" data-hovercard-type="pull_request" data-hovercard-url="/openstreetmap/openstreetmap-website/pull/3265/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/pull/3265">#3265</a> since the line should be removed rather than respelled - I wouldn't expect your spellchecker to know that though!</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3233#discussion_r674152195">app/views/users/show.html.erb</a>:</p>
<pre style='color:#555'>> @@ -4,7 +4,7 @@
<div class='userinformation-inner'>
<h1><%= @user.display_name %> <%= role_icons(@user) %></h1>
<% if current_user and @user.id == current_user.id %>
- <!-- Displaying user's own profile page to themself -->
+ <!-- Displaying user's own profile page -->
</pre>
<p>I'm happy with the correction.</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3233#discussion_r674154779">config/locales/en.yml</a>:</p>
<pre style='color:#555'>> @@ -681,7 +681,7 @@ en:
houseboat: "Houseboat"
hut: "Hut"
industrial: "Industrial Building"
- kindergarten: "Kindergarden Building"
+ kindergarten: "Kindergarten Building"
</pre>
<p>This correction is correct - we should use the proposed version.</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3233#discussion_r674161128">config/locales/en.yml</a>:</p>
<pre style='color:#555'>> @@ -706,7 +706,7 @@ en:
sport: "Sportsclub"
"yes": "Club"
craft:
- beekeper: "Beekeeper"
+ beekeeper: "Beekeeper"
</pre>
<p>We should use this correction</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3233#discussion_r674161268">config/locales/en.yml</a>:</p>
<pre style='color:#555'>> @@ -736,7 +736,7 @@ en:
ambulance_station: "Ambulance Station"
assembly_point: "Assembly Point"
defibrillator: "Defibrillator"
- fire_xtinguisher: "Fire Extinguisher"
+ fire_extinguisher: "Fire Extinguisher"
</pre>
<p>We should use this correction too.</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3233#discussion_r674162536">lib/osm.rb</a>:</p>
<pre style='color:#555'>> @@ -474,7 +474,7 @@ def self.parse_float(str, klass, *args)
# Construct a random token of a given length
def self.make_token(length = 30)
- chars = "abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+ chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
</pre>
<p>This correction is OK.</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3233#discussion_r674171180">test/controllers/api/changesets_controller_test.rb</a>:</p>
<pre style='color:#555'>> @@ -1326,7 +1326,7 @@ def test_josm_upload
<node id='-7' visible='true' changeset='#{changeset_id}' lat='51.49560784152179' lon='-0.18694719410005425' />
<node id='-8' visible='true' changeset='#{changeset_id}' lat='51.49567389979617' lon='-0.1860289771788006' />
<node id='-9' visible='true' changeset='#{changeset_id}' lat='51.49543761398892' lon='-0.186820684213126' />
- <way id='-10' action='modiy' visible='true' changeset='#{changeset_id}'>
+ <way id='-10' action='modify' visible='true' changeset='#{changeset_id}'>
</pre>
<p>This change is fine.</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3233#discussion_r674170636">test/controllers/api/nodes_controller_test.rb</a>:</p>
<pre style='color:#555'>> @@ -86,7 +86,7 @@ def test_create
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
</pre>
<p>Yeah, this is a confusing sentence. I think we should accept the correction and then rephrase it later.</p>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3233#pullrequestreview-711916321">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLO3UEYKJ6ENNF66IZLTY34QTANCNFSM47JEPWEA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AAK2OLKAOJG5JX6FRJDKCLTTY34QTA5CNFSM47JEPWEKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOFJXPWII.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/3233#pullrequestreview-711916321",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/3233#pullrequestreview-711916321",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>