i18n.enforce_available_locales overrides the I18n configuration

rafaelfranca · rafaelfranca · commit 26cf9af9e5fd · 2014-12-29T16:10:37.000-03:00
This will make Rails work with i18n 0.6 and 0.7.
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
@@ -36,7 +36,11 @@ def self.initialize_i18n(app)
       # Avoid issues with setting the default_locale by disabling available locales
       # check while configuring.
       enforce_available_locales = app.config.i18n.delete(:enforce_available_locales)
-      enforce_available_locales = I18n.enforce_available_locales unless I18n.enforce_available_locales.nil?
+
+      if enforce_available_locales.nil?
+        enforce_available_locales = I18n.enforce_available_locales
+      end
+
       I18n.enforce_available_locales = false
 
       app.config.i18n.each do |setting, value|
diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
@@ -198,7 +198,9 @@ class Foo < ActiveRecord::Base
       end
     end
 
-    test "disable config.i18n.enforce_available_locales" do
+    test "disable config.i18n.enforce_available_locales when initial value is nil" do
+      I18n.enforce_available_locales = nil
+
       add_to_config <<-RUBY
         config.i18n.enforce_available_locales = false
         config.i18n.default_locale = :fr
@@ -213,10 +215,28 @@ class Foo < ActiveRecord::Base
       end
     end
 
-    test "default config.i18n.enforce_available_locales does not override I18n.enforce_available_locales" do
+    test "disable config.i18n.enforce_available_locales when initial value is true" do
+      I18n.enforce_available_locales = true
+
+      add_to_config <<-RUBY
+        config.i18n.enforce_available_locales = false
+        config.i18n.default_locale = :fr
+      RUBY
+
+      output = capture(:stderr) { load_app }
+      assert_no_match %r{deprecated.*enforce_available_locales}, output
+      assert_equal false, I18n.enforce_available_locales
+
+      assert_nothing_raised do
+        I18n.locale = :es
+      end
+    end
+
+    test "disable config.i18n.enforce_available_locales when initial value is false" do
       I18n.enforce_available_locales = false
 
       add_to_config <<-RUBY
+        config.i18n.enforce_available_locales = false
         config.i18n.default_locale = :fr
       RUBY
 
