From 0fbc0759539c1ba8f864e9fa65cee37255c6d36a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 19 Mar 2026 23:02:29 +0000
Subject: [PATCH] Enforce declaration of local variables for partials

---
 .herb.yml                                                     | 2 ++
 app/helpers/application_helper.rb                             | 2 +-
 app/views/accounts/_go_public.html.erb                        | 2 ++
 app/views/accounts/terms/_terms.html.erb                      | 2 ++
 app/views/accounts/terms/_terms_declined_flash.html.erb       | 2 ++
 app/views/api/notes/_comment.html.erb                         | 2 ++
 app/views/api/notes/_description.html.erb                     | 2 ++
 app/views/api/notes/_entry.html.erb                           | 2 ++
 app/views/application/_auth_button.html.erb                   | 1 +
 app/views/application/_auth_providers.html.erb                | 2 ++
 app/views/application/_settings_menu.html.erb                 | 2 ++
 app/views/application/_sidebar_header.html.erb                | 2 ++
 app/views/browse/_common_details.html.erb                     | 2 ++
 app/views/browse/_containing_relation.html.erb                | 2 ++
 app/views/browse/_node.html.erb                               | 2 ++
 app/views/browse/_relation.html.erb                           | 2 ++
 app/views/browse/_relation_member.html.erb                    | 2 ++
 app/views/browse/_relation_member_frame.html.erb              | 2 ++
 app/views/browse/_tag.html.erb                                | 2 ++
 app/views/browse/_tag_details.html.erb                        | 2 ++
 app/views/browse/_way.html.erb                                | 2 ++
 app/views/changeset_comments/feeds/_comment.html.erb          | 2 ++
 app/views/changeset_subscriptions/_heading.html.erb           | 2 ++
 app/views/changesets/_changeset.html.erb                      | 2 ++
 app/views/changesets/_changeset_line.html.erb                 | 1 +
 app/views/changesets/_elements.html.erb                       | 2 ++
 app/views/changesets/_not_found_message.html.erb              | 2 ++
 app/views/changesets/_paging_nav.html.erb                     | 2 ++
 app/views/confirmations/_resend_success_flash.html.erb        | 2 ++
 app/views/dashboards/_contact.html.erb                        | 2 ++
 app/views/dashboards/_popup.html.erb                          | 2 ++
 app/views/diary_entries/_diary_comment.html.erb               | 2 ++
 app/views/diary_entries/_diary_entry.html.erb                 | 2 ++
 app/views/diary_entries/_diary_entry_heading.html.erb         | 2 ++
 app/views/diary_entries/_form.html.erb                        | 2 ++
 app/views/diary_entries/_location.html.erb                    | 2 ++
 app/views/diary_entries/_navigation.html.erb                  | 2 ++
 app/views/diary_entries/_page.html.erb                        | 2 ++
 app/views/diary_entries/_profile_diaries.html.erb             | 2 ++
 app/views/errors/_contact.html.erb                            | 2 ++
 app/views/issues/_comments.html.erb                           | 2 ++
 app/views/issues/_page.html.erb                               | 2 ++
 app/views/issues/_reports.html.erb                            | 2 ++
 app/views/issues/reporters/_reporters.html.erb                | 2 ++
 app/views/languages_panes/_select_language_list.html.erb      | 2 ++
 app/views/layouts/_banner.html.erb                            | 2 ++
 app/views/layouts/_content.html.erb                           | 4 +++-
 app/views/layouts/_flash.html.erb                             | 2 ++
 app/views/layouts/_head.html.erb                              | 2 ++
 app/views/layouts/_header.html.erb                            | 2 ++
 app/views/layouts/_markers.html.erb                           | 2 ++
 app/views/layouts/_meta.html.erb                              | 2 ++
 app/views/layouts/_search.html.erb                            | 2 ++
 app/views/layouts/_select_language_button.html.erb            | 2 ++
 app/views/layouts/_sidebar_close.html.erb                     | 2 ++
 app/views/messages/mailboxes/_heading.html.erb                | 2 ++
 app/views/messages/mailboxes/_message.html.erb                | 2 ++
 app/views/messages/mailboxes/_messages_table.html.erb         | 2 ++
 app/views/messages/outboxes/_message.html.erb                 | 2 ++
 app/views/nodes/_not_found_message.html.erb                   | 2 ++
 app/views/notes/_not_found_message.html.erb                   | 2 ++
 app/views/notes/_notes_paging_nav.html.erb                    | 2 ++
 app/views/oauth2_applications/_application.html.erb           | 2 ++
 app/views/oauth2_applications/_form.html.erb                  | 2 ++
 .../oauth2_authorized_applications/_application.html.erb      | 2 ++
 app/views/old_elements/_actions.html.erb                      | 2 ++
 app/views/old_nodes/_not_found_message.html.erb               | 2 ++
 app/views/old_relation_members/_not_found_message.html.erb    | 2 ++
 app/views/old_relations/_not_found_message.html.erb           | 2 ++
 app/views/old_ways/_not_found_message.html.erb                | 2 ++
 app/views/preferences/preferences/_navigation.html.erb        | 2 ++
 .../preferences/preferences/_update_success_flash.html.erb    | 2 ++
 app/views/profiles/profile_sections/_navigation.html.erb      | 2 ++
 app/views/redactions/_redaction.html.erb                      | 2 ++
 app/views/relation_members/_not_found_message.html.erb        | 2 ++
 app/views/relations/_not_found_message.html.erb               | 2 ++
 app/views/sessions/_suspended_flash.html.erb                  | 2 ++
 app/views/shared/_markdown_help.html.erb                      | 2 ++
 app/views/shared/_pagination.html.erb                         | 2 ++
 app/views/shared/_richtext_field.html.erb                     | 2 ++
 app/views/shared/_section_divider.html.erb                    | 2 ++
 app/views/site/_about_section.html.erb                        | 4 +++-
 app/views/site/_add_a_note.html.erb                           | 2 ++
 app/views/site/_any_questions.html.erb                        | 2 ++
 app/views/site/_id.html.erb                                   | 2 ++
 app/views/site/_potlatch.html.erb                             | 2 ++
 app/views/site/_potlatch2.html.erb                            | 2 ++
 app/views/social_links/_show.html.erb                         | 2 ++
 app/views/traces/_page.html.erb                               | 2 ++
 app/views/traces/_trace.html.erb                              | 2 ++
 app/views/traces/feeds/_description.html.erb                  | 2 ++
 app/views/user_blocks/_block.html.erb                         | 2 ++
 app/views/user_blocks/_navigation.html.erb                    | 2 ++
 app/views/user_blocks/_page.html.erb                          | 2 ++
 app/views/user_mailer/_gpx_details.html.erb                   | 2 ++
 app/views/user_mailer/_message_body.html.erb                  | 2 ++
 app/views/users/_auth_association.html.erb                    | 2 ++
 app/views/users/_role_icons.html.erb                          | 2 ++
 app/views/users/_sidebar_section.html.erb                     | 3 ++-
 app/views/users/changeset_comments/_page.html.erb             | 2 ++
 app/views/users/diary_comments/_page.html.erb                 | 2 ++
 app/views/users/lists/_page.html.erb                          | 2 ++
 app/views/users/lists/_user.html.erb                          | 2 ++
 app/views/ways/_not_found_message.html.erb                    | 2 ++
 104 files changed, 207 insertions(+), 4 deletions(-)

diff --git a/.herb.yml b/.herb.yml
index de8fa288e..acb0d8578 100644
--- a/.herb.yml
+++ b/.herb.yml
@@ -4,6 +4,8 @@ linter:
   rules:
     erb-no-instance-variables-in-partials:
       enabled: false
+    erb-strict-locals-required:
+      enabled: true
     html-anchor-require-href:
       enabled: false
     html-no-space-in-tag:
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c42a2a252..a084cd3cd 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -85,7 +85,7 @@ module ApplicationHelper
   # This allows us to render html into a flash message in a safe manner.
   def render_flash(flash)
     if flash.is_a?(Hash)
-      render flash.with_indifferent_access
+      render flash.deep_symbolize_keys
     else
       flash
     end
diff --git a/app/views/accounts/_go_public.html.erb b/app/views/accounts/_go_public.html.erb
index 51bb85234..2ad3f2de0 100644
--- a/app/views/accounts/_go_public.html.erb
+++ b/app/views/accounts/_go_public.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <hr class="mb-3">
 <a name="public"></a>
 <h2><%= t ".heading" %></h2>
diff --git a/app/views/accounts/terms/_terms.html.erb b/app/views/accounts/terms/_terms.html.erb
index 20c6a7a8e..f684343e6 100644
--- a/app/views/accounts/terms/_terms.html.erb
+++ b/app/views/accounts/terms/_terms.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <p id="first">
   <%= @text["intro"] %>
   <%= @text["next_with_decline"] %>
diff --git a/app/views/accounts/terms/_terms_declined_flash.html.erb b/app/views/accounts/terms/_terms_declined_flash.html.erb
index 9c9d793db..c107ec8dc 100644
--- a/app/views/accounts/terms/_terms_declined_flash.html.erb
+++ b/app/views/accounts/terms/_terms_declined_flash.html.erb
@@ -1 +1,3 @@
+<%# locals: () %>
+
 <%= t ".terms_declined_html", :terms_declined_link => link_to(t(".terms_declined_link"), t(".terms_declined_url")) %>
diff --git a/app/views/api/notes/_comment.html.erb b/app/views/api/notes/_comment.html.erb
index 437bd68a4..f318775af 100644
--- a/app/views/api/notes/_comment.html.erb
+++ b/app/views/api/notes/_comment.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (comment:) %>
+
 <div class="note-comment" style="margin-top: 5px">
   <div class="note-comment-description" style="font-size: smaller; color: #999999">
     <% if comment.author.nil? -%>
diff --git a/app/views/api/notes/_description.html.erb b/app/views/api/notes/_description.html.erb
index 4f03a1d59..02dc99555 100644
--- a/app/views/api/notes/_description.html.erb
+++ b/app/views/api/notes/_description.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (description:) %>
+
 <div>
   <%= render :partial => "comment", :collection => description.comments %>
 </div>
diff --git a/app/views/api/notes/_entry.html.erb b/app/views/api/notes/_entry.html.erb
index 624ecd15d..db3ce6b6f 100644
--- a/app/views/api/notes/_entry.html.erb
+++ b/app/views/api/notes/_entry.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (entry:) %>
+
 <h2><%= t ".comment" %></h2>
 <%= render :partial => "comment", :object => entry %>
 <h2><%= t ".full" %></h2>
diff --git a/app/views/application/_auth_button.html.erb b/app/views/application/_auth_button.html.erb
index 341c8a12f..429e36a8b 100644
--- a/app/views/application/_auth_button.html.erb
+++ b/app/views/application/_auth_button.html.erb
@@ -1,4 +1,5 @@
 <%# locals: (provider:, preferred: false) %>
+
 <%= link_to auth_path(:provider => provider),
             :method => :post,
             :class => ["auth_button btn btn-outline-secondary border p-2", { "px-4 d-flex gap-3 justify-content-center align-items-center" => preferred }],
diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index 7a8f5835c..c8ee1a59f 100644
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <% prefered_auth_button_available = Auth.providers.include?(@preferred_auth_provider) %>
 
 <div>
diff --git a/app/views/application/_settings_menu.html.erb b/app/views/application/_settings_menu.html.erb
index a0d3c0ad4..c8d758e11 100644
--- a/app/views/application/_settings_menu.html.erb
+++ b/app/views/application/_settings_menu.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <% content_for :heading_class, "pb-0" %>
 
 <% content_for :heading do %>
diff --git a/app/views/application/_sidebar_header.html.erb b/app/views/application/_sidebar_header.html.erb
index d24a0c5fa..585505c4f 100644
--- a/app/views/application/_sidebar_header.html.erb
+++ b/app/views/application/_sidebar_header.html.erb
@@ -1 +1,3 @@
+<%# locals: (title:) %>
+
 <h2 class="me-4 text-break"><%= title %></h2>
diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 92a88a6bc..4ef44cdbd 100644
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (common_details:) %>
+
 <h4>
   <%= if common_details.redacted?
         t "browse.redacted_version"
diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index 2c1072364..0b5cc21b1 100644
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (containing_relation:) %>
+
 <%= element_list_item "relation", containing_relation.relation do %>
   <%= linked_name = link_to printable_element_name(containing_relation.relation), containing_relation.relation
       if containing_relation.member_role.blank?
diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index cc3804da5..78dc8a9e7 100644
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (node:) %>
+
 <%= tag.div :class => ["mb-3 border-bottom border-secondary-subtle pb-3",
                        { "text-body-secondary" => node.redacted? && params[:show_redactions] }] do %>
   <% if node.redacted? && !params[:show_redactions] %>
diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb
index b09316fd2..7736b19cf 100644
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (relation:) %>
+
 <%= tag.div :class => ["mb-3 border-bottom border-secondary-subtle pb-3",
                        { "text-body-secondary" => relation.redacted? && params[:show_redactions] }] do %>
   <% if relation.redacted? && !params[:show_redactions] %>
diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index 66402b18d..48ad59beb 100644
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (relation_member:) %>
+
 <%= element_list_item_with_strikethrough relation_member.member_type.downcase, relation_member.member do %>
   <%= t ".entry_#{'role_' if relation_member.member_role.present?}html",
         :type => t(".type.#{relation_member.member_type.downcase}"),
diff --git a/app/views/browse/_relation_member_frame.html.erb b/app/views/browse/_relation_member_frame.html.erb
index 97531f17a..eab69c974 100644
--- a/app/views/browse/_relation_member_frame.html.erb
+++ b/app/views/browse/_relation_member_frame.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (relation:, frame_id:) %>
+
 <turbo-frame id="<%= frame_id %>">
   <ul class="list-unstyled browse-element-list">
     <%= render :partial => "browse/relation_member", :collection => relation.relation_members, :as => :relation_member %>
diff --git a/app/views/browse/_tag.html.erb b/app/views/browse/_tag.html.erb
index 145d7e2fe..773e7ee48 100644
--- a/app/views/browse/_tag.html.erb
+++ b/app/views/browse/_tag.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (tag:) %>
+
 <tr>
   <th class="py-1 border-secondary-subtle table-secondary fw-normal" dir="auto"><%= format_key(tag[0]) %></th>
   <td class="py-1 border-secondary-subtle border-start" dir="auto"><%= format_value(tag[0], tag[1]) %></td>
diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb
index 24ac618d3..0b59f7c2a 100644
--- a/app/views/browse/_tag_details.html.erb
+++ b/app/views/browse/_tag_details.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (tag_details:) %>
+
 <% unless tag_details.empty? %>
   <h4><%= t ".tags" %></h4>
   <div class="mb-3 border border-secondary-subtle rounded overflow-hidden">
diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index deac955a1..d02d4b6fa 100644
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (way:) %>
+
 <%= tag.div :class => ["mb-3 border-bottom border-secondary-subtle pb-3",
                        { "text-body-secondary" => way.redacted? && params[:show_redactions] }] do %>
   <% if way.redacted? && !params[:show_redactions] %>
diff --git a/app/views/changeset_comments/feeds/_comment.html.erb b/app/views/changeset_comments/feeds/_comment.html.erb
index a312e4f0f..12305d71f 100644
--- a/app/views/changeset_comments/feeds/_comment.html.erb
+++ b/app/views/changeset_comments/feeds/_comment.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (comment:) %>
+
 <h2><%= t ".comment",
           :author => comment.author.display_name,
           :changeset_id => comment.changeset.id.to_s %></h2>
diff --git a/app/views/changeset_subscriptions/_heading.html.erb b/app/views/changeset_subscriptions/_heading.html.erb
index 9814556a7..43dc483de 100644
--- a/app/views/changeset_subscriptions/_heading.html.erb
+++ b/app/views/changeset_subscriptions/_heading.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (changeset:) %>
+
 <% title = changeset.comment || t(".title", :id => changeset.id) -%>
 <div class="mb-3">
   <div class="row">
diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index 7a2b7ab0e..cba6d5e70 100644
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (changeset:) %>
+
 <%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data(changeset) }, :class => "list-group-item list-group-item-action" do %>
   <p class="fs-6 text-truncate text-wrap mb-2">
     <%= link_to changeset, :class => "changeset_id link-body-emphasis stretched-link" do %>
diff --git a/app/views/changesets/_changeset_line.html.erb b/app/views/changesets/_changeset_line.html.erb
index 22674c556..476a4e557 100644
--- a/app/views/changesets/_changeset_line.html.erb
+++ b/app/views/changesets/_changeset_line.html.erb
@@ -1,4 +1,5 @@
 <%# locals: (changeset:, show_num_changes: true, show_num_comments: true) %>
+
 <div class="changeset_line d-flex gap-2 align-items-center">
   <span class="me-auto">
     <%= yield %>
diff --git a/app/views/changesets/_elements.html.erb b/app/views/changesets/_elements.html.erb
index 938c97b10..f360c3031 100644
--- a/app/views/changesets/_elements.html.erb
+++ b/app/views/changesets/_elements.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (type:, elements:, elements_count:, current_page:) %>
+
 <%= turbo_frame_tag "changeset_#{type.pluralize}" do %>
   <%= render :partial => "paging_nav", :locals => { :type => type, :elements_count => elements_count, :current_page => current_page } %>
   <ul class="list-unstyled browse-element-list" data-turbo="false">
diff --git a/app/views/changesets/_not_found_message.html.erb b/app/views/changesets/_not_found_message.html.erb
index 9297f3b9a..6b0586085 100644
--- a/app/views/changesets/_not_found_message.html.erb
+++ b/app/views/changesets/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p><%= t ".sorry", :id => params[:id] %></p>
 </div>
diff --git a/app/views/changesets/_paging_nav.html.erb b/app/views/changesets/_paging_nav.html.erb
index 0ea0af53b..619b6a067 100644
--- a/app/views/changesets/_paging_nav.html.erb
+++ b/app/views/changesets/_paging_nav.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (type:, elements_count:, current_page:) %>
+
 <% pages_count = element_pages_count elements_count %>
 <% if pages_count == 1 %>
   <h4 class="fs-5">
diff --git a/app/views/confirmations/_resend_success_flash.html.erb b/app/views/confirmations/_resend_success_flash.html.erb
index e9763e276..4621e06d9 100644
--- a/app/views/confirmations/_resend_success_flash.html.erb
+++ b/app/views/confirmations/_resend_success_flash.html.erb
@@ -1,2 +1,4 @@
+<%# locals: (email:, sender:) %>
+
 <p><%= t ".confirmation_sent", :email => email %></p>
 <p><%= t ".whitelist", :sender => sender %></p>
diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb
index f4cf79716..c804ab55e 100644
--- a/app/views/dashboards/_contact.html.erb
+++ b/app/views/dashboards/_contact.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (contact:, type:) %>
+
 <% user_data = {
      :lon => contact.home_lon,
      :lat => contact.home_lat,
diff --git a/app/views/dashboards/_popup.html.erb b/app/views/dashboards/_popup.html.erb
index de90a117b..468157465 100644
--- a/app/views/dashboards/_popup.html.erb
+++ b/app/views/dashboards/_popup.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (popup:, type:) %>
+
 <div class="user_popup row g-0 mx-1">
   <div class="col-auto mx-1">
     <%= user_thumbnail popup %>
diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index b3e406816..1afecea80 100644
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (diary_comment:) %>
+
 <div class="row diary-comment border-bottom py-3<%= " text-body-secondary bg-danger bg-opacity-10" unless diary_comment.visible? %>">
   <div class="col-auto pe-0 text-center">
     <%= user_thumbnail diary_comment.user %>
diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index 3e0e6a463..ed50b1a2b 100644
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (diary_entry:, truncated:) %>
+
 <article class="diary_post border-top border-secondary-subtle py-3<%= " text-body-secondary px-3 bg-danger bg-opacity-10" unless diary_entry.visible %> user_<%= diary_entry.user.id %>">
   <%= render :partial => "diary_entry_heading", :object => diary_entry, :as => "diary_entry" %>
 
diff --git a/app/views/diary_entries/_diary_entry_heading.html.erb b/app/views/diary_entries/_diary_entry_heading.html.erb
index 82f4a9976..8d4f21c9e 100644
--- a/app/views/diary_entries/_diary_entry_heading.html.erb
+++ b/app/views/diary_entries/_diary_entry_heading.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (diary_entry:) %>
+
 <div class="mb-3">
   <% if @user %>
     <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
diff --git a/app/views/diary_entries/_form.html.erb b/app/views/diary_entries/_form.html.erb
index 1b9b1985b..2d603daf7 100644
--- a/app/views/diary_entries/_form.html.erb
+++ b/app/views/diary_entries/_form.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (f:) %>
+
 <%= f.text_field :title %>
 <%= f.richtext_field :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
 <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
diff --git a/app/views/diary_entries/_location.html.erb b/app/views/diary_entries/_location.html.erb
index ae48e86b9..0cdfd94e0 100644
--- a/app/views/diary_entries/_location.html.erb
+++ b/app/views/diary_entries/_location.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (location:) %>
+
 <%= t ".location" %>
 
 <%= link_to root_path(:anchor => "map=14/#{location.latitude}/#{location.longitude}") do
diff --git a/app/views/diary_entries/_navigation.html.erb b/app/views/diary_entries/_navigation.html.erb
index ad9c08ce9..a0db963b0 100644
--- a/app/views/diary_entries/_navigation.html.erb
+++ b/app/views/diary_entries/_navigation.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <nav class="secondary-actions">
   <ul>
     <% unless params[:friends] or params[:nearby] -%>
diff --git a/app/views/diary_entries/_page.html.erb b/app/views/diary_entries/_page.html.erb
index 0940c55be..63070e073 100644
--- a/app/views/diary_entries/_page.html.erb
+++ b/app/views/diary_entries/_page.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <turbo-frame id="pagination" target="_top" data-turbo="false">
   <h4><%= t ".recent_entries" %></h4>
 
diff --git a/app/views/diary_entries/_profile_diaries.html.erb b/app/views/diary_entries/_profile_diaries.html.erb
index 50e8163c2..d52f1a767 100644
--- a/app/views/diary_entries/_profile_diaries.html.erb
+++ b/app/views/diary_entries/_profile_diaries.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (diary_entries:) %>
+
 <% if diary_entries.present? %>
   <h2 class="text-body-secondary fs-5 mt-4"><%= t(".latest_diaries") %></h2>
   <div class="row row-cols-1 row-cols-md-2 g-4">
diff --git a/app/views/errors/_contact.html.erb b/app/views/errors/_contact.html.erb
index 4fe4e7968..e8bebff72 100644
--- a/app/views/errors/_contact.html.erb
+++ b/app/views/errors/_contact.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <p><%= t ".contact_the_community_html",
          :contact_link => link_to(t(".contact"), t(".contact_url"),
                                   :title => t(".contact_url_title")) %></p>
diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index d7005d75e..f9687bbad 100644
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (comments:) %>
+
 <div>
   <% comments.each do |comment| %>
     <div class="row">
diff --git a/app/views/issues/_page.html.erb b/app/views/issues/_page.html.erb
index 8ab073980..d9711abad 100644
--- a/app/views/issues/_page.html.erb
+++ b/app/views/issues/_page.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <turbo-frame id="pagination" target="_top">
   <% if @issues.length == 0 %>
     <p>
diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 2d0f1650b..12ed7b0ac 100644
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (reports:) %>
+
 <% reports.each do |report| %>
   <div class="row">
     <div class="col-auto">
diff --git a/app/views/issues/reporters/_reporters.html.erb b/app/views/issues/reporters/_reporters.html.erb
index d426cad33..561efc4a4 100644
--- a/app/views/issues/reporters/_reporters.html.erb
+++ b/app/views/issues/reporters/_reporters.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (issue:) %>
+
 <%= turbo_frame_tag "#{dom_id(issue)}_reporters", :data => { :turbo => false } do %>
   <% @unique_reporters[issue.id][:users].each do |reporter| %>
     <%= link_to reporter.display_name, reporter, :class => "d-block text-truncate", :title => reporter.display_name %>
diff --git a/app/views/languages_panes/_select_language_list.html.erb b/app/views/languages_panes/_select_language_list.html.erb
index 008302a97..045d12fee 100644
--- a/app/views/languages_panes/_select_language_list.html.erb
+++ b/app/views/languages_panes/_select_language_list.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div class="mb-3 px-2">
   <%= text_field_tag :language_search,
                      params[:language_search],
diff --git a/app/views/layouts/_banner.html.erb b/app/views/layouts/_banner.html.erb
index 4a8976f2b..26aaea4e4 100644
--- a/app/views/layouts/_banner.html.erb
+++ b/app/views/layouts/_banner.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <% unless (banner = next_banner()).nil? %>
   <%= tag.div :id => "banner", :class => "d-md-block d-none position-relative", :data => { :bs_theme => (banner[:dark] ? "dark" : "light") } do %>
     <%= link_to (image_tag banner[:img], :srcset => banner[:srcset], :alt => banner[:alt], :title => banner[:alt]), banner[:link] %>
diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb
index 7e7cd2cca..d6f825832 100644
--- a/app/views/layouts/_content.html.erb
+++ b/app/views/layouts/_content.html.erb
@@ -1,8 +1,10 @@
+<%# locals: () %>
+
 <div id="content" class="<%= content_for :content_class %>">
   <% if content_for? :content %>
     <%= yield :content %>
   <% else %>
-    <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+    <%= render :partial => "layouts/flash" %>
     <% if content_for? :heading %>
       <div class="content-heading bg-body-secondary border-bottom border-secondary-subtle">
         <div class="content-inner position-relative m-auto <%= yield :heading_class %>">
diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index febefbf02..49bae773b 100644
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <% [[:error, :danger], [:warning, :warning], [:notice, :success]].each do |flash_type, bootstrap_type| %>
   <% if flash[flash_type] %>
     <%= tag.div :class => "alert alert-dismissible alert-#{bootstrap_type} mb-0 rounded-0",
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 3f9714301..c8e40b8ce 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <%= tag.head :data => application_data do %>
   <%= render :partial => "layouts/meta" %>
   <%= javascript_include_tag "turbo", :type => "module" %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 451cd0bb4..b5dc3448b 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <header class="d-flex bg-body flex-column flex-md-row h-auto position-relative text-nowrap closed z-3">
   <h1 class="d-flex m-0 align-items-center fw-semibold">
     <a href="<%= root_path %>" class="icon-link gap-1 me-auto text-body-emphasis text-decoration-none geolink">
diff --git a/app/views/layouts/_markers.html.erb b/app/views/layouts/_markers.html.erb
index e2cefdaf1..c91d87a01 100644
--- a/app/views/layouts/_markers.html.erb
+++ b/app/views/layouts/_markers.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (types:) %>
+
 <svg width="0" height="0" class="end-100 position-absolute">
   <defs>
     <linearGradient id="fill" x1="0" x2="0" y1="0" y2="40" gradientUnits="userSpaceOnUse">
diff --git a/app/views/layouts/_meta.html.erb b/app/views/layouts/_meta.html.erb
index 49e6779fa..0e34c5e75 100644
--- a/app/views/layouts/_meta.html.erb
+++ b/app/views/layouts/_meta.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%>
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index dc99de504..af9143818 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (autofocus:, extra_classes:) %>
+
 <% search_query = if params[:query]
                     params[:query]
                   elsif params[:lat] && params[:lon]
diff --git a/app/views/layouts/_select_language_button.html.erb b/app/views/layouts/_select_language_button.html.erb
index 4adb9420b..58762904a 100644
--- a/app/views/layouts/_select_language_button.html.erb
+++ b/app/views/layouts/_select_language_button.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (extra_classes:) %>
+
 <%= tag.button (inline_svg_tag "icons/language.svg"),
                :type => "button",
                :class => ["btn btn-outline-secondary align-self-stretch py-1 px-2", *extra_classes],
diff --git a/app/views/layouts/_sidebar_close.html.erb b/app/views/layouts/_sidebar_close.html.erb
index de06f1834..a8519cc7e 100644
--- a/app/views/layouts/_sidebar_close.html.erb
+++ b/app/views/layouts/_sidebar_close.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div class="sidebar-close-controls sticky-top z-0">
   <div class="position-absolute end-0 m-2 rounded-5 bg-body-tertiary shadow-sm">
     <button type="button" disabled class="btn-close d-block p-2 invisible"></button>
diff --git a/app/views/messages/mailboxes/_heading.html.erb b/app/views/messages/mailboxes/_heading.html.erb
index ff69f0a38..79b46b3d9 100644
--- a/app/views/messages/mailboxes/_heading.html.erb
+++ b/app/views/messages/mailboxes/_heading.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (active_link_path:) %>
+
 <% content_for :heading_class, "pb-0" %>
 
 <% content_for :heading do %>
diff --git a/app/views/messages/mailboxes/_message.html.erb b/app/views/messages/mailboxes/_message.html.erb
index 5c9c4eb49..52837fc4a 100644
--- a/app/views/messages/mailboxes/_message.html.erb
+++ b/app/views/messages/mailboxes/_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (message:) %>
+
 <%= tag.tr(:id => "inbox-#{message.id}", :class => { "table-success" => !message.message_read? }) do %>
   <td><%= link_to message.sender.display_name, user_path(message.sender), :class => "username d-inline-block text-truncate text-wrap align-bottom", :dir => "auto" %></td>
   <td><%= link_to message.title, message_path(message) %></td>
diff --git a/app/views/messages/mailboxes/_messages_table.html.erb b/app/views/messages/mailboxes/_messages_table.html.erb
index f9c00c714..5f90324e9 100644
--- a/app/views/messages/mailboxes/_messages_table.html.erb
+++ b/app/views/messages/mailboxes/_messages_table.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (columns:, messages:) %>
+
 <table class="table table-sm align-middle messages-table">
   <thead>
     <tr>
diff --git a/app/views/messages/outboxes/_message.html.erb b/app/views/messages/outboxes/_message.html.erb
index f744d028a..148218bc0 100644
--- a/app/views/messages/outboxes/_message.html.erb
+++ b/app/views/messages/outboxes/_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (message:) %>
+
 <%= tag.tr(:id => "outbox-#{message.id}") do %>
   <td><%= link_to message.recipient.display_name, user_path(message.recipient), :class => "username d-inline-block text-truncate text-wrap align-bottom", :dir => "auto" %></td>
   <td><%= link_to message.title, message_path(message) %></td>
diff --git a/app/views/nodes/_not_found_message.html.erb b/app/views/nodes/_not_found_message.html.erb
index 9297f3b9a..6b0586085 100644
--- a/app/views/nodes/_not_found_message.html.erb
+++ b/app/views/nodes/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p><%= t ".sorry", :id => params[:id] %></p>
 </div>
diff --git a/app/views/notes/_not_found_message.html.erb b/app/views/notes/_not_found_message.html.erb
index 9297f3b9a..6b0586085 100644
--- a/app/views/notes/_not_found_message.html.erb
+++ b/app/views/notes/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p><%= t ".sorry", :id => params[:id] %></p>
 </div>
diff --git a/app/views/notes/_notes_paging_nav.html.erb b/app/views/notes/_notes_paging_nav.html.erb
index 54378b750..b43f1e22c 100644
--- a/app/views/notes/_notes_paging_nav.html.erb
+++ b/app/views/notes/_notes_paging_nav.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <nav>
   <% link_class = "page-link icon-link text-center text-nowrap" %>
   <ul class="pagination">
diff --git a/app/views/oauth2_applications/_application.html.erb b/app/views/oauth2_applications/_application.html.erb
index 796e3e776..85d9f395f 100644
--- a/app/views/oauth2_applications/_application.html.erb
+++ b/app/views/oauth2_applications/_application.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (application:) %>
+
 <tr>
   <td class="align-middle">
     <ul class="list-unstyled mb-0">
diff --git a/app/views/oauth2_applications/_form.html.erb b/app/views/oauth2_applications/_form.html.erb
index 7fde3e0e7..bc2714a32 100644
--- a/app/views/oauth2_applications/_form.html.erb
+++ b/app/views/oauth2_applications/_form.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (f:) %>
+
 <%= f.text_field :name %>
 <%= f.text_area :redirect_uri %>
 <%= f.form_group :confidential do %>
diff --git a/app/views/oauth2_authorized_applications/_application.html.erb b/app/views/oauth2_authorized_applications/_application.html.erb
index 4209b8ff9..cbee1b916 100644
--- a/app/views/oauth2_authorized_applications/_application.html.erb
+++ b/app/views/oauth2_authorized_applications/_application.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (application:) %>
+
 <tr>
   <td class="align-middle">
     <%= application.name %>
diff --git a/app/views/old_elements/_actions.html.erb b/app/views/old_elements/_actions.html.erb
index 4988d6253..d89f3beb5 100644
--- a/app/views/old_elements/_actions.html.erb
+++ b/app/views/old_elements/_actions.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div class="secondary-actions mb-3">
   <% if !@feature.redacted? %>
     <%= link_to t("browse.download_xml"), send(:"api_#{@type}_version_path", *@feature.id) %>
diff --git a/app/views/old_nodes/_not_found_message.html.erb b/app/views/old_nodes/_not_found_message.html.erb
index 692cb239b..9b19f1ce3 100644
--- a/app/views/old_nodes/_not_found_message.html.erb
+++ b/app/views/old_nodes/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p>
     <% if params[:version] %>
diff --git a/app/views/old_relation_members/_not_found_message.html.erb b/app/views/old_relation_members/_not_found_message.html.erb
index 64e8ed613..c9b97e24b 100644
--- a/app/views/old_relation_members/_not_found_message.html.erb
+++ b/app/views/old_relation_members/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p>
     <% if params[:version] %>
diff --git a/app/views/old_relations/_not_found_message.html.erb b/app/views/old_relations/_not_found_message.html.erb
index 64e8ed613..c9b97e24b 100644
--- a/app/views/old_relations/_not_found_message.html.erb
+++ b/app/views/old_relations/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p>
     <% if params[:version] %>
diff --git a/app/views/old_ways/_not_found_message.html.erb b/app/views/old_ways/_not_found_message.html.erb
index d8f3067b5..3026bd9d3 100644
--- a/app/views/old_ways/_not_found_message.html.erb
+++ b/app/views/old_ways/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p>
     <% if params[:version] %>
diff --git a/app/views/preferences/preferences/_navigation.html.erb b/app/views/preferences/preferences/_navigation.html.erb
index e5a78947b..00b7cf7bc 100644
--- a/app/views/preferences/preferences/_navigation.html.erb
+++ b/app/views/preferences/preferences/_navigation.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <ul class="nav nav-tabs">
   <li class="nav-item">
     <%= link_to t(".preferences"), basic_preferences_path, :class => { "nav-link" => true, "active" => controller_name == "basic_preferences" } %>
diff --git a/app/views/preferences/preferences/_update_success_flash.html.erb b/app/views/preferences/preferences/_update_success_flash.html.erb
index 8fd1095ac..39af18639 100644
--- a/app/views/preferences/preferences/_update_success_flash.html.erb
+++ b/app/views/preferences/preferences/_update_success_flash.html.erb
@@ -1 +1,3 @@
+<%# locals: () %>
+
 <%= t ".message" %>
diff --git a/app/views/profiles/profile_sections/_navigation.html.erb b/app/views/profiles/profile_sections/_navigation.html.erb
index 0084e6ab6..0934dc12d 100644
--- a/app/views/profiles/profile_sections/_navigation.html.erb
+++ b/app/views/profiles/profile_sections/_navigation.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <ul class="nav nav-tabs">
   <li class="nav-item">
     <%= link_to t(".description"), profile_description_path, :class => { "nav-link" => true, "active" => controller_name == "descriptions" } %>
diff --git a/app/views/redactions/_redaction.html.erb b/app/views/redactions/_redaction.html.erb
index 9974d2bc9..4fe58c189 100644
--- a/app/views/redactions/_redaction.html.erb
+++ b/app/views/redactions/_redaction.html.erb
@@ -1 +1,3 @@
+<%# locals: (redaction:) %>
+
 <li><%= link_to redaction.title, redaction %></li>
diff --git a/app/views/relation_members/_not_found_message.html.erb b/app/views/relation_members/_not_found_message.html.erb
index 9297f3b9a..6b0586085 100644
--- a/app/views/relation_members/_not_found_message.html.erb
+++ b/app/views/relation_members/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p><%= t ".sorry", :id => params[:id] %></p>
 </div>
diff --git a/app/views/relations/_not_found_message.html.erb b/app/views/relations/_not_found_message.html.erb
index 9297f3b9a..6b0586085 100644
--- a/app/views/relations/_not_found_message.html.erb
+++ b/app/views/relations/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p><%= t ".sorry", :id => params[:id] %></p>
 </div>
diff --git a/app/views/sessions/_suspended_flash.html.erb b/app/views/sessions/_suspended_flash.html.erb
index b8ca5504b..0df6732c2 100644
--- a/app/views/sessions/_suspended_flash.html.erb
+++ b/app/views/sessions/_suspended_flash.html.erb
@@ -1,2 +1,4 @@
+<%# locals: () %>
+
 <p><%= t ".suspended" %></p>
 <p><%= t ".contact_support_html", :support_link => mail_to(Settings.support_email, t(".support")) %></p>
diff --git a/app/views/shared/_markdown_help.html.erb b/app/views/shared/_markdown_help.html.erb
index d2576bfcc..891566a7d 100644
--- a/app/views/shared/_markdown_help.html.erb
+++ b/app/views/shared/_markdown_help.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <h5>
   <%= t ".heading_html", :kramdown_link => link_to(t(".kramdown"), t(".kramdown_url")) %>
 </h5>
diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index 9bb0de60c..71cca2707 100644
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (older_id:, newer_id:, translation_scope: nil) %>
+
 <% if older_id || newer_id %>
 
 <% translation_scope ||= "shared.pagination.#{controller.controller_name}" %>
diff --git a/app/views/shared/_richtext_field.html.erb b/app/views/shared/_richtext_field.html.erb
index eb11aa13c..9461f2d0b 100644
--- a/app/views/shared/_richtext_field.html.erb
+++ b/app/views/shared/_richtext_field.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (object:, attribute:, object_name:, id:, type:, options:, builder:) %>
+
 <div class="richtext_container">
   <ul class="nav nav-tabs mb-3">
     <li class="nav-item">
diff --git a/app/views/shared/_section_divider.html.erb b/app/views/shared/_section_divider.html.erb
index ad6bffd9d..ee3eff743 100644
--- a/app/views/shared/_section_divider.html.erb
+++ b/app/views/shared/_section_divider.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (text:) %>
+
 <div class="d-flex align-items-center my-1">
   <hr class="flex-grow-1 border-secondary" role="separator">
   <span class="mx-3 text-secondary"><%= text %></span>
diff --git a/app/views/site/_about_section.html.erb b/app/views/site/_about_section.html.erb
index 5ba299b36..d41e99825 100644
--- a/app/views/site/_about_section.html.erb
+++ b/app/views/site/_about_section.html.erb
@@ -1,4 +1,6 @@
-<%= tag.section :id => local_assigns[:id] do %>
+<%# locals: (icon:, title:, id: nil) %>
+
+<%= tag.section :id => id do %>
   <div class="d-flex align-items-center gap-2 mb-2">
     <%= inline_svg_tag "about/#{icon}.svg", :class => "flex-shrink-0" %>
     <h2 class="flex-grow-1 mb-0"><%= t ".#{title}_title" %></h2>
diff --git a/app/views/site/_add_a_note.html.erb b/app/views/site/_add_a_note.html.erb
index 495a7dab4..a8509d549 100644
--- a/app/views/site/_add_a_note.html.erb
+++ b/app/views/site/_add_a_note.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <p><%= t ".para_1" %></p>
 <p><%= t ".para_2_html",
          :note_icon => link_to(
diff --git a/app/views/site/_any_questions.html.erb b/app/views/site/_any_questions.html.erb
index 18f440f8e..988b3826e 100644
--- a/app/views/site/_any_questions.html.erb
+++ b/app/views/site/_any_questions.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <h2><%= t ".title" %></h2>
 <div class="d-flex align-items-center gap-2">
   <%= inline_svg_tag "welcome/question.svg", :class => "flex-shrink-0 align-self-start" %>
diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index ef1a7accb..eed388cb2 100644
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <%= javascript_include_tag "edit/id" %>
 
 <div id="map" class="h-100">
diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index bc6a590de..fca8480a4 100644
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div class="container">
   <p><%= t ".removed" %></p>
   <p><%= t ".desktop_application_html", :download_link => link_to(t(".download"), t(".download_url")) %></p>
diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 9d271d4ce..6e2eccf2a 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -1 +1,3 @@
+<%# locals: () %>
+
 <%= render :partial => "potlatch" %>
diff --git a/app/views/social_links/_show.html.erb b/app/views/social_links/_show.html.erb
index 9df2435fc..e414285ea 100644
--- a/app/views/social_links/_show.html.erb
+++ b/app/views/social_links/_show.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (social_links:) %>
+
 <ul class="list-unstyled social_links mb-0">
   <% social_links.each do |social_link| %>
     <li>
diff --git a/app/views/traces/_page.html.erb b/app/views/traces/_page.html.erb
index 31a6f5f12..52f669b03 100644
--- a/app/views/traces/_page.html.erb
+++ b/app/views/traces/_page.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <turbo-frame id="pagination" target="_top" data-turbo="false">
   <%= render "shared/pagination",
              :newer_id => @newer_traces_id,
diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index b56b9cf07..82efde148 100644
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (trace:) %>
+
 <tr>
   <td>
     <% if Settings.status != "gpx_offline" %>
diff --git a/app/views/traces/feeds/_description.html.erb b/app/views/traces/feeds/_description.html.erb
index 538e7f1ec..29dacc688 100644
--- a/app/views/traces/feeds/_description.html.erb
+++ b/app/views/traces/feeds/_description.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (trace:) %>
+
 <%= image_tag trace_icon_url(trace.user, trace) %>
 <% if trace.size -%>
 <%= t ".description_with_count", :count => trace.size, :user => trace.user.display_name %>
diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index c4cb0d0c8..fd921f8c8 100644
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (block:) %>
+
 <tr>
   <% if @show_user_name %>
     <td><%= link_to block.user.display_name, block.user, :class => "username d-inline-block text-truncate text-wrap", :dir => "auto" %></td>
diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb
index 891315e6e..8c1e8dd9a 100644
--- a/app/views/user_blocks/_navigation.html.erb
+++ b/app/views/user_blocks/_navigation.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <ul class="nav nav-tabs">
   <li class="nav-item">
     <%= link_to t(".all_blocks"),
diff --git a/app/views/user_blocks/_page.html.erb b/app/views/user_blocks/_page.html.erb
index 67911aca2..680a8aeed 100644
--- a/app/views/user_blocks/_page.html.erb
+++ b/app/views/user_blocks/_page.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <turbo-frame id="pagination" target="_top" data-turbo="false">
   <%= render "shared/pagination",
              :translation_scope => "shared.pagination.user_blocks",
diff --git a/app/views/user_mailer/_gpx_details.html.erb b/app/views/user_mailer/_gpx_details.html.erb
index 14b836a8b..5b63deb92 100644
--- a/app/views/user_mailer/_gpx_details.html.erb
+++ b/app/views/user_mailer/_gpx_details.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <p><%= t ".details" %></p>
 
 <dl>
diff --git a/app/views/user_mailer/_message_body.html.erb b/app/views/user_mailer/_message_body.html.erb
index 851f153a2..549ae7270 100644
--- a/app/views/user_mailer/_message_body.html.erb
+++ b/app/views/user_mailer/_message_body.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (body:) %>
+
 <table style="font-size: 15px; margin: 15px 0px; background-color: #eee; width: 100%">
   <tr>
     <td style="width: 50px; min-width: 50px; vertical-align: top; padding: 15px">
diff --git a/app/views/users/_auth_association.html.erb b/app/views/users/_auth_association.html.erb
index 8932b7fef..1bcaa07df 100644
--- a/app/views/users/_auth_association.html.erb
+++ b/app/views/users/_auth_association.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <p><%= t ".heading" %></p>
 <p><%= t ".option_1" %></p>
 <p><%= t ".option_2" %></p>
diff --git a/app/views/users/_role_icons.html.erb b/app/views/users/_role_icons.html.erb
index 272a78e11..1a811c46c 100644
--- a/app/views/users/_role_icons.html.erb
+++ b/app/views/users/_role_icons.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <% UserRole::ALL_ROLES.each do |role| %>
   <% if current_user&.administrator? %>
     <% if @user.role?(role) %>
diff --git a/app/views/users/_sidebar_section.html.erb b/app/views/users/_sidebar_section.html.erb
index 8ddbed93a..dfe5ed7ad 100644
--- a/app/views/users/_sidebar_section.html.erb
+++ b/app/views/users/_sidebar_section.html.erb
@@ -1,4 +1,5 @@
-<%# locals: (present: false, edit_title: nil, edit_path: nil) %>
+<%# locals: (present: false, edit_title:, edit_path:) %>
+
 <% editable = edit_title && edit_path && current_user && @user == current_user %>
 <% edit_button_classes = %w[btn btn-sm btn-outline-primary py-0 w-100 overflow-hidden] %>
 <% if present %>
diff --git a/app/views/users/changeset_comments/_page.html.erb b/app/views/users/changeset_comments/_page.html.erb
index 688750997..ecbe866f8 100644
--- a/app/views/users/changeset_comments/_page.html.erb
+++ b/app/views/users/changeset_comments/_page.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <turbo-frame id="pagination" target="_top" data-turbo="false">
   <%= render "shared/pagination",
              :newer_id => @newer_comments_id,
diff --git a/app/views/users/diary_comments/_page.html.erb b/app/views/users/diary_comments/_page.html.erb
index 9b34d85f9..6bac9a818 100644
--- a/app/views/users/diary_comments/_page.html.erb
+++ b/app/views/users/diary_comments/_page.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <turbo-frame id="pagination" target="_top" data-turbo="false">
   <%= render "shared/pagination",
              :newer_id => @newer_comments_id,
diff --git a/app/views/users/lists/_page.html.erb b/app/views/users/lists/_page.html.erb
index 8fafd57e9..9877804ec 100644
--- a/app/views/users/lists/_page.html.erb
+++ b/app/views/users/lists/_page.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <turbo-frame id="pagination" target="_top" data-turbo="false">
   <% unless @users.empty? %>
     <%= form_tag users_list_path, :method => :put do %>
diff --git a/app/views/users/lists/_user.html.erb b/app/views/users/lists/_user.html.erb
index a3900cb38..0281f07db 100644
--- a/app/views/users/lists/_user.html.erb
+++ b/app/views/users/lists/_user.html.erb
@@ -1,3 +1,5 @@
+<%# locals: (user:) %>
+
 <tr>
   <td>
     <%= user_thumbnail(user) %>
diff --git a/app/views/ways/_not_found_message.html.erb b/app/views/ways/_not_found_message.html.erb
index 9297f3b9a..6b0586085 100644
--- a/app/views/ways/_not_found_message.html.erb
+++ b/app/views/ways/_not_found_message.html.erb
@@ -1,3 +1,5 @@
+<%# locals: () %>
+
 <div>
   <p><%= t ".sorry", :id => params[:id] %></p>
 </div>
-- 
2.39.5