From 52c688f55aa9b1a97e869a3b3a972056e3063cb5 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Oct 2020 17:15:14 +0100
Subject: [PATCH] Prefer string interpolation to concatenation

---
 .rubocop_todo.yml           | 17 +++++++++++++++--
 app/helpers/note_helper.rb  |  4 ++--
 app/helpers/title_helper.rb |  2 +-
 lib/bounding_box.rb         |  2 +-
 lib/osm.rb                  |  4 ++--
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cfff8c43e..96bf94b8e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -189,7 +189,20 @@ Style/OptionalBooleanParameter:
     - 'test/models/trace_test.rb'
     - 'test/models/tracetag_test.rb'
 
-# 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("<bdi>", "\u202a").gsub("</bdi>", "\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/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
 
-- 
2.39.5