From a13b40ace9c98dd2271ef05811b448e28af1751a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 11 Jun 2020 19:44:22 +0100
Subject: [PATCH] Fix new erblint warnings

---
 app/views/browse/_common_details.html.erb                  | 2 +-
 app/views/browse/changeset.html.erb                        | 2 +-
 app/views/changesets/_changeset.html.erb                   | 2 +-
 app/views/diary_entries/_form.html.erb                     | 2 +-
 app/views/layouts/_head.html.erb                           | 2 +-
 app/views/notifier/changeset_comment_notification.html.erb | 2 +-
 app/views/notifier/diary_comment_notification.html.erb     | 2 +-
 app/views/notifier/message_notification.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/site/about.html.erb                              | 2 +-
 app/views/site/id.html.erb                                 | 2 +-
 app/views/users/_contact.html.erb                          | 2 +-
 app/views/users/account.html.erb                           | 2 +-
 app/views/users/show.html.erb                              | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 669e0fe6d..1100fe97b 100644
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -24,7 +24,7 @@
 <% if @type == "node" and common_details.visible? %>
 <div class="details geo">
   <%= t "browse.location" %>
-  <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), :controller => "site", :action => "index", :anchor => "map=18/#{common_details.lat}/#{common_details.lon}") %>
+  <%= link_to(tag.span(number_with_delimiter(common_details.lat), :class => "latitude") + ", " + tag.span(number_with_delimiter(common_details.lon), :class => "longitude"), :controller => "site", :action => "index", :anchor => "map=18/#{common_details.lat}/#{common_details.lon}") %>
 </div>
 <% end %>
 
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 3c41dd83f..afe3f8322 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -128,7 +128,7 @@
       &middot;
     <% end %>
     <%= user = (@prev_by_user || @next_by_user).user.display_name
-        link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user %>
+        link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %>
     <% if @next_by_user %>
       &middot;
       <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>
diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index f1173671e..e3febb1c5 100644
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -10,7 +10,7 @@
      }
    end %>
 
-<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>
+<%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>
   <h6>
     <a class="changeset_id text-dark" href="<%= changeset_path(changeset) %>">
       <%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %>
diff --git a/app/views/diary_entries/_form.html.erb b/app/views/diary_entries/_form.html.erb
index 1b04b1519..9585b09eb 100644
--- a/app/views/diary_entries/_form.html.erb
+++ b/app/views/diary_entries/_form.html.erb
@@ -15,7 +15,7 @@
   </fieldset>
   <fieldset class='location'>
     <label class="standard-label"><%= t ".location" -%></label>
-    <%= content_tag "div", "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
+    <%= tag.div "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
     <div class='standard-form-row clearfix'>
       <div class='form-column'>
         <label class="secondary standard-label"><%= t ".latitude" -%></label>
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 3300dc89c..40d5e6200 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,4 +1,4 @@
-<%= content_tag :head, :data => application_data do %>
+<%= tag.head :data => application_data do %>
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0" />
   <%= javascript_include_tag "html5shiv" unless browser.html5? %>
diff --git a/app/views/notifier/changeset_comment_notification.html.erb b/app/views/notifier/changeset_comment_notification.html.erb
index 3ecf3fdea..85cd87e5e 100644
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -8,7 +8,7 @@
     <%= raw t ".commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %>
   <% end %>
   <% if @changeset_comment %>
-    <%= raw t ".commented.partial_changeset_with_comment", :changeset_comment => content_tag("em", @changeset_comment) %>
+    <%= raw t ".commented.partial_changeset_with_comment", :changeset_comment => tag.em(@changeset_comment) %>
   <% else %>
     <%= t ".commented.partial_changeset_without_comment" %>
   <% end %>
diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb
index 201c14cb0..abf92509f 100644
--- a/app/views/notifier/diary_comment_notification.html.erb
+++ b/app/views/notifier/diary_comment_notification.html.erb
@@ -2,7 +2,7 @@
   <%= t ".hi", :to_user => @to_user %>
 </p>
 <p>
-  <%= raw t ".header", :from_user => link_to_user(@from_user), :subject => content_tag("em", @title) %>
+  <%= raw t ".header", :from_user => link_to_user(@from_user), :subject => tag.em(@title) %>
 </p>
 
 <%= message_body do %>
diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb
index d39ea4039..74d10f599 100644
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -4,7 +4,7 @@
 <p>
   <%= raw t ".header",
             :from_user => link_to_user(@from_user),
-            :subject => content_tag("em", @title) %>
+            :subject => tag.em(@title) %>
 </p>
 
 <%= message_body do %>
diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index 9b44ed461..f1f48c1e1 100644
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -6,5 +6,5 @@
   <% data[:lon] = @lon if @lon -%>
   <% data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx] -%>
   <% data[:url] = id_url(:locale => params[:locale]) -%>
-  <%= content_tag :iframe, "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
+  <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
 </div>
diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index fedecbae8..89ee47f87 100644
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -6,5 +6,5 @@
   <% data[:lat] = @lat if @lat -%>
   <% data[:lon] = @lon if @lon -%>
   <% data[:zoom] = @zoom if @zoom -%>
-  <%= content_tag :div, t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %>
+  <%= tag.div t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %>
 </div>
diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index bab612491..1ff16eac0 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -15,5 +15,5 @@
   <% end %>
   <% data[:locale] = Locale.list(Potlatch2::LOCALES.keys).preferred(preferred_languages).to_s -%>
   <% data[:locale_path] = asset_path("potlatch2/locales/#{Potlatch2::LOCALES[data[:locale]]}.swf") -%>
-  <%= content_tag :div, t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %>
+  <%= tag.div t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %>
 </div>
diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 717059fa2..d1cb9905a 100644
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -6,7 +6,7 @@
 
     <div class='user-image'></div>
 
-    <h1><%= t ".used_by_html", :name => content_tag(:span, "OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>
+    <h1><%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>
   </div>
 
   <div class='text'>
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index e2ce6bb0d..39f75c8ca 100644
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -19,6 +19,6 @@
 <% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%>
 <% data[:locale_path] = asset_path("iD/locales/#{data[:locale]}.json") -%>
 <% data[:asset_map] = assets("iD").to_json -%>
-<%= content_tag :div, "", :id => "id-container", :data => data %>
+<%= tag.div "", :id => "id-container", :data => data %>
 </body>
 </html>
diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index 8379bcd07..d067bd478 100644
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -4,7 +4,7 @@
      :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
      :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
    } %>
-<%= content_tag :div, :class => "contact-activity clearfix", :data => { :user => user_data } do %>
+<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>
   <%= user_thumbnail contact %>
   <div class='activity-details'>
     <p class='deemphasize'>
diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
index 51c933b5d..0f2f3741f 100644
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -166,7 +166,7 @@
       <input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
       <label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>
     </div>
-    <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
+    <%= tag.div "", :id => "map", :class => "content_map settings_map set_location" %>
   </fieldset>
 
   <%= submit_tag t(".save changes button") %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 18b69bdca..1332ab6e2 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -195,7 +195,7 @@
            :icon => image_path("marker-red.png"),
            :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
          } %>
-      <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
+      <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
     <% end %>
 
     <% friends = @user.friends %>
-- 
2.43.2