From: Tom Hughes <tom@compton.nu>
Date: Tue, 29 Dec 2020 22:36:26 +0000 (+0000)
Subject: Fix deprecation warnings
X-Git-Tag: live~2138^2~1
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/bf851691bf3eb9999e5624a04eef00db5800f5f0

Fix deprecation warnings
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d571535d3..b4c0fbc23 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -208,7 +208,7 @@ class ApplicationController < ActionController::Base
     report_error e.message, :bad_request
   rescue ActiveRecord::RecordInvalid => e
     message = "#{e.record.class} #{e.record.id}: "
-    e.record.errors.each { |attr, msg| message << "#{attr}: #{msg} (#{e.record[attr].inspect})" }
+    e.record.errors.each { |error| message << "#{error.attribute}: #{error.message} (#{e.record[error.attribute].inspect})" }
     report_error message, :bad_request
   rescue OSM::APIError => e
     report_error e.message, e.status
diff --git a/config/environments/development.rb b/config/environments/development.rb
index ebdc959e9..ab4f00220 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -65,7 +65,7 @@ Rails.application.configure do
   config.middleware.use I18n::JS::Middleware
 
   # Raises error for missing translations.
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 085381780..007f2a3b4 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -55,7 +55,7 @@ Rails.application.configure do
   config.middleware.use I18n::JS::Middleware
 
   # Raises error for missing translations.
-  config.action_view.raise_on_missing_translations = true
+  config.i18n.raise_on_missing_translations = true
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true