X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dcfe326f6515cc7aeb9c02b7536e69863c60cd01..abca51e4d8a51cb484598840a1b2459c651e1e67:/config/application.rb

diff --git a/config/application.rb b/config/application.rb
index 3b470bacc..54390ba29 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -21,7 +21,7 @@ Bundler.require(*Rails.groups)
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 6.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
@@ -31,6 +31,13 @@ module OpenStreetMap
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W[#{config.root}/lib]
 
+    # Continue to use the classic autoloader for now
+    config.autoloader = :classic
+
+    # Force requests from old versions of IE (<= IE8) to be UTF-8 encoded.
+    # This has defaulted to false since rails 6.0
+    config.action_view.default_enforce_utf8 = true
+
     # This defaults to true from rails 5.0 but our code doesn't comply
     # with it at all so we turn it off
     config.active_record.belongs_to_required_by_default = false unless Settings.status == "database_offline"
@@ -46,6 +53,10 @@ module OpenStreetMap
     # Use memcached for caching if required
     config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)
 
+    # 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
+
     # Use logstash for logging if required
     if Settings.key?(:logstash_path)
       config.logstasher.enabled = true