Merge remote-tracking branch 'upstream/pull/4717'

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 2303d321c0344dd87b0f281c300a6b9aa3535df1..4517e8adfb611d8d073041274321212ff95bf6e1 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.

-    config.load_defaults 7.0
+    config.load_defaults 7.1

 
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.
 
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.


@@ -35,6 +35,8 @@ module OpenStreetMap
     # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
     # the I18n.default_locale when a translation cannot be found).
     config.i18n.fallbacks = true
     # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
     # the I18n.default_locale when a translation cannot be found).
     config.i18n.fallbacks = true

+    # Enables custom error message formats
+    config.active_model.i18n_customize_full_message = true

 
     # Use logstash for logging if required
     if Settings.key?(:logstash_path)
 
     # Use logstash for logging if required
     if Settings.key?(:logstash_path)