Merge branch 'hotfix/1.6.2'

randylien · May 4, 2012 · ae013f9 · ae013f9
2 parents fb6bfa8 + cd89331
commit ae013f9
Show file tree

Hide file tree

Showing 17 changed files with 239 additions and 144 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 0.4
+  - 0.6
diff --git a/Makefile b/Makefile
@@ -48,6 +48,9 @@ size: moment langs
 size-history: moment
 	node test/filesize-history.js
 
+size-diff: moment
+	node test/filesize-diff.js
+
 
 .PHONY: test hint test-moment test-lang
 test: hint test-moment test-lang

diff --git a/lang/zh-cn.js b/lang/zh-cn.js
@@ -33,7 +33,7 @@
                 sameElse : 'L'
             },
             relativeTime : {
-                future : "%s后",
+                future : "%s内",
                 past : "%s前",
                 s : "几秒",
                 m : "1分钟",

diff --git a/lang/zh-tw.js b/lang/zh-tw.js
@@ -33,7 +33,7 @@
                 sameElse : 'L'
             },
             relativeTime : {
-                future : "%s後",
+                future : "%s內",
                 past : "%s前",
                 s : "幾秒",
                 m : "一分鐘",

diff --git a/min/lang-all.min.js b/min/lang-all.min.js
diff --git a/min/lang/zh-cn.js b/min/lang/zh-cn.js
diff --git a/min/lang/zh-tw.js b/min/lang/zh-tw.js
diff --git a/min/moment.min.js b/min/moment.min.js