diff --git a/.erb-lint.yml b/.erb-lint.yml index a002cdafa..340cfd297 100644 --- 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 111815c12..219e0ab6b 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -32,10 +32,10 @@
<%= 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/") %> +
<%= 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/") %>
- <%= 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") %>
<% end %>- <%= 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") %>
<% end %><%= t ".legal_babble.credit_2_html", :locale => @locale %>
<%= t ".legal_babble.credit_3_html", :locale => @locale %>
<%= 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")) %>
<%= t ".legal_babble.more_1_html", :locale => @locale %>
diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index b8e1798ee..cfc28f024 100644 --- 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" %> -<%= t 'layouts.osm_offline' %>
+<%= t "layouts.osm_offline" %>
<% elsif Settings.status == "database_readonly" or Settings.status == "api_readonly" %> -<%= t 'layouts.osm_read_only' %>
+<%= t "layouts.osm_read_only" %>
<% elsif !current_user.data_public? %> -<%= t '.not_public' %>
-<%= 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') %>
-<%= raw t 'site.edit.anon_edits', :link => link_to(t('.anon_edits_link_text'), t('.anon_edits_link')) %>
+<%= t ".not_public" %>
+<%= 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") %>
+<%= raw t "site.edit.anon_edits", :link => link_to(t(".anon_edits_link_text"), t(".anon_edits_link")) %>
<% else %> <%= render :partial => preferred_editor %> <% end %> diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index 9bd06a463..7bd4273a3 100644 --- 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")) %><%= raw t '.export_details' %>
+<%= raw t ".export_details" %>
- <%= t '.too_large.body' %> + <%= t ".too_large.body" %>
<%= t '.too_large.advice' %>
+<%= t ".too_large.advice" %>
<%= t ".introduction" %>
-<% ['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 %><%= image_tag "key/#{name}/#{entry['image']}" %> | diff --git a/app/views/site/offline.html.erb b/app/views/site/offline.html.erb index bfe0bcb9f..8e7b431a8 100644 --- a/app/views/site/offline.html.erb +++ b/app/views/site/offline.html.erb @@ -1,7 +1,7 @@ <% if Settings.status == "database_offline" %> -