Merge remote-tracking branch 'upstream/pull/2937' into master

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 651d32907626b3393414feb6e54193f9a42d712a..54390ba29363a79a6eb182fadc922fcd6ab68af7 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -53,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)
 
     # 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
     # Use logstash for logging if required
     if Settings.key?(:logstash_path)
       config.logstasher.enabled = true