twitter_cldr 1.9.1 → 2.0.0

data/resources/locales/zh/numbers.yml

@@ -4,25 +4,38 @@
     :formats:
       :currency:
         :patterns:
-          :default: ¤#,##0.00
+          :default: ¤#,##0.00;(¤#,##0.00)
         :unit:
-          :other: ! '{0} {1}'
+          :other: ! '{0}{1}'
       :decimal:
         :patterns:
           :default: ! '#,##0.###'
+          :long:
+            1000: 0
+            10000: 0万
+            100000: 00万
+            1000000: 000万
+            10000000: 0000万
+            100000000: 0亿
+            1000000000: 00亿
+            10000000000: 000亿
+            100000000000: 0000亿
+            1000000000000: 0万亿
+            10000000000000: 00万亿
+            100000000000000: 000万亿
           :short:
             1000: 0
-            10000: 0.0万
+            10000: 0万
             100000: 00万
             1000000: 000万
             10000000: 0000万
-            100000000: 0.0亿
+            100000000: 0亿
             1000000000: 00亿
             10000000000: 000亿
             100000000000: 0000亿
-            1000000000000: 0.0兆
-            10000000000000: 00兆
-            100000000000000: 000兆
+            1000000000000: 0万亿
+            10000000000000: 00万亿
+            100000000000000: 000万亿
       :percent:
         :patterns:
           :default: ! '#,##0%'

data/resources/locales/zh/units.yml

@@ -3,18 +3,14 @@
   :units:
     :day:
       :default:
-        :other: ! '{0}日'
+        :other: ! '{0}天'
       :short:
-        :other: ! '{0}日'
+        :other: ! '{0}天'
     :day-future:
       :default:
-        0: 0天后
-        1: 1天后
         :other: ! '{0}天后'
     :day-past:
       :default:
-        0: 0天前
-        1: 1天前
         :other: ! '{0}天前'
     :hour:
       :default:
@@ -23,58 +19,42 @@
         :other: ! '{0}小时'
     :hour-future:
       :default:
-        0: 0小时后
-        1: 1小时后
         :other: ! '{0}小时后'
     :hour-past:
       :default:
-        0: 0小时前
-        1: 1小时前
         :other: ! '{0}小时前'
     :minute:
       :default:
-        :other: ! '{0}分'
+        :other: ! '{0}分钟'
       :short:
         :other: ! '{0}分'
     :minute-future:
       :default:
-        0: 0分钟后
-        1: 1分钟后
         :other: ! '{0}分钟后'
     :minute-past:
       :default:
-        0: 0分钟前
-        1: 1分钟前
         :other: ! '{0}分钟前'
     :month:
       :default:
-        :other: ! '{0}月'
+        :other: ! '{0}个月'
       :short:
-        :other: ! '{0}月'
+        :other: ! '{0}个月'
     :month-future:
       :default:
-        0: 0个月后
-        1: 1个月后
         :other: ! '{0}个月后'
     :month-past:
       :default:
-        0: 0个月前
-        1: 1个月前
         :other: ! '{0}个月前'
     :second:
       :default:
-        :other: ! '{0}秒'
+        :other: ! '{0}秒钟'
       :short:
         :other: ! '{0}秒'
     :second-future:
       :default:
-        0: 0秒钟后
-        1: 1秒钟后
         :other: ! '{0}秒钟后'
     :second-past:
       :default:
-        0: 0秒钟前
-        1: 1秒钟前
         :other: ! '{0}秒钟前'
     :week:
       :default:
@@ -83,13 +63,9 @@
         :other: ! '{0}周'
     :week-future:
       :default:
-        0: 0周后
-        1: 1周后
         :other: ! '{0}周后'
     :week-past:
       :default:
-        0: 0周前
-        1: 1周前
         :other: ! '{0}周前'
     :year:
       :default:
@@ -98,11 +74,7 @@
         :other: ! '{0}年'
     :year-future:
       :default:
-        0: 0年后
-        1: 1年后
         :other: ! '{0}年后'
     :year-past:
       :default:
-        0: 0年前
-        1: 1年前
         :other: ! '{0}年前'

data/resources/shared/currency_digits_and_rounding.yml

@@ -0,0 +1,187 @@
+---
+:ADP:
+  :digits: 0
+  :rounding: 0
+:AFN:
+  :digits: 0
+  :rounding: 0
+:ALL:
+  :digits: 0
+  :rounding: 0
+:AMD:
+  :digits: 0
+  :rounding: 0
+:BHD:
+  :digits: 3
+  :rounding: 0
+:BIF:
+  :digits: 0
+  :rounding: 0
+:BYR:
+  :digits: 0
+  :rounding: 0
+:CHF:
+  :digits: 2
+  :rounding: 5
+:CLF:
+  :digits: 0
+  :rounding: 0
+:CLP:
+  :digits: 0
+  :rounding: 0
+:COP:
+  :digits: 0
+  :rounding: 0
+:CRC:
+  :digits: 0
+  :rounding: 0
+:DEFAULT:
+  :digits: 2
+  :rounding: 0
+:DJF:
+  :digits: 0
+  :rounding: 0
+:ESP:
+  :digits: 0
+  :rounding: 0
+:GNF:
+  :digits: 0
+  :rounding: 0
+:GYD:
+  :digits: 0
+  :rounding: 0
+:HUF:
+  :digits: 0
+  :rounding: 0
+:IDR:
+  :digits: 0
+  :rounding: 0
+:IQD:
+  :digits: 0
+  :rounding: 0
+:IRR:
+  :digits: 0
+  :rounding: 0
+:ISK:
+  :digits: 0
+  :rounding: 0
+:ITL:
+  :digits: 0
+  :rounding: 0
+:JOD:
+  :digits: 3
+  :rounding: 0
+:JPY:
+  :digits: 0
+  :rounding: 0
+:KMF:
+  :digits: 0
+  :rounding: 0
+:KPW:
+  :digits: 0
+  :rounding: 0
+:KRW:
+  :digits: 0
+  :rounding: 0
+:KWD:
+  :digits: 3
+  :rounding: 0
+:LAK:
+  :digits: 0
+  :rounding: 0
+:LBP:
+  :digits: 0
+  :rounding: 0
+:LUF:
+  :digits: 0
+  :rounding: 0
+:LYD:
+  :digits: 3
+  :rounding: 0
+:MGA:
+  :digits: 0
+  :rounding: 0
+:MGF:
+  :digits: 0
+  :rounding: 0
+:MMK:
+  :digits: 0
+  :rounding: 0
+:MNT:
+  :digits: 0
+  :rounding: 0
+:MRO:
+  :digits: 0
+  :rounding: 0
+:MUR:
+  :digits: 0
+  :rounding: 0
+:OMR:
+  :digits: 3
+  :rounding: 0
+:PKR:
+  :digits: 0
+  :rounding: 0
+:PYG:
+  :digits: 0
+  :rounding: 0
+:RSD:
+  :digits: 0
+  :rounding: 0
+:RWF:
+  :digits: 0
+  :rounding: 0
+:SLL:
+  :digits: 0
+  :rounding: 0
+:SOS:
+  :digits: 0
+  :rounding: 0
+:STD:
+  :digits: 0
+  :rounding: 0
+:SYP:
+  :digits: 0
+  :rounding: 0
+:TMM:
+  :digits: 0
+  :rounding: 0
+:TND:
+  :digits: 3
+  :rounding: 0
+:TRL:
+  :digits: 0
+  :rounding: 0
+:TZS:
+  :digits: 0
+  :rounding: 0
+:UGX:
+  :digits: 0
+  :rounding: 0
+:UZS:
+  :digits: 0
+  :rounding: 0
+:VND:
+  :digits: 0
+  :rounding: 0
+:VUV:
+  :digits: 0
+  :rounding: 0
+:XAF:
+  :digits: 0
+  :rounding: 0
+:XOF:
+  :digits: 0
+  :rounding: 0
+:XPF:
+  :digits: 0
+  :rounding: 0
+:YER:
+  :digits: 0
+  :rounding: 0
+:ZMK:
+  :digits: 0
+  :rounding: 0
+:ZWD:
+  :digits: 0
+  :rounding: 0

data/spec/bidi/bidi_spec.rb

@@ -20,7 +20,7 @@ def expand_bitset_str(bitset)
 end
 
 describe Bidi do
-  it "should pass the derived tests in classpath_bidi_test.txt" do
+  it "should pass the derived tests in classpath_bidi_test.txt", :slow => true do
     expected_level_data = []
     expected_reorder_data = []
     num_failed = 0

data/spec/collation/tailoring_spec.rb

@@ -14,40 +14,44 @@ describe 'Unicode collation tailoring' do
   #
   it 'passes tailoring test for each supported locale', :slow => true do
     TwitterCldr.supported_locales.each do |locale|
-      collator = Collator.new(locale)
+      tailor_file = File.join(File.dirname(__FILE__), 'tailoring_tests', "#{locale}.txt")
 
-      print "#{locale}\t-\t"
+      if File.exist?(tailor_file)
+        collator = Collator.new(locale)
 
-      lines = File.open(File.join(File.dirname(__FILE__), 'tailoring_tests', "#{locale}.txt")) do |file|
-        file.lines.map(&:strip)
-      end
+        print "#{locale}\t-\t"
 
-      active_tests  = lines.count(&method(:tailoring_test?))
-      pending_tests = lines.count(&method(:pending_tailoring_test?))
-      print "tests:  %-4d active, %5.1f%% %5s pending\t-\t" % [active_tests, (100.0 * pending_tests / (pending_tests + active_tests)), "(#{pending_tests})"]
+        lines = File.open(File.join(File.dirname(__FILE__), 'tailoring_tests', "#{locale}.txt")) do |file|
+          file.lines.map(&:strip)
+        end
 
-      last_number = last = nil
+        active_tests  = lines.count(&method(:tailoring_test?))
+        pending_tests = lines.count(&method(:pending_tailoring_test?))
+        print "tests:  %-4d active, %5.1f%% %5s pending\t-\t" % [active_tests, (100.0 * pending_tests / (pending_tests + active_tests)), "(#{pending_tests})"]
 
-      failures = lines.each_with_index.inject([]) do |memo, (current, number)|
-        if tailoring_test?(current)
-          memo << [last_number + 1, last, current] if tailoring_test?(last) && collator.compare(last, current) == 1
+        last_number = last = nil
 
-          last = current
-          last_number = number
-        elsif pending_tailoring_test?(current)
-          last_number = last = nil
-        end
+        failures = lines.each_with_index.inject([]) do |memo, (current, number)|
+          if tailoring_test?(current)
+            memo << [last_number + 1, last, current] if tailoring_test?(last) && collator.compare(last, current) == 1
 
-        memo
-      end
+            last = current
+            last_number = number
+          elsif pending_tailoring_test?(current)
+            last_number = last = nil
+          end
 
-      if failures.empty?
-        puts "OK"
-      else
-        failures_info = "#{failures.size} failures: #{failures.inspect}"
+          memo
+        end
+
+        if failures.empty?
+          puts "OK"
+        else
+          failures_info = "#{failures.size} failures: #{failures.inspect}"
 
-        puts failures_info
-        failures.should(be_empty, "#{locale} - #{failures_info}")
+          puts failures_info
+          failures.should(be_empty, "#{locale} - #{failures_info}")
+        end
       end
     end
   end

data/spec/formatters/calendars/datetime_formatter_spec.rb

@@ -194,8 +194,8 @@ describe DateTimeFormatter do
     end
 
     it "test: pattern MMM" do
-      @formatter.send(:month, Date.new(2010,  1, 1), 'MMM', 3).should == 'Jan'
-      @formatter.send(:month, Date.new(2010, 10, 1), 'MMM', 3).should == 'Okt'
+      @formatter.send(:month, Date.new(2010,  1, 1), 'MMM', 3).should == 'Jan.'
+      @formatter.send(:month, Date.new(2010, 10, 1), 'MMM', 3).should == 'Okt.'
     end
 
     it "test: pattern MMMM" do
@@ -416,5 +416,53 @@ describe DateTimeFormatter do
       @formatter.send(:era, Date.new(2012, 1, 1), 'GGGG', 4).should == "Anno Domini"
       @formatter.send(:era, Date.new(-1, 1, 1), 'GGGG', 4).should == "Before Christ"
     end
+
+    it "should fall back if the calendar doesn't contain the appropriate era data" do
+      stub(@formatter.tokenizer).calendar do
+        {
+          :eras => {
+            :abbr => {
+              0 => "abbr0",
+              1 => "abbr1"
+            },
+            :name => {
+              0 => "name0"
+            }
+          }
+        }
+      end
+
+      date = Date.new(2012, 1, 1)
+      mock.proxy(@formatter).era(date, "GGGG", 4)  # first attempts to find full name era
+      mock.proxy(@formatter).era(date, "GGG", 3)   # falls back to abbreviated era
+      @formatter.send(:era, date, 'GGGG', 4).should == "abbr1"
+    end
+  end
+
+  describe "#month_stand_alone" do
+    it "pattern L" do
+      @formatter.send(:month_stand_alone, Date.new(2010,  1,  1), 'L', 1).should == "1"
+      @formatter.send(:month_stand_alone, Date.new(2010,  10, 1), 'L', 1).should == "10"
+    end
+
+    it "pattern LL" do
+      @formatter.send(:month_stand_alone, Date.new(2010,  1,  1), 'LL', 2).should == "01"
+      @formatter.send(:month_stand_alone, Date.new(2010,  10, 1), 'LL', 2).should == "10"
+    end
+
+    it "pattern LLL" do
+      @formatter.send(:month_stand_alone, Date.new(2010,  1,  1), 'LLL', 3).should == "Jan"
+      @formatter.send(:month_stand_alone, Date.new(2010,  10, 1), 'LLL', 3).should == "Okt"
+    end
+
+    it "pattern LLLL" do
+      @formatter.send(:month_stand_alone, Date.new(2010,  1,  1), 'LLLL', 4).should == "Januar"
+      @formatter.send(:month_stand_alone, Date.new(2010,  10, 1), 'LLLL', 4).should == "Oktober"
+    end
+
+    it "pattern LLLLL" do
+      @formatter.send(:month_stand_alone, Date.new(2010,  1,  1), 'LLLLL', 5).should == "J"
+      @formatter.send(:month_stand_alone, Date.new(2010,  10, 1), 'LLLLL', 5).should == "O"
+    end
   end
 end