Merge remote-tracking branch 'upstream/master' into vagrant

[rails.git] / config / initializers / i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index f3da8a1274855d3ebfe1535ff43468f826c58db2..156eea4ecad2d8a1992f30d99970d1eb3166bee6 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -42,4 +42,8 @@ I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")
 
 
 I18n.fallbacks.map("no" => "nb")
 

-I18n.available_locales
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do |app|
+  I18n.available_locales
+end