From 6078e642bac0729585f11db6d42d7333d8c2114b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 16 Sep 2020 16:59:10 +0100 Subject: [PATCH] Fix erblint warnings --- app/views/browse/_node.html.erb | 12 ++++++------ app/views/browse/_relation.html.erb | 12 ++++++------ app/views/browse/_way.html.erb | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb index ab91a9728..77d3a5c16 100644 --- a/app/views/browse/_node.html.erb +++ b/app/views/browse/_node.html.erb @@ -1,5 +1,5 @@ <% if node.redacted? %> -
+
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.node"), :version => node.version, @@ -7,14 +7,14 @@ :id => node.redaction.id), node.redaction) %>
<% else %> -
+
<%= render :partial => "common_details", :object => node %> <% unless node.ways.empty? and node.containing_relation_members.empty? %>

<%= t "browse.part_of" %>

<% unless node.ways.empty? %> -
> - <%= t 'browse.part_of_ways', :count => node.ways.count %> +
> + <%= t "browse.part_of_ways", :count => node.ways.count %>
    <% node.ways.uniq.each do |way| %>
  • <%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %>
  • @@ -23,8 +23,8 @@
<% end %> <% unless node.containing_relation_members.empty? %> -
> - <%= t 'browse.part_of_relations', :count => node.containing_relation_members.count %> +
> + <%= t "browse.part_of_relations", :count => node.containing_relation_members.count %>
    <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb index 1dc78afba..cf9c62b13 100644 --- a/app/views/browse/_relation.html.erb +++ b/app/views/browse/_relation.html.erb @@ -1,5 +1,5 @@ <% if relation.redacted? %> -
+
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.relation"), :version => relation.version, @@ -7,13 +7,13 @@ :id => relation.redaction.id), relation.redaction) %>
<% else %> -
+
<%= render :partial => "common_details", :object => relation %> <% unless relation.containing_relation_members.empty? %>

<%= t "browse.part_of" %>

-
> - <%= t 'browse.part_of_relations', :count => relation.containing_relation_members.count %> +
> + <%= t "browse.part_of_relations", :count => relation.containing_relation_members.count %>
    <%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %>
@@ -22,8 +22,8 @@ <% unless relation.relation_members.empty? %>

<%= t ".members" %>

-
> - <%= t '.members_count', :count => relation.relation_members.count %> +
> + <%= t ".members_count", :count => relation.relation_members.count %>
    <%= render :partial => "relation_member", :collection => relation.relation_members %>
diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index 2788fdea9..d99919e64 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -1,5 +1,5 @@ <% if way.redacted? %> -
+
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.way"), :version => way.version, @@ -7,13 +7,13 @@ :id => way.redaction.id), way.redaction) %>
<% else %> -
+
<%= render :partial => "common_details", :object => way %> <% unless way.containing_relation_members.empty? %>

<%= t "browse.part_of" %>

-
> - <%= t 'browse.part_of_relations', :count => way.containing_relation_members.count %> +
> + <%= t "browse.part_of_relations", :count => way.containing_relation_members.count %>
    <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
@@ -22,8 +22,8 @@ <% unless way.way_nodes.empty? %>

<%= t ".nodes" %>

-
> - <%= t '.nodes_count', :count => way.way_nodes.count %> +
> + <%= t ".nodes_count", :count => way.way_nodes.count %>
    <% way.way_nodes.each do |wn| %>
  • -- 2.39.5