From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Sun, 13 Oct 2013 08:48:39 +0000 (-0700)
Subject: Merge branch 'develop' of github.com:zenozeng/moment into zenozeng-develop
X-Git-Tag: 2.4.0~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=479b650557d8a5ce2ac64ccfec0df5bd2f5e098b;p=thirdparty%2Fmoment.git

Merge branch 'develop' of github.com:zenozeng/moment into zenozeng-develop

Conflicts:
	lang/zh-cn.js
---

479b650557d8a5ce2ac64ccfec0df5bd2f5e098b
diff --cc test/lang/zh-cn.js
index e7f77963a,a9823f545..a15694fbf
--- a/test/lang/zh-cn.js
+++ b/test/lang/zh-cn.js
@@@ -337,22 -335,12 +335,20 @@@ exports["lang:zh-cn"] = 
      },
  
      "weeks year starting sunday format" : function (test) {
-         test.expect(5);
+         test.expect(3);
  
-         test.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1周', "Jan  1 2012 应该是第 1周");
+         test.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52周', "Jan  1 2012 应该是第52周");
          test.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1周', "Jan  7 2012 应该是第 1周");
-         test.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2周', "Jan  8 2012 应该是第 2周");
          test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2周', "Jan 14 2012 应该是第 2周");
-         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3周', "Jan 15 2012 应该是第 3周");
  
 +        test.done();
 +    },
 +    
 +    "returns the name of the language" : function (test) {
 +        if (typeof module !== 'undefined' && module.exports) {
 +            test.equal(require('../../lang/zh-cn'), 'zh-cn', "module should export zh-cn");
 +        }
 +        
          test.done();
      }
  };