Merge remote-tracking branch 'openstreetmap/pull/1335'

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

diff --git a/test/lib/locale_test.rb b/test/lib/locale_test.rb
index 3ba9b205fda0f767fb5ce9694a38f19e5026755c..a100515c8178316c7e0f6f8ed229d523ef398695 100644 (file)
--- a/test/lib/locale_test.rb
+++ b/test/lib/locale_test.rb
@@ -86,7 +86,7 @@ class LocaleTest < ActiveSupport::TestCase
   def test_preferred
     assert_equal "en-GB", Locale.available.preferred(Locale.list("en-GB", "en")).to_s
     assert_equal "en", Locale.available.preferred(Locale.list("en")).to_s
   def test_preferred
     assert_equal "en-GB", Locale.available.preferred(Locale.list("en-GB", "en")).to_s
     assert_equal "en", Locale.available.preferred(Locale.list("en")).to_s

-    assert_equal "fr", Locale.available.preferred(Locale.list("fr-FR", "fr", "en")).to_s
+    assert_equal "fr", Locale.available.preferred(Locale.list("fr-GB", "fr", "en")).to_s

     assert_equal "fr", Locale.available.preferred(Locale.list("fr", "en")).to_s
     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 "fr", Locale.available.preferred(Locale.list("fr", "en")).to_s
     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