<p dir="auto">This PR refactors the two notes routes, namely:</p>
<ul dir="auto">
<li>browse#new_note -> notes#new</li>
<li>browse#note -> notes#show</li>
</ul>
<p dir="auto">This brings them into line with resourceful routing naming conventions.</p>
<p dir="auto">The PR is slightly more complex than I anticipated, since the api methods for notes was already hogging the <code class="notranslate">notes</code> resourceful routing (e.g. <code class="notranslate">note_path</code> was used for /api/0.6/notes/123), so I renamed that to <code class="notranslate">api_notes</code> which is a convention already used for other models that have both api and non-api paths. Secondly, the i18n needed a little bit of unpicking, since the views were using fully qualified instead of relative translation strings. And finally, a surprising number of other tests use notes as examples (e.g. for reporting users) and so they needed updating too (e.g. to use <code class="notranslate">note_path</code> instead of <code class="notranslate">browse_note_path</code>).</p>
<p dir="auto">Refs <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="1482565414" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/3831" data-hovercard-type="issue" data-hovercard-url="/openstreetmap/openstreetmap-website/issues/3831/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/issues/3831">#3831</a></p>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/openstreetmap/openstreetmap-website/pull/3911'>https://github.com/openstreetmap/openstreetmap-website/pull/3911</a></p>
<h4>Commit Summary</h4>
<ul>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/commits/f7367baa6b6091df3eabbe8b7a4b99e3fa314743" class="commit-link">f7367ba</a> Rename api_notes resource to avoid conflict with non-API resource</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/commits/12093264bd95938732d16f9baa0161d5be3292b1" class="commit-link">1209326</a> Move browse#new_note to notes#new</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/commits/06bceef396fb2283343e3c2005055b88ec085cf1" class="commit-link">06bceef</a> Move browse#note to notes#show</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/commits/c8771de7ec828ba3bcd66c686572c55fff8dfefc" class="commit-link">c8771de</a> Refactor translation strings for notes</li>
</ul>
<h4 style="display: inline-block">File Changes </h4> <p style="display: inline-block">(<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files">25 files</a>)</p>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-debf59904131dc89a88ab44cbb1d6deaaa5a7d70c0507f674080df62f7c8e41f">app/abilities/ability.rb</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-a3926db6e853b8fb775271c951ca4789b9ba3884dfedc631bf211bd650952882">app/controllers/browse_controller.rb</a>
(14)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-c254740097a8c0601832077488db77e572b2c2b926f77508fadc6081b0052804">app/controllers/notes_controller.rb</a>
(22)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-c7e7144de4dcf44dbb148d4acc6aa4a9d8581c6a581966a0bbfb598e79730f14">app/controllers/site_controller.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-96b07570f5f45323f09b0d3d1aa6b3250067e22fcafdc92a00190697adb50a44">app/helpers/issues_helper.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-74d80704129ce910bd38a56b250122e716028ac0085b3627ea8875b9216b65ce">app/helpers/note_helper.rb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-55254045ba774e4c360d7bbfde054665072d2ab49abc3f21add15a37bba65a1c">app/mailers/user_mailer.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-8e70c530a3e7f6eb777b75ec26204721dd896dedf08d20582adb5da76aba544c">app/views/api/notes/_note.gpx.builder</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-a14835243072d71830ba15ff480de24e3146811fabdf73b7e35670af209fbf05">app/views/api/notes/_note.json.jbuilder</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-9b8b3e6d46a2a808a27e4c2f8d88c5470d39ee77146f8bb530124c0cacc35dbe">app/views/api/notes/_note.rss.builder</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-143dab9bcdf18ed43c02d5c815e4fb922faf69c55a45c4c8af8c7cb07af310e9">app/views/api/notes/_note.xml.builder</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-d8f30ea1257d77c6a54152eb01b0b95a06f343a2f49f05b51447ef9d89ee8c89">app/views/api/notes/feed.rss.builder</a>
(4)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-d05f770c89f6fd47fa3b37ac3aa9edcb9da5ebb26165fb27b7df92ac85a11aee">app/views/browse/new_note.html.erb</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-4fe647349351c7492508c788230b91b7f4445d4b821f6781ac7fcfad5e879f21">app/views/notes/index.html.erb</a>
(2)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-cb517058985c89ad2c4fa3503e6e5c62cc9953e2972bd6128c2f34156905f94f">app/views/notes/new.html.erb</a>
(17)
</li>
<li>
<strong>R</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-84d04c9c37a8be927ab1870e6b3c1940f670585b77b8e88c32d6ded35cf87dc7">app/views/notes/show.html.erb</a>
(20)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-44438ce218f5287c58d0017f965d888715635d94280669896f75841fbd7b4cd7">config/locales/en.yml</a>
(66)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-959bc9abc46a55332bb64d5155a79323afa75a50ec1a2137ddd22d926f62c6c5">config/routes.rb</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-b4cc80ae5a4279eef2a7494cb8c489220ce03acaf36932b2042247df9d316908">test/controllers/api/notes_controller_test.rb</a>
(244)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-01df9fbcb9fb4907831d5bf348fc535f13caf85ed834db5f3f039c2407bf97bf">test/controllers/browse_controller_test.rb</a>
(86)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-b41a560e061b578bbf13158bf175036a9489241ab69f59137c44d57df9682fa7">test/controllers/notes_controller_test.rb</a>
(124)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-9f03db15fcff47ba34e79c28103e35c66caf837939a1268a6f6103f9b2eefea0">test/controllers/site_controller_test.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-74c3414af0a76b3935f1a316c51c37b9415ded1fd811d596ba523d38e7c1489b">test/system/index_test.rb</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-8358a7e67a0668bb274231cf66a04040514feaf99359175ea3b51a8306979081">test/system/report_note_test.rb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911/files#diff-57c59e735efb356e2a24b9fb26199792d98a0749cf882be51d34ba637c9ebcfa">test/system/report_user_test.rb</a>
(2)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3911.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/3911.patch</a></li>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3911.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/3911.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3911">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLI6KDFHDA7KOGQTVR3WUJQ5FANCNFSM6AAAAAAUHNECOU">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLPZWU7N6BLQABVV7MTWUJQ5FA5CNFSM6AAAAAAUHNECOWWGG33NNVSW45C7OR4XAZNFJFZXG5LFVJRW63LNMVXHIX3JMTHFZXM4EE.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/3911</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/3911",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/3911",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>