Merge pull request ruby-i18n#244 from semaperepelitsa/rescue_nil

locale= and default_locale now raise when setting a truthy value that
cannot be converted with #to_sym.

Conflicts:
	test/i18n_test.rb

Author: carlosantoniodasilva

lib/i18n/config.rb

@@ -9,7 +9,7 @@ def locale
     # Sets the current locale pseudo-globally, i.e. in the Thread.current hash.
     def locale=(locale)
       I18n.enforce_available_locales!(locale)
-      @locale = locale.to_sym rescue nil
+      @locale = locale && locale.to_sym
     end
 
     # Returns the current backend. Defaults to +Backend::Simple+.
@@ -30,7 +30,7 @@ def default_locale
     # Sets the current default locale. Used to set a custom default locale.
     def default_locale=(locale)
       I18n.enforce_available_locales!(locale)
-      @@default_locale = locale.to_sym rescue nil
+      @@default_locale = locale && locale.to_sym
     end
 
     # Returns an array of locales for which translations are available.

test/i18n_test.rb

@@ -38,6 +38,10 @@ def setup
     end
   end
 
+  test "default_locale= doesn't ignore junk" do
+    assert_raise(NoMethodError) { I18n.default_locale = Class }
+  end
+
   test "raises an I18n::InvalidLocale exception when setting an unavailable default locale" do
     begin
       I18n.config.enforce_available_locales = true
@@ -58,6 +62,10 @@ def setup
     I18n.locale = :en
   end
 
+  test "locale= doesn't ignore junk" do
+    assert_raise(NoMethodError) { I18n.locale = Class }
+  end
+
   test "raises an I18n::InvalidLocale exception when setting an unavailable locale" do
     begin
       I18n.config.enforce_available_locales = true