Skip to content

Commit b1ea756

Browse files
committed
locale-zhCN
1 parent c36befc commit b1ea756

File tree

2 files changed

+122
-2
lines changed

2 files changed

+122
-2
lines changed

src/locale/zh-CN.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ var d3_locale_zhCN = d3.locale({
55
thousands: ",",
66
grouping: [3],
77
currency: ["¥", ""],
8-
dateTime: "%a %b %e %X %Y",
8+
dateTime: "%Y %b %e %a %X",
99
date: "%Y/%-m/%-d",
1010
time: "%H:%M:%S",
1111
periods: ["上午", "下午"],
1212
days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
13-
shortDays: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
13+
shortDays: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
1414
months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
1515
shortMonths: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"]
1616
});

test/locale/locale-zhcn-test.js

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
var vows = require("vows"),
2+
load = require("../load"),
3+
assert = require("../assert"),
4+
time = require("../time/time"),
5+
local = time.local;
6+
7+
var suite = vows.describe("d3.locale");
8+
9+
suite.addBatch({
10+
"locale": {
11+
topic: load("locale/zh-CN").expression("d3_locale_zhCN"),
12+
13+
"numberFormat": {
14+
topic: function(locale) {
15+
return locale.numberFormat;
16+
},
17+
"formats numbers": function(format) {
18+
var f = format(",.2f");
19+
assert.equal(f(12345.67), "12,345.67");
20+
},
21+
"formats currencies": function(format) {
22+
var f = format("$,.2f");
23+
assert.equal(f(12345.67), "¥12,345.67");
24+
},
25+
"formats currencies with SI-prefix notation and currency suffix": function(format) {
26+
var f = format("$,.4s");
27+
assert.equal(f(12345.67), "¥12.35k");
28+
}
29+
},
30+
31+
"timeFormat": {
32+
topic: function(locale) {
33+
return locale.timeFormat;
34+
},
35+
36+
"format": {
37+
"formats locale date and time": function(format) {
38+
var f = format("%c");
39+
assert.equal(f(local(1990, 0, 1)), "1990 一月 1 周一 00:00:00");
40+
},
41+
"formats locale date": function(format) {
42+
var f = format("%x");
43+
assert.equal(f(local(1990, 0, 1)), "1990/1/1");
44+
},
45+
"formats locale time": function(format) {
46+
var f = format("%X");
47+
assert.equal(f(local(1990, 0, 1)), "00:00:00");
48+
},
49+
"formats abbreviated weekday": function(format) {
50+
var f = format("%a");
51+
assert.equal(f(local(1990, 0, 1)), "周一");
52+
assert.equal(f(local(1990, 0, 2)), "周二");
53+
assert.equal(f(local(1990, 0, 3)), "周三");
54+
assert.equal(f(local(1990, 0, 4)), "周四");
55+
assert.equal(f(local(1990, 0, 5)), "周五");
56+
assert.equal(f(local(1990, 0, 6)), "周六");
57+
assert.equal(f(local(1990, 0, 7)), "周日");
58+
},
59+
"formats weekday": function(format) {
60+
var f = format("%A");
61+
assert.equal(f(local(1990, 0, 1)), "星期一");
62+
assert.equal(f(local(1990, 0, 2)), "星期二");
63+
assert.equal(f(local(1990, 0, 3)), "星期三");
64+
assert.equal(f(local(1990, 0, 4)), "星期四");
65+
assert.equal(f(local(1990, 0, 5)), "星期五");
66+
assert.equal(f(local(1990, 0, 6)), "星期六");
67+
assert.equal(f(local(1990, 0, 7)), "星期日");
68+
},
69+
"formats abbreviated month": function(format) {
70+
var f = format("%b");
71+
assert.equal(f(local(1990, 0, 1)), "一月");
72+
assert.equal(f(local(1990, 1, 1)), "二月");
73+
assert.equal(f(local(1990, 2, 1)), "三月");
74+
assert.equal(f(local(1990, 3, 1)), "四月");
75+
assert.equal(f(local(1990, 4, 1)), "五月");
76+
assert.equal(f(local(1990, 5, 1)), "六月");
77+
assert.equal(f(local(1990, 6, 1)), "七月");
78+
assert.equal(f(local(1990, 7, 1)), "八月");
79+
assert.equal(f(local(1990, 8, 1)), "九月");
80+
assert.equal(f(local(1990, 9, 1)), "十月");
81+
assert.equal(f(local(1990, 10, 1)), "十一月");
82+
assert.equal(f(local(1990, 11, 1)), "十二月");
83+
},
84+
"formats month": function(format) {
85+
var f = format("%B");
86+
assert.equal(f(local(1990, 0, 1)), "一月");
87+
assert.equal(f(local(1990, 1, 1)), "二月");
88+
assert.equal(f(local(1990, 2, 1)), "三月");
89+
assert.equal(f(local(1990, 3, 1)), "四月");
90+
assert.equal(f(local(1990, 4, 1)), "五月");
91+
assert.equal(f(local(1990, 5, 1)), "六月");
92+
assert.equal(f(local(1990, 6, 1)), "七月");
93+
assert.equal(f(local(1990, 7, 1)), "八月");
94+
assert.equal(f(local(1990, 8, 1)), "九月");
95+
assert.equal(f(local(1990, 9, 1)), "十月");
96+
assert.equal(f(local(1990, 10, 1)), "十一月");
97+
assert.equal(f(local(1990, 11, 1)), "十二月");
98+
},
99+
"formats AM or PM": function(format) {
100+
var f = format("%p");
101+
assert.equal(f(local(1990, 0, 1, 0)), "上午");
102+
assert.equal(f(local(1990, 0, 1, 13)), "下午");
103+
}
104+
},
105+
106+
"parse": {
107+
"parses locale date and time": function(format) {
108+
var p = format("%c").parse;
109+
assert.deepEqual(p("1990 一月 1 周一 00:00:00"), local(1990, 0, 1));
110+
},
111+
"parses locale date": function(format) {
112+
var p = format("%x").parse;
113+
assert.deepEqual(p("1990/1/1"), local(1990, 0, 1));
114+
}
115+
}
116+
}
117+
}
118+
});
119+
120+
suite.export(module);

0 commit comments

Comments
 (0)