twitter_cldr 3.5.0 → 3.6.0

data/resources/locales/zh/fields.yml

@@ -2,107 +2,303 @@
 :zh: 
   :fields: 
     :day: 
-      :default: 
-        :one: "{0} day"
-        :other: "{0}天"
-      :short: 
-        :one: "{0} day"
-        :other: "{0}天"
-    :day-future: 
-      :default: 
-        :one: "In {0} day"
-        :other: "{0}天后"
-    :day-past: 
-      :default: 
-        :one: "{0} day ago"
-        :other: "{0}天前"
+      :display_name: 日
+      :relative: 
+        -1: 昨天
+        -2: 前天
+        0: 今天
+        1: 明天
+        2: 后天
+      :relative_time: 
+        :future: 
+          :other: "{0}天后"
+        :past: 
+          :other: "{0}天前"
+    :day-narrow: 
+      :display_name: 日
+      :relative_time: 
+        :future: 
+          :other: "{0}天后"
+        :past: 
+          :other: "{0}天前"
+    :day-short: 
+      :display_name: 日
+      :relative_time: 
+        :future: 
+          :other: "{0}天后"
+        :past: 
+          :other: "{0}天前"
+    :dayperiod: 
+      :display_name: 上午/下午
+    :era: 
+      :display_name: 纪元
+    :fri: 
+      :relative: 
+        -1: 上周五
+        0: 本周五
+        1: 下周五
+    :fri-narrow: 
+      :relative: 
+        -1: 上周五
+        0: 本周五
+        1: 下周五
+    :fri-short: 
+      :relative: 
+        -1: 上周五
+        0: 本周五
+        1: 下周五
     :hour: 
-      :default: 
-        :one: "{0} hour"
-        :other: "{0}小时"
-      :short: 
-        :one: "{0} hr"
-        :other: "{0}小时"
-    :hour-future: 
-      :default: 
-        :one: "In {0} hour"
-        :other: "{0}小时后"
-    :hour-past: 
-      :default: 
-        :one: "{0} hour ago"
-        :other: "{0}小时前"
+      :display_name: 小时
+      :relative_time: 
+        :future: 
+          :other: "{0}小时后"
+        :past: 
+          :other: "{0}小时前"
+    :hour-narrow: 
+      :display_name: 小时
+      :relative_time: 
+        :future: 
+          :other: "{0}小时后"
+        :past: 
+          :other: "{0}小时前"
+    :hour-short: 
+      :display_name: 小时
+      :relative_time: 
+        :future: 
+          :other: "{0}小时后"
+        :past: 
+          :other: "{0}小时前"
     :minute: 
-      :default: 
-        :one: "{0} minute"
-        :other: "{0}分钟"
-      :short: 
-        :one: "{0} min"
-        :other: "{0}分"
-    :minute-future: 
-      :default: 
-        :one: "In {0} minute"
-        :other: "{0}分钟后"
-    :minute-past: 
-      :default: 
-        :one: "{0} minute ago"
-        :other: "{0}分钟前"
+      :display_name: 分钟
+      :relative_time: 
+        :future: 
+          :other: "{0}分钟后"
+        :past: 
+          :other: "{0}分钟前"
+    :minute-narrow: 
+      :display_name: 分钟
+      :relative_time: 
+        :future: 
+          :other: "{0}分钟后"
+        :past: 
+          :other: "{0}分钟前"
+    :minute-short: 
+      :display_name: 分钟
+      :relative_time: 
+        :future: 
+          :other: "{0}分钟后"
+        :past: 
+          :other: "{0}分钟前"
+    :mon: 
+      :relative: 
+        -1: 上周一
+        0: 本周一
+        1: 下周一
+    :mon-narrow: 
+      :relative: 
+        -1: 上周一
+        0: 本周一
+        1: 下周一
+    :mon-short: 
+      :relative: 
+        -1: 上周一
+        0: 本周一
+        1: 下周一
     :month: 
-      :default: 
-        :one: "{0} month"
-        :other: "{0}个月"
-      :short: 
-        :one: "{0} mth"
-        :other: "{0}个月"
-    :month-future: 
-      :default: 
-        :one: "In {0} month"
-        :other: "{0}个月后"
-    :month-past: 
-      :default: 
-        :one: "{0} month ago"
-        :other: "{0}个月前"
+      :display_name: 月
+      :relative: 
+        -1: 上个月
+        0: 本月
+        1: 下个月
+      :relative_time: 
+        :future: 
+          :other: "{0}个月后"
+        :past: 
+          :other: "{0}个月前"
+    :month-narrow: 
+      :display_name: 月
+      :relative_time: 
+        :future: 
+          :other: "{0}个月后"
+        :past: 
+          :other: "{0}个月前"
+    :month-short: 
+      :display_name: 月
+      :relative_time: 
+        :future: 
+          :other: "{0}个月后"
+        :past: 
+          :other: "{0}个月前"
+    :quarter: 
+      :display_name: 季
+      :relative_time: 
+        :future: 
+          :other: "{0}季度后"
+        :past: 
+          :other: "{0}季度前"
+    :quarter-narrow: 
+      :display_name: 季
+      :relative_time: 
+        :future: 
+          :other: "{0}季度后"
+        :past: 
+          :other: "{0}季度前"
+    :quarter-short: 
+      :display_name: 季
+      :relative_time: 
+        :future: 
+          :other: "{0}季度后"
+        :past: 
+          :other: "{0}季度前"
+    :sat: 
+      :relative: 
+        -1: 上周六
+        0: 本周六
+        1: 下周六
+    :sat-narrow: 
+      :relative: 
+        -1: 上周六
+        0: 本周六
+        1: 下周六
+    :sat-short: 
+      :relative: 
+        -1: 上周六
+        0: 本周六
+        1: 下周六
     :second: 
-      :default: 
-        :one: "{0} second"
-        :other: "{0}秒钟"
-      :short: 
-        :one: "{0} sec"
-        :other: "{0}秒"
-    :second-future: 
-      :default: 
-        :one: "In {0} second"
-        :other: "{0}秒钟后"
-    :second-past: 
-      :default: 
-        :one: "{0} second ago"
-        :other: "{0}秒钟前"
+      :display_name: 秒钟
+      :relative: 
+        0: 现在
+      :relative_time: 
+        :future: 
+          :other: "{0}秒钟后"
+        :past: 
+          :other: "{0}秒钟前"
+    :second-narrow: 
+      :display_name: 秒钟
+      :relative_time: 
+        :future: 
+          :other: "{0}秒后"
+        :past: 
+          :other: "{0}秒前"
+    :second-short: 
+      :display_name: 秒钟
+      :relative_time: 
+        :future: 
+          :other: "{0}秒后"
+        :past: 
+          :other: "{0}秒前"
+    :sun: 
+      :relative: 
+        -1: 上周日
+        0: 本周日
+        1: 下周日
+    :sun-narrow: 
+      :relative: 
+        -1: 上周日
+        0: 本周日
+        1: 下周日
+    :sun-short: 
+      :relative: 
+        -1: 上周日
+        0: 本周日
+        1: 下周日
+    :thu: 
+      :relative: 
+        -1: 上周四
+        0: 本周四
+        1: 下周四
+    :thu-narrow: 
+      :relative: 
+        -1: 上周四
+        0: 本周四
+        1: 下周四
+    :thu-short: 
+      :relative: 
+        -1: 上周四
+        0: 本周四
+        1: 下周四
+    :tue: 
+      :relative: 
+        -1: 上周二
+        0: 本周二
+        1: 下周二
+    :tue-narrow: 
+      :relative: 
+        -1: 上周二
+        0: 本周二
+        1: 下周二
+    :tue-short: 
+      :relative: 
+        -1: 上周二
+        0: 本周二
+        1: 下周二
+    :wed: 
+      :relative: 
+        -1: 上周三
+        0: 本周三
+        1: 下周三
+    :wed-narrow: 
+      :relative: 
+        -1: 上周三
+        0: 本周三
+        1: 下周三
+    :wed-short: 
+      :relative: 
+        -1: 上周三
+        0: 本周三
+        1: 下周三
     :week: 
-      :default: 
-        :one: "{0} week"
-        :other: "{0}周"
-      :short: 
-        :one: "{0} wk"
-        :other: "{0}周"
-    :week-future: 
-      :default: 
-        :one: "In {0} week"
-        :other: "{0}周后"
-    :week-past: 
-      :default: 
-        :one: "{0} week ago"
-        :other: "{0}周前"
+      :display_name: 周
+      :relative: 
+        -1: 上周
+        0: 本周
+        1: 下周
+      :relative_time: 
+        :future: 
+          :other: "{0}周后"
+        :past: 
+          :other: "{0}周前"
+    :week-narrow: 
+      :display_name: 周
+      :relative_time: 
+        :future: 
+          :other: "{0}周后"
+        :past: 
+          :other: "{0}周前"
+    :week-short: 
+      :display_name: 周
+      :relative_time: 
+        :future: 
+          :other: "{0}周后"
+        :past: 
+          :other: "{0}周前"
+    :weekday: 
+      :display_name: 工作日
     :year: 
-      :default: 
-        :one: "{0} year"
-        :other: "{0}年"
-      :short: 
-        :one: "{0} yr"
-        :other: "{0}年"
-    :year-future: 
-      :default: 
-        :one: "In {0} year"
-        :other: "{0}年后"
-    :year-past: 
-      :default: 
-        :one: "{0} year ago"
-        :other: "{0}年前"
+      :display_name: 年
+      :relative: 
+        -1: 去年
+        0: 今年
+        1: 明年
+      :relative_time: 
+        :future: 
+          :other: "{0}年后"
+        :past: 
+          :other: "{0}年前"
+    :year-narrow: 
+      :display_name: 年
+      :relative_time: 
+        :future: 
+          :other: "{0}年后"
+        :past: 
+          :other: "{0}年前"
+    :year-short: 
+      :display_name: 年
+      :relative_time: 
+        :future: 
+          :other: "{0}年后"
+        :past: 
+          :other: "{0}年前"
+    :zone: 
+      :display_name: 时区

data/spec/data_readers/timespan_data_reader_spec.rb

@@ -8,9 +8,74 @@ require 'spec_helper'
 include TwitterCldr::DataReaders
 
 describe TimespanDataReader do
-  let(:data_reader) { TimespanDataReader.new(:sv, 2) }
+  it 'sets default options and identifies plural rule' do
+    data_reader = TimespanDataReader.new(:sv, 2)
+    expect(data_reader.locale).to eq(:sv)
+    expect(data_reader.type).to eq(:default)
+    expect(data_reader.direction).to eq(:ago)
+    expect(data_reader.unit).to eq(nil)
+    expect(data_reader.plural_rule).to eq(:other)
+  end
+
+  describe '#pattern' do
+    test_cases = {
+      ago: {
+        default: {
+          second: 'för {0} sekunder sedan',
+          minute: 'för {0} minuter sedan',
+          hour: 'för {0} timmar sedan',
+          day: 'för {0} dagar sedan',
+          week: 'för {0} veckor sedan',
+          month: 'för {0} månader sedan',
+          year: 'för {0} år sedan'
+        },
+
+        narrow: {
+          second: '−{0} s',
+          minute: '−{0} min',
+          hour: '−{0} h',
+          day: '−{0} d',
+          week: '-{0} v.',
+          month: '-{0} mån.',
+          year: '-{0} år'
+        }
+      },
+
+      until: {
+        default: {
+          second: 'om {0} sekunder',
+          minute: 'om {0} minuter',
+          hour: 'om {0} timmar',
+          day: 'om {0} dagar',
+          week: 'om {0} veckor',
+          month: 'om {0} månader',
+          year: 'om {0} år'
+        },
+
+        narrow: {
+          second: '+{0} s',
+          minute: '+{0} m',
+          hour: '+{0} h',
+          day: '+{0} d',
+          week: '+{0} v.',
+          month: '+{0} mån.',
+          year: '+{0} år'
+        }
+      }
+    }
+
+    test_cases.each_pair do |direction, dir_hash|
+      dir_hash.each_pair do |type, type_hash|
+        type_hash.each_pair do |unit, expected_value|
+          it "finds the correct pattern with direction '#{direction}', type '#{type}', and unit '#{unit}'" do
+            data_reader = TimespanDataReader.new(:sv, 2, {
+              direction: direction, type: type, unit: unit
+            })
 
-  xit "works" do
-    # TODO: add tests
+            expect(data_reader.pattern).to match_normalized(expected_value)
+          end
+        end
+      end
+    end
   end
 end