Merge branch 'master' into yaml_support

twitter · Sep 6, 2012 · 91bbf07 · 91bbf07
2 parents 6e38698 + 4eb58f6
commit 91bbf07
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/lib/twitter_cldr.rb b/lib/twitter_cldr.rb
@@ -15,7 +15,7 @@
 
 require 'twitter_cldr/version'
 
-Enumerator = Enumerable::Enumerator unless Kernel.const_defined?(:Enumerator)
+Enumerator = Enumerable::Enumerator unless defined?(Enumerator)
 
 module TwitterCldr
 

diff --git a/spec/collation/tailoring_tests/da.txt b/spec/collation/tailoring_tests/da.txt
@@ -1,4 +1,4 @@
-# Pending: 'caseFirst="upper"' is not supported (http://unicode.org/cldr/trac/browser/tags/release-21/common/collation/da.xml#L176).
+# Pending: failures identical to ICU.
 
 X
 x

diff --git a/spec/collation/tailoring_tests/fi.txt b/spec/collation/tailoring_tests/fi.txt
@@ -1,10 +1,4 @@
-# Pending:
-#
-#   [[305, "XW", "xvx"]] - failure identical to ICU
-#
-#   [[125, "xǤx", "xgx"], [283, "xŦx", "xtx"], [347, "xǮx", "xzx"]] - tailoring rules for passing these tests are
-#   proposed, but not confirmed - http://unicode.org/cldr/trac/browser/tags/release-21/common/collation/fi.xml#L219
-#
+# Pending: failures identical to ICU
 
 x
 X

diff --git a/spec/collation/tailoring_tests/zh-Hant.txt b/spec/collation/tailoring_tests/zh-Hant.txt
@@ -1,4 +1,4 @@
-# Pending: `type="stroke"` is not supported (http://unicode.org/cldr/trac/browser/tags/release-21/common/collation/zh_Hant.xml#L11).
+# Pending: failures identical to ICU.
 
 x
 X