Globalize now assigns locale like I18n by converting it to a symbol

* this makes sure both libs use the truly same locale and not :en <=> 'en' * otherwise I18n.locale == Globalize.locale returns false
arturmalecki · May 11, 2011 · 63d4dc7 · 63d4dc7
1 parent f44d006
commit 63d4dc7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/globalize.rb b/lib/globalize.rb
@@ -44,7 +44,7 @@ def read_locale
     end
 
     def set_locale(locale)
-      Thread.current[:globalize_locale] = locale
+      Thread.current[:globalize_locale] = locale.to_sym rescue nil
     end
   end
 end

diff --git a/test/globalize3/locale_test.rb b/test/globalize3/locale_test.rb
@@ -30,6 +30,20 @@ class LocaleTest < Test::Unit::TestCase
     assert_equal :es, Globalize.locale
   end
 
+  test "Globalize locale setting with strings" do
+    I18n.locale = 'de'
+    Globalize.locale = 'de'
+    assert_equal I18n.locale, Globalize.locale
+
+    I18n.locale = 'de'
+    Globalize.locale = :de
+    assert_equal I18n.locale, Globalize.locale
+
+    I18n.locale =  :de
+    Globalize.locale = 'de'
+    assert_equal I18n.locale, Globalize.locale
+  end
+
   test 'with_locale temporarily sets the given locale and yields the block' do
     assert_equal :en, Globalize.locale
     Globalize.with_locale :de do |locale|