diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 4e0bad7f9..2a960db7a 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -173,7 +173,20 @@ Style/FrozenStringLiteralComment: Style/NumericLiterals: MinDigits: 11 -# Offense count: 28 +# Offense count: 19 # Cop supports --auto-correct. Style/StringConcatenation: - Enabled: false + Exclude: + - 'app/helpers/browse_tags_helper.rb' + - 'app/helpers/user_roles_helper.rb' + - 'app/jobs/trace_importer_job.rb' + - 'app/models/client_application.rb' + - 'app/views/changesets/index.atom.builder' + - 'lib/migrate.rb' + - 'lib/potlatch.rb' + - 'script/cleanup' + - 'script/deliver-message' + - 'script/statistics' + - 'script/update-spam-blocks' + - 'test/controllers/api/relations_controller_test.rb' + - 'test/helpers/user_roles_helper_test.rb' diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb index d85881a31..7e52937a0 100644 --- a/app/helpers/note_helper.rb +++ b/app/helpers/note_helper.rb @@ -3,11 +3,11 @@ module NoteHelper def note_event(event, at, by) if by.nil? - t("browse.note." + event + "_by_anonymous_html", + t("browse.note.#{event}_by_anonymous_html", :when => friendly_date_ago(at), :exact_time => l(at)) else - t("browse.note." + event + "_by_html", + t("browse.note.#{event}_by_html", :when => friendly_date_ago(at), :exact_time => l(at), :user => note_author(by)) diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb index 164703436..099af8681 100644 --- a/app/helpers/title_helper.rb +++ b/app/helpers/title_helper.rb @@ -6,7 +6,7 @@ module TitleHelper def set_title(title = nil) if title @title = TitleHelper.coder.decode(title.gsub("", "\u202a").gsub("", "\u202c")) - response.headers["X-Page-Title"] = ERB::Util.u(@title + " | " + t("layouts.project_name.title")) + response.headers["X-Page-Title"] = ERB::Util.u("#{@title} | #{t('layouts.project_name.title')}") else @title = title response.headers["X-Page-Title"] = ERB::Util.u(t("layouts.project_name.title")) diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb index 51b2bb3e6..5c96dadaf 100644 --- a/app/views/browse/_relation_member.html.erb +++ b/app/views/browse/_relation_member.html.erb @@ -1,6 +1,6 @@ <% member_class = link_class(relation_member.member_type.downcase, relation_member.member) linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) } - type_str = t ".type." + relation_member.member_type.downcase %> + type_str = t ".type.#{relation_member.member_type.downcase}" %>
  • <%= if relation_member.member_role.blank? t ".entry_html", :type => type_str, :name => linked_name diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 65bd9ced3..5a457cea7 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -6,8 +6,8 @@ <%= @issue.assigned_role %> | <%= t ".reports", :count => @issue.reports.count %> | <%= t ".report_created_at", :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %> - <%= " | " + t(".last_resolved_at", :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly)) if @issue.resolved_at? %> - <%= " | " + t(".last_updated_at", :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name) if @issue.user_updated %> + <%= " | #{t('.last_resolved_at', :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly))}" if @issue.resolved_at? %> + <%= " | #{t('.last_updated_at', :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name)}" if @issue.user_updated %>

    diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 19fd31343..9fdb2637f 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -5,7 +5,7 @@ <%= javascript_include_tag "es5" unless browser.es5? %> <%= javascript_include_tag "es6" unless browser.es6? %> <%= javascript_include_tag "application" %> - <%= javascript_include_tag "i18n/" + I18n.locale.to_s %> + <%= javascript_include_tag "i18n/#{I18n.locale}" %> <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %> <%= stylesheet_link_tag "print-#{dir}", :media => "print" %> <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %> @@ -14,5 +14,5 @@ <%= yield :auto_discovery_link_tag %> <%= csrf_meta_tag %> <%= csp_meta_tag %> - <%= @title + " | " if @title %><%= t "layouts.project_name.title" %> + <%= "#{@title} | " if @title %><%= t "layouts.project_name.title" %> <% end %> diff --git a/app/views/oauth_clients/show.html.erb b/app/views/oauth_clients/show.html.erb index 5f828a057..e6aa85e3e 100644 --- a/app/views/oauth_clients/show.html.erb +++ b/app/views/oauth_clients/show.html.erb @@ -19,7 +19,7 @@

    <%= t ".requests" %>

    <%= t ".support_notice" %>

    diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index ff15836b7..c2f4183eb 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -21,7 +21,7 @@ when "public", "identifiable" then "success" else "danger" end %> - <%= t("." + trace.visibility) %> + <%= t(".#{trace.visibility}") %>
    <%= trace.description %> diff --git a/app/views/users/_popup.html.erb b/app/views/users/_popup.html.erb index 684cf3237..a643b5c90 100644 --- a/app/views/users/_popup.html.erb +++ b/app/views/users/_popup.html.erb @@ -1,5 +1,5 @@
    <%= user_thumbnail popup %> -

    <%= t("." + type) %>

    +

    <%= t(".#{type}") %>

    <%= link_to popup.display_name, user_path(popup) %>

    diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb index bc8b86ef2..b3e42189b 100644 --- a/app/views/users/terms.html.erb +++ b/app/views/users/terms.html.erb @@ -23,7 +23,7 @@
    <% end %> diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb index 0b9731b22..44375ae5b 100644 --- a/lib/bounding_box.rb +++ b/lib/bounding_box.rb @@ -72,7 +72,7 @@ class BoundingBox def check_size(max_area = Settings.max_request_area) # check the bbox isn't too large if area > max_area - raise OSM::APIBadBoundingBox, "The maximum bbox size is " + max_area.to_s + + raise OSM::APIBadBoundingBox, "The maximum bbox size is #{max_area}" \ ", and your request was too large. Either request a smaller area, or use planet.osm" end self diff --git a/lib/osm.rb b/lib/osm.rb index 04cbf17fa..a6d740677 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -497,8 +497,8 @@ module OSM # Return the terms and conditions text for a given country def self.legal_text_for_country(country_code) - file_name = Rails.root.join("config", "legales", country_code.to_s + ".yml") - file_name = Rails.root.join("config", "legales", Settings.default_legale + ".yml") unless File.exist? file_name + file_name = Rails.root.join("config", "legales", "#{country_code}.yml") + file_name = Rails.root.join("config", "legales", "#{Settings.default_legale}.yml") unless File.exist? file_name YAML.load_file(file_name).transform_values!(&:html_safe) end