<p>This pluralizes the remaining controllers (except for changesets, which will come after <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="378228775" data-permission-text="Issue title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/2050" data-hovercard-type="pull_request" data-hovercard-url="/openstreetmap/openstreetmap-website/pull/2050/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/pull/2050">#2050</a> is resolved). Otherwise the singular controllers refer to singular resources and so can stay the way they are.</p>
<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/hovercards?user_id=1109395" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/Nikerabbit">@Nikerabbit</a> This PR contains translation key renamining:</p>
<ul>
<li><code>diary_entry.*</code> -> <code>diary_entries.*</code></li>
</ul>

<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/2052'>https://github.com/openstreetmap/openstreetmap-website/pull/2052</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Pluralize nodes, ways and relations controllers</li>
  <li>Pluralize old_ controllers</li>
  <li>Pluralize diary entries controller</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-0">.rubocop_todo.yml</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-1">app/controllers/diary_entries_controller.rb</a>
    (38)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-2">app/controllers/nodes_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-3">app/controllers/old_nodes_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-4">app/controllers/old_relations_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-5">app/controllers/old_ways_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-6">app/controllers/relations_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-7">app/controllers/ways_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-8">app/views/browse/feature.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-9">app/views/browse/history.html.erb</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-10">app/views/diary_entries/_diary_comment.html.erb</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-11">app/views/diary_entries/_diary_entry.html.erb</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-12">app/views/diary_entries/_diary_index_entry.html.erb</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-13">app/views/diary_entries/_location.html.erb</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-14">app/views/diary_entries/comments.html.erb</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-15">app/views/diary_entries/edit.html.erb</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-16">app/views/diary_entries/index.html.erb</a>
    (4)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-17">app/views/diary_entries/no_such_entry.html.erb</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-18">app/views/diary_entries/rss.rss.builder</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-19">app/views/diary_entries/show.html.erb</a>
    (0)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-20">app/views/users/show.html.erb</a>
    (8)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-21">config/locales/en.yml</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-22">config/routes.rb</a>
    (100)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-23">test/controllers/changeset_controller_test.rb</a>
    (8)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-24">test/controllers/diary_entries_controller_test.rb</a>
    (46)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-25">test/controllers/nodes_controller_test.rb</a>
    (12)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-26">test/controllers/old_nodes_controller_test.rb</a>
    (19)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-27">test/controllers/old_relations_controller_test.rb</a>
    (11)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-28">test/controllers/old_ways_controller_test.rb</a>
    (11)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-29">test/controllers/relations_controller_test.rb</a>
    (27)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-30">test/controllers/ways_controller_test.rb</a>
    (15)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-31">test/helpers/application_helper_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-32">test/integration/user_diaries_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-33">test/system/report_diary_comment_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-34">test/system/report_diary_entry_test.rb</a>
    (6)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/2052.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/2052.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/2052.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/2052.diff</a></li>
</ul>

<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/2052">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLdNPAs61eCl9KC27rOOn7F0ffsRIks5usv39gaJpZM4YSqrY">mute the thread</a>.<img src="https://github.com/notifications/beacon/ABWnLTWHZevCpsbv0PXmzJ7SJ-bfPqqMks5usv39gaJpZM4YSqrY.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/openstreetmap/openstreetmap-website","title":"openstreetmap/openstreetmap-website","subtitle":"GitHub repository","main_image_url":"https://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/openstreetmap/openstreetmap-website"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Pluralize controllers (#2052)"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/2052"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/2052",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/2052",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "Pluralize controllers (#2052)",
"sections": [
{
"text": "",
"activityTitle": "**Andy Allan**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@gravitystorm",
"facts": [

]
},
{
"title": "Commit Summary",
"facts": [
{
"name": "05117aa",
"value": "Pluralize nodes, ways and relations controllers"
},
{
"name": "e85c56d",
"value": "Pluralize old_ controllers"
},
{
"name": "26777c4",
"value": "Pluralize diary entries controller"
}
]
},
{
"title": "File Changes",
"facts": [
{
"name": "Modified",
"value": "[.rubocop_todo.yml](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-0) (2 changes)"
},
{
"name": "Renamed",
"value": "[app/controllers/diary_entries_controller.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-1) (38 changes)"
},
{
"name": "Renamed",
"value": "[app/controllers/nodes_controller.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-2) (2 changes)"
},
{
"name": "Renamed",
"value": "[app/controllers/old_nodes_controller.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-3) (2 changes)"
},
{
"name": "Renamed",
"value": "[app/controllers/old_relations_controller.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-4) (2 changes)"
},
{
"name": "Renamed",
"value": "[app/controllers/old_ways_controller.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-5) (2 changes)"
},
{
"name": "Renamed",
"value": "[app/controllers/relations_controller.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-6) (2 changes)"
},
{
"name": "Renamed",
"value": "[app/controllers/ways_controller.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-7) (2 changes)"
},
{
"name": "Modified",
"value": "[app/views/browse/feature.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-8) (2 changes)"
},
{
"name": "Modified",
"value": "[app/views/browse/history.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-9) (2 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/_diary_comment.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-10) (0 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/_diary_entry.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-11) (2 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/_diary_index_entry.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-12) (0 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/_location.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-13) (0 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/comments.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-14) (0 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/edit.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-15) (2 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/index.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-16) (4 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/no_such_entry.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-17) (0 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/rss.rss.builder](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-18) (0 changes)"
},
{
"name": "Renamed",
"value": "[app/views/diary_entries/show.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-19) (0 changes)"
},
{
"name": "Modified",
"value": "[app/views/users/show.html.erb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-20) (8 changes)"
},
{
"name": "Modified",
"value": "[config/locales/en.yml](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-21) (2 changes)"
},
{
"name": "Modified",
"value": "[config/routes.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-22) (100 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/changeset_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-23) (8 changes)"
},
{
"name": "Renamed",
"value": "[test/controllers/diary_entries_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-24) (46 changes)"
},
{
"name": "Renamed",
"value": "[test/controllers/nodes_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-25) (12 changes)"
},
{
"name": "Renamed",
"value": "[test/controllers/old_nodes_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-26) (19 changes)"
},
{
"name": "Renamed",
"value": "[test/controllers/old_relations_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-27) (11 changes)"
},
{
"name": "Renamed",
"value": "[test/controllers/old_ways_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-28) (11 changes)"
},
{
"name": "Renamed",
"value": "[test/controllers/relations_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-29) (27 changes)"
},
{
"name": "Renamed",
"value": "[test/controllers/ways_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-30) (15 changes)"
},
{
"name": "Modified",
"value": "[test/helpers/application_helper_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-31) (2 changes)"
},
{
"name": "Modified",
"value": "[test/integration/user_diaries_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-32) (2 changes)"
},
{
"name": "Modified",
"value": "[test/system/report_diary_comment_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-33) (4 changes)"
},
{
"name": "Modified",
"value": "[test/system/report_diary_entry_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/2052/files#diff-34) (6 changes)"
}
]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"openstreetmap/openstreetmap-website\",\n\"issueId\": 2052,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"name": "Close pull request",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"PullRequestClose\",\n\"repositoryFullName\": \"openstreetmap/openstreetmap-website\",\n\"pullRequestId\": 2052\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/openstreetmap-website/pull/2052"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/openstreetmap-website/pull/2052.patch"
}
],
"@type": "OpenUri",
"name": "View patch"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/openstreetmap-website/pull/2052.diff"
}
],
"@type": "OpenUri",
"name": "View diff"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 407546584\n}"
}
],
"themeColor": "26292E"
}
]</script>