Improve locale selection algorithm

[rails.git] / test / lib / locale_test.rb

diff --git a/test/lib/locale_test.rb b/test/lib/locale_test.rb
index 4d457116013e55ca6c84bfb208018801de3d4136..13df643b25cbb674ba4edc0cf7ff34daa7d924b5 100644 (file)
--- a/test/lib/locale_test.rb
+++ b/test/lib/locale_test.rb
@@ -80,7 +80,7 @@ class LocaleTest < ActiveSupport::TestCase
   end
 
   def test_available
-    assert_equal I18n.available_locales.count, Locale.available.count
+    assert Locale.available.count <= I18n.available_locales.count
   end
 
   def test_preferred
@@ -91,9 +91,7 @@ class LocaleTest < ActiveSupport::TestCase
     assert_equal "de", Locale.available.preferred(Locale.list("zh-Hant", "de")).to_s
     assert_equal "zh-TW", Locale.available.preferred(Locale.list("zh-Hant-TW", "de")).to_s
     assert_equal "zh-TW", Locale.available.preferred(Locale.list("zh-TW", "de")).to_s
-    assert_equal "zh-HK", Locale.available.preferred(Locale.list("yue", "zh-HK", "de")).to_s
-    assert_equal "zh-yue", Locale.available.preferred(Locale.list("yue", "zh-yue", "zh-HK", "de")).to_s
-    assert_equal "zh-yue", Locale.available.preferred(Locale.list("yue", "zh-YUE", "zh-HK", "de")).to_s
+    assert_equal "zh-TW", Locale.available.preferred(Locale.list("zh-HK", "zh-hk", "zh-Hant", "zh-hant", "zh-TW", "zh-tw", "zh", "zh-yue", "yue", "yue-Hant", "yue-HK", "yue-Hans", "zh-classical", "lzh", "ja-Hani", "ko-Hani", "ko_hanja", "vi-Hani", "ja-hani", "ko-hani", "vi-hani", "en-HK", "en-hk", "en-SG", "en-sg", "en-GB", "en-gb", "en-US", "en-us", "en", "ja")).to_s
     assert_equal "en", Locale.available.preferred(Locale.list("yue")).to_s
   end
 end