Fix deprecation warnings

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d571535d356ef4db7646df3b618c816b2b6f4574..b4c0fbc23feb7a5f1fb5c4f1482f740357fde78c 100644 (file)
--- 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 ebdc959e9f8fab5296c0c439511237cd4ee38925..ab4f002200d2bfecbb4da6ec1895caf2f3956773 100644 (file)
--- 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 085381780fab7e094fc71eb3f8e8f4bfc1c3fdd2..007f2a3b4f539be8216ded62748d18fbc05f96d4 100644 (file)
--- 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