erblint: prefer double quoted strings

diff --git a/.erb-lint.yml b/.erb-lint.yml
index a002cdafa46b60535e272a61f25c6f4dafc8998a..340cfd297caadcec8be0a446306af483d1dcbc78 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -41,7 +41,6 @@ linters:
           - app/views/oauth_clients/*
           - app/views/redactions/*
           - app/views/reports/*
-          - app/views/site/*
           - app/views/traces/*
           - app/views/user_blocks/*
           - app/views/users/*

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 111815c12598eb52de4e35855de19d25a4f2266a..219e0ab6b0df3cf11e5eb9f0cd58f5414e25595a 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -32,10 +32,10 @@
 
   <div class='section' id='partners'>
     <h2><div class='icon partners'></div><%= t ".partners_title" %></h2>
-    <p><%= t 'layouts.hosting_partners_html',
-             :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
-             :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
-             :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
+    <p><%= t "layouts.hosting_partners_html",
+             :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+             :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
+             :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
     </p>
   </div>
 </div>

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 2dcccab18fc78fa1a120e5e47ca3e61a26eb569a..feec81c82172053f7921bbd8d537772c58647d1d 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -1,19 +1,19 @@
 <% content_for :heading do %>
-<% if @locale == 'en' %>
+<% if @locale == "en" %>
   <!-- Maybe ease foreigners back to their native page -->
 
-    <% if t('.legal_babble', :locale => I18n.locale) != t('.legal_babble', :locale => :en) %>
+    <% if t(".legal_babble", :locale => I18n.locale) != t(".legal_babble", :locale => :en) %>
       <%= tag.h1 :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
-        <h1><%= t '.native.title' %></h1>
+        <h1><%= t ".native.title" %></h1>
         <p>
-          <%= raw t '.native.text',
-                    :native_link => link_to(t('.native.native_link'),
-                                            :controller => 'site',
-                                            :action => 'copyright',
+          <%= raw t ".native.text",
+                    :native_link => link_to(t(".native.native_link"),
+                                            :controller => "site",
+                                            :action => "copyright",
                                             :copyright_locale => nil),
-                    :mapping_link => link_to(t('.native.mapping_link'),
-                                             :controller => 'site',
-                                             :action => 'index') %>
+                    :mapping_link => link_to(t(".native.mapping_link"),
+                                             :controller => "site",
+                                             :action => "index") %>
         </p>
       <% end %>
       <hr />
@@ -21,14 +21,14 @@
   <% else %>
     <!-- Maybe note that this page has been translated -->
     <%= tag.div :lang => "en", :dir => t("html.dir", :locale => "en") do %>
-      <% if t('.legal_babble', :locale => @locale) != t('.legal_babble', :locale => :en) %>
-        <h1><%= t '.foreign.title' %></h1>
+      <% if t(".legal_babble", :locale => @locale) != t(".legal_babble", :locale => :en) %>
+        <h1><%= t ".foreign.title" %></h1>
         <p>
-          <%= raw t '.foreign.text',
-                    :english_original_link => link_to(t('.foreign.english_link'),
-                                                      :controller => 'site',
-                                                      :action => 'copyright',
-                                                      :copyright_locale => 'en') %>
+          <%= raw t ".foreign.text",
+                    :english_original_link => link_to(t(".foreign.english_link"),
+                                                      :controller => "site",
+                                                      :action => "copyright",
+                                                      :copyright_locale => "en") %>
         </p>
       <% end %>
       <hr />
@@ -51,9 +51,9 @@
   <p><%= t ".legal_babble.credit_2_html", :locale => @locale %></p>
   <p><%= t ".legal_babble.credit_3_html", :locale => @locale %></p>
   <p><%= image_tag("attribution_example.png",
-                   :alt => t('.legal_babble.attribution_example.alt'),
+                   :alt => t(".legal_babble.attribution_example.alt"),
                    :border => 0,
-                   :title => t('.legal_babble.attribution_example.title')) %>
+                   :title => t(".legal_babble.attribution_example.title")) %>
 
   <h3><%= t ".legal_babble.more_title_html", :locale => @locale %></h3>
   <p><%= t ".legal_babble.more_1_html", :locale => @locale %></p>

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index b8e1798eeaf82cbbe965634e68844a7ac6005bda..cfc28f0246d3297d157553e04ebc7aa02514fdd9 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -1,12 +1,12 @@
 <% content_for :content do %>
   <% if Settings.status == "database_offline" or Settings.status == "api_offline" %>
-    <p><%= t 'layouts.osm_offline' %></p>
+    <p><%= t "layouts.osm_offline" %></p>
   <% elsif Settings.status == "database_readonly" or Settings.status == "api_readonly" %>
-    <p><%= t 'layouts.osm_read_only' %></p>
+    <p><%= t "layouts.osm_read_only" %></p>
   <% elsif !current_user.data_public? %>
-    <p><%= t '.not_public' %></p>
-    <p><%= raw t '.not_public_description', :user_page => (link_to t('.user_page_link'), :controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public') %></p>
-    <p><%= raw t 'site.edit.anon_edits', :link => link_to(t('.anon_edits_link_text'), t('.anon_edits_link')) %></p>
+    <p><%= t ".not_public" %></p>
+    <p><%= raw t ".not_public_description", :user_page => (link_to t(".user_page_link"), :controller => "user", :action => "account", :display_name => current_user.display_name, :anchor => "public") %></p>
+    <p><%= raw t "site.edit.anon_edits", :link => link_to(t(".anon_edits_link_text"), t(".anon_edits_link")) %></p>
   <% else %>
     <%= render :partial => preferred_editor %>
   <% end %>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 9bd06a46325ac41246f5df9bdf46c87a9692719f..7bd4273a3d424c6101f6400b426dd8b224d70226 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,53 +1,53 @@
-<% set_title(t('.title')) %>
+<% set_title(t(".title")) %>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t '.title' %>
+  <%= t ".title" %>
 </h2>
 
 <%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %>
-  <%= hidden_field_tag 'format', 'osm' %>
+  <%= hidden_field_tag "format", "osm" %>
 
   <div class='export_area_inputs'>
     <div class='export_boxy'>
-      <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
+      <%= text_field_tag("maxlat", nil, :size => 10, :class => "export_bound") %>
       <br/>
-      <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
-      <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
+      <%= text_field_tag("minlon", nil, :size => 10, :class => "export_bound") %>
+      <%= text_field_tag("maxlon", nil, :size => 10, :class => "export_bound") %>
       <br/><br/>
-      <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
+      <%= text_field_tag("minlat", nil, :size => 10, :class => "export_bound") %>
       </div>
-    <a id='drag_box' href="#"><%= t '.manually_select' %></a>
+    <a id='drag_box' href="#"><%= t ".manually_select" %></a>
   </div>
 
-  <h4><%= t '.licence' %></h4>
-  <p><%= raw t '.export_details' %></p>
+  <h4><%= t ".licence" %></h4>
+  <p><%= raw t ".export_details" %></p>
 
   <div id="export_osm_too_large">
     <p class="warning">
-      <%= t '.too_large.body' %>
+      <%= t ".too_large.body" %>
     </p>
   </div>
 
   <div id="export_commit">
     <div class="export_button">
-      <%= submit_tag t('.export_button') %>
+      <%= submit_tag t(".export_button") %>
     </div>
 
-    <p><%= t '.too_large.advice' %></p>
+    <p><%= t ".too_large.advice" %></p>
   </div>
 
   <dl class="inner12">
-    <dt><a id="export_overpass" href="https://overpass-api.de/api/map?bbox="><%= t '.too_large.overpass.title' %></a></dt>
-    <dd><%= t '.too_large.overpass.description' %></dd>
+    <dt><a id="export_overpass" href="https://overpass-api.de/api/map?bbox="><%= t ".too_large.overpass.title" %></a></dt>
+    <dd><%= t ".too_large.overpass.description" %></dd>
 
-    <dt><a href="https://planet.openstreetmap.org/"><%= t '.too_large.planet.title' %></a></dt>
-    <dd><%= t '.too_large.planet.description' %></dd>
+    <dt><a href="https://planet.openstreetmap.org/"><%= t ".too_large.planet.title" %></a></dt>
+    <dd><%= t ".too_large.planet.description" %></dd>
 
-    <dt><a href="https://download.geofabrik.de/"><%= t '.too_large.geofabrik.title' %></a></dt>
-    <dd><%= t '.too_large.geofabrik.description' %></dd>
+    <dt><a href="https://download.geofabrik.de/"><%= t ".too_large.geofabrik.title" %></a></dt>
+    <dd><%= t ".too_large.geofabrik.description" %></dd>
 
-    <dt><a href="https://wiki.openstreetmap.org/wiki/Download"><%= t '.too_large.other.title' %></a></dt>
-    <dd><%= t '.too_large.other.description' %></dd>
+    <dt><a href="https://wiki.openstreetmap.org/wiki/Download"><%= t ".too_large.other.title" %></a></dt>
+    <dd><%= t ".too_large.other.description" %></dd>
   </dl>
 <% end %>

diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb
index 571a9b25fc0ed445ebf8a3d29e16e97da4f3c4ac..4bb478c7e416e8bf6f1d65ae079dafc409fb6d1e 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -17,7 +17,7 @@
     <h3><%= t ".how_to_help.join_the_community.title" %></h3>
     <%= t ".how_to_help.join_the_community.explanation_html" %>
     <div class='clearfix center'>
-      <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
+      <a class="button sign-up" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
     </div>
   </div>
   <div class='col6 inner11'>

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index 3ca92398ba4c2a18993216a73e642c8a6ce530a7..dcb8142bde5366b6074c59b5ad1a1a29ecbfc726 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -4,7 +4,7 @@
 
 <p class='introduction'><%= t ".introduction" %></p>
 
-<% ['welcome', 'beginners_guide', 'help', 'mailing_lists', 'forums', 'irc', 'switch2osm', 'welcomemat', 'wiki'].each do |site| %>
+<% %w[welcome beginners_guide help mailing_lists forums irc switch2osm welcomemat wiki].each do |site| %>
   <% unless site == 'welcome' && !current_user %>
   <div class='<%= site %> help-item'>
   <h3>

diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index f8d0f5858cc7ab0dc3be3e9bade086b4cd32d69b..e2ce6bb0dc1496893793b43c127ea9cd89fab246 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -2,9 +2,9 @@
 <html>
 <head>
   <meta charset='utf-8'>
-  <%= stylesheet_link_tag 'id' %>
+  <%= stylesheet_link_tag "id" %>
   <!--[if !IE || gte IE 9]><!-->
-  <%= javascript_include_tag 'id' %>
+  <%= javascript_include_tag "id" %>
   <!-- <![endif]-->
 </head>
 <body>

diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb
index 91dfd125023d1fdc61395efc2c0707b9d17f6af6..abcf220e3306810f33a28c254a3551f21c83dd93 100644 (file)
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -2,7 +2,7 @@
   <table class="mapkey-table">
     <% YAML.load_file(Rails.root.join("config", "key.yml")).each do |name,data| %>
       <% data.each do |entry| %>
-        <tr class="mapkey-table-entry" data-layer="<%= name %>" data-zoom-min="<%= entry['min_zoom'] %>" data-zoom-max="<%= entry['max_zoom'] %>">
+        <tr class="mapkey-table-entry" data-layer="<%= name %>" data-zoom-min="<%= entry["min_zoom"] %>" data-zoom-max="<%= entry["max_zoom"] %>">
           <td class="mapkey-table-key">
             <%= image_tag "key/#{name}/#{entry['image']}" %>
           </td>

diff --git a/app/views/site/offline.html.erb b/app/views/site/offline.html.erb
index bfe0bcb9fd3d00a4780bd93ad3f4b855debd8466..8e7b431a8fe1f259e6f84755b220778137f685c1 100644 (file)
--- a/app/views/site/offline.html.erb
+++ b/app/views/site/offline.html.erb
@@ -1,7 +1,7 @@
 <% if Settings.status == "database_offline" %>
-<p><%= t 'layouts.osm_offline' %>
+<p><%= t "layouts.osm_offline" %>
 </p>
 <% else %>
-<p><%= t 'layouts.osm_read_only' %>
+<p><%= t "layouts.osm_read_only" %>
 </p>
 <% end %>