From 5a86b9f3fd0f64749c740686354538a86d71157b Mon Sep 17 00:00:00 2001 From: aleafs Date: Sat, 3 Nov 2012 16:29:43 +0800 Subject: [PATCH] fix bug of get week number of a year --- moment.js | 7 ++++--- test/lang/bg.js | 2 +- test/lang/cs.js | 2 +- test/lang/cv.js | 2 +- test/lang/da.js | 2 +- test/lang/de.js | 2 +- test/lang/en-ca.js | 2 +- test/lang/en-gb.js | 2 +- test/lang/en.js | 2 +- test/lang/eo.js | 2 +- test/lang/es.js | 2 +- test/lang/et.js | 2 +- test/lang/eu.js | 2 +- test/lang/fi.js | 2 +- test/lang/fr-ca.js | 2 +- test/lang/fr.js | 2 +- test/lang/hu.js | 2 +- test/lang/id.js | 2 +- test/lang/is.js | 2 +- test/lang/it.js | 2 +- test/lang/ja.js | 2 +- test/lang/jp.js | 2 +- test/lang/ko.js | 2 +- test/lang/kr.js | 2 +- test/lang/lv.js | 2 +- test/lang/nb.js | 2 +- test/lang/ne.js | 4 ++-- test/lang/nl.js | 2 +- test/lang/pl.js | 2 +- test/lang/pt-br.js | 2 +- test/lang/pt.js | 2 +- test/lang/ro.js | 2 +- test/lang/ru.js | 2 +- test/lang/sv.js | 2 +- test/lang/tr.js | 2 +- test/lang/zh-cn.js | 2 +- test/lang/zh-tw.js | 2 +- 37 files changed, 41 insertions(+), 40 deletions(-) diff --git a/moment.js b/moment.js index 174f7fff1..87123e3f6 100644 --- a/moment.js +++ b/moment.js @@ -105,9 +105,10 @@ return this.lang().weekdays(this, format); }, w : function () { - var a = new Date(this.year(), this.month(), this.date() - this.day() + 5), - b = new Date(a.getFullYear(), 0, 4); - return ~~((a - b) / 864e5 / 7 + 1.5); + var a = new Date(this.year(), this.month(), this.date()); + a.setHours(0, 0, 0); + a.setDate(a.getDate() + 4 - (a.getDay() || 7)); + return Math.ceil((1 + (a - (new Date(a.getFullYear(), 0, 1))) / 864e5) / 7); }, YY : function () { return leftZeroFill(this.year() % 100, 2); diff --git a/test/lang/bg.js b/test/lang/bg.js index 732d84f60..098592f39 100644 --- a/test/lang/bg.js +++ b/test/lang/bg.js @@ -39,7 +39,7 @@ exports["lang:bg"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. неделя нед нд'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/cs.js b/test/lang/cs.js index a8bc29914..4d010e4c9 100644 --- a/test/lang/cs.js +++ b/test/lang/cs.js @@ -38,7 +38,7 @@ exports["lang:cs"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. neděle ne ne'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/cv.js b/test/lang/cv.js index 3de0f3354..dfd0063a8 100644 --- a/test/lang/cv.js +++ b/test/lang/cv.js @@ -39,7 +39,7 @@ exports["lang:cv"] = { ['D Do DD', '14 14-мĕш 14'], ['d do dddd ddd dd', '0 0-мĕш вырсарникун выр вр'], ['DDD DDDo DDDD', '45 45-мĕш 045'], - ['w wo ww', '8 8-мĕш 08'], + ['w wo ww', '6 6-мĕш 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/da.js b/test/lang/da.js index 2bcf26c3e..fb474511f 100644 --- a/test/lang/da.js +++ b/test/lang/da.js @@ -39,7 +39,7 @@ exports["lang:da"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. Søndag Søn Sø'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/de.js b/test/lang/de.js index 59d535892..1f1cb1309 100644 --- a/test/lang/de.js +++ b/test/lang/de.js @@ -39,7 +39,7 @@ exports["lang:de"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. Sonntag So. So'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/en-ca.js b/test/lang/en-ca.js index d59de281d..e721f4872 100644 --- a/test/lang/en-ca.js +++ b/test/lang/en-ca.js @@ -39,7 +39,7 @@ exports["lang:en-ca"] = { ['D Do DD', '14 14th 14'], ['d do dddd ddd dd', '0 0th Sunday Sun Su'], ['DDD DDDo DDDD', '45 45th 045'], - ['w wo ww', '8 8th 08'], + ['w wo ww', '6 6th 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/en-gb.js b/test/lang/en-gb.js index 6641b8130..eec79165b 100644 --- a/test/lang/en-gb.js +++ b/test/lang/en-gb.js @@ -39,7 +39,7 @@ exports["lang:en-gb"] = { ['D Do DD', '14 14th 14'], ['d do dddd ddd dd', '0 0th Sunday Sun Su'], ['DDD DDDo DDDD', '45 45th 045'], - ['w wo ww', '8 8th 08'], + ['w wo ww', '6 6th 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/en.js b/test/lang/en.js index 5f368b811..ff8afa947 100644 --- a/test/lang/en.js +++ b/test/lang/en.js @@ -39,7 +39,7 @@ exports["lang:en"] = { ['D Do DD', '14 14th 14'], ['d do dddd ddd dd', '0 0th Sunday Sun Su'], ['DDD DDDo DDDD', '45 45th 045'], - ['w wo ww', '8 8th 08'], + ['w wo ww', '6 6th 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/eo.js b/test/lang/eo.js index 0641e1535..b034ad6b4 100644 --- a/test/lang/eo.js +++ b/test/lang/eo.js @@ -39,7 +39,7 @@ exports["lang:eo"] = { ['D Do DD', '14 14a 14'], ['d do dddd ddd dd', '0 0a Dimanĉo Dim Di'], ['DDD DDDo DDDD', '45 45a 045'], - ['w wo ww', '8 8a 08'], + ['w wo ww', '6 6a 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/es.js b/test/lang/es.js index 538fc0332..21e393a29 100644 --- a/test/lang/es.js +++ b/test/lang/es.js @@ -39,7 +39,7 @@ exports["lang:es"] = { ['D Do DD', '14 14º 14'], ['d do dddd ddd dd', '0 0º domingo dom. Do'], ['DDD DDDo DDDD', '45 45º 045'], - ['w wo ww', '8 8º 08'], + ['w wo ww', '6 6º 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/et.js b/test/lang/et.js index c33a44577..9f28b1694 100644 --- a/test/lang/et.js +++ b/test/lang/et.js @@ -39,7 +39,7 @@ exports["lang:et"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. pühapäev P P'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/eu.js b/test/lang/eu.js index b701e4654..73df376c8 100644 --- a/test/lang/eu.js +++ b/test/lang/eu.js @@ -39,7 +39,7 @@ exports["lang:eu"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. igandea ig. ig'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/fi.js b/test/lang/fi.js index 6c83ff4c8..70d7c619f 100644 --- a/test/lang/fi.js +++ b/test/lang/fi.js @@ -39,7 +39,7 @@ exports["lang:fi"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. sunnuntai su su'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/fr-ca.js b/test/lang/fr-ca.js index 83c165b8f..edf5ef105 100644 --- a/test/lang/fr-ca.js +++ b/test/lang/fr-ca.js @@ -39,7 +39,7 @@ exports["lang:fr-ca"] = { ['D Do DD', '14 14ème 14'], ['d do dddd ddd dd', '0 0ème dimanche dim. Di'], ['DDD DDDo DDDD', '45 45ème 045'], - ['w wo ww', '8 8ème 08'], + ['w wo ww', '6 6ème 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/fr.js b/test/lang/fr.js index 170bdb7a8..72f94176b 100644 --- a/test/lang/fr.js +++ b/test/lang/fr.js @@ -39,7 +39,7 @@ exports["lang:fr"] = { ['D Do DD', '14 14ème 14'], ['d do dddd ddd dd', '0 0ème dimanche dim. Di'], ['DDD DDDo DDDD', '45 45ème 045'], - ['w wo ww', '8 8ème 08'], + ['w wo ww', '6 6ème 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/hu.js b/test/lang/hu.js index a2ef51251..f081fb8cf 100644 --- a/test/lang/hu.js +++ b/test/lang/hu.js @@ -38,7 +38,7 @@ exports["lang:hu"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd', '0 0. vasárnap v'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['H HH', '15 15'], ['m mm', '25 25'], ['s ss', '50 50'], diff --git a/test/lang/id.js b/test/lang/id.js index 0d1db4d07..da344bfab 100644 --- a/test/lang/id.js +++ b/test/lang/id.js @@ -39,7 +39,7 @@ exports["lang:id"] = { ['D Do DD', '14 14 14'], ['d do dddd ddd dd', '0 0 Minggu Min Mg'], ['DDD DDDo DDDD', '45 45 045'], - ['w wo ww', '8 8 08'], + ['w wo ww', '6 6 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/is.js b/test/lang/is.js index a59ed4472..34d475213 100644 --- a/test/lang/is.js +++ b/test/lang/is.js @@ -39,7 +39,7 @@ exports["lang:is"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. sunnudagur sun Su'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/it.js b/test/lang/it.js index d9716b0e3..70559c248 100644 --- a/test/lang/it.js +++ b/test/lang/it.js @@ -39,7 +39,7 @@ exports["lang:it"] = { ['D Do DD', '14 14º 14'], ['d do dddd ddd dd', '0 0º Domenica Dom D'], ['DDD DDDo DDDD', '45 45º 045'], - ['w wo ww', '8 8º 08'], + ['w wo ww', '6 6º 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/ja.js b/test/lang/ja.js index 0705ae751..e2e2c3b3f 100644 --- a/test/lang/ja.js +++ b/test/lang/ja.js @@ -39,7 +39,7 @@ exports["lang:jp"] = { ['D Do DD', '14 14 14'], ['d do dddd ddd dd', '0 0 日曜日 日 日'], ['DDD DDDo DDDD', '45 45 045'], - ['w wo ww', '8 8 08'], + ['w wo ww', '6 6 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/jp.js b/test/lang/jp.js index 8b47f7a47..9ed84ee2b 100644 --- a/test/lang/jp.js +++ b/test/lang/jp.js @@ -39,7 +39,7 @@ exports["lang:jp"] = { ['D Do DD', '14 14 14'], ['d do dddd ddd dd', '0 0 日曜日 日 日'], ['DDD DDDo DDDD', '45 45 045'], - ['w wo ww', '8 8 08'], + ['w wo ww', '6 6 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/ko.js b/test/lang/ko.js index 8e55ca4dd..8a4901e87 100644 --- a/test/lang/ko.js +++ b/test/lang/ko.js @@ -38,7 +38,7 @@ exports["lang:kr"] = { ['D Do DD', '14 14일 14'], ['d do dddd ddd dd', '0 0일 일요일 일 일'], ['DDD DDDo DDDD', '45 45일 045'], - ['w wo ww', '8 8일 08'], + ['w wo ww', '6 6일 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/kr.js b/test/lang/kr.js index 67314eb8e..a0dd0bb2d 100644 --- a/test/lang/kr.js +++ b/test/lang/kr.js @@ -38,7 +38,7 @@ exports["lang:kr"] = { ['D Do DD', '14 14일 14'], ['d do dddd ddd dd', '0 0일 일요일 일 일'], ['DDD DDDo DDDD', '45 45일 045'], - ['w wo ww', '8 8일 08'], + ['w wo ww', '6 6일 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/lv.js b/test/lang/lv.js index d28fc65eb..07c01655d 100644 --- a/test/lang/lv.js +++ b/test/lang/lv.js @@ -39,7 +39,7 @@ exports["lang:lv"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. svētdiena Sv Sv'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/nb.js b/test/lang/nb.js index 6d0ab02ee..392228fbb 100644 --- a/test/lang/nb.js +++ b/test/lang/nb.js @@ -39,7 +39,7 @@ exports["lang:nb"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. søndag søn sø'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/ne.js b/test/lang/ne.js index d3f8a5b11..c6b2685f5 100644 --- a/test/lang/ne.js +++ b/test/lang/ne.js @@ -39,7 +39,7 @@ exports["lang:ne"] = { ['D Do DD', '१४ १४ १४'], ['d do dddd ddd dd', '० ० आइतबार आइत. आइ.'], ['DDD DDDo DDDD', '४५ ४५ ०४५'], - ['w wo ww', '८ ८ ०८'], + ['w wo ww', '६ ६ ०६'], ['h hh', '३ ०३'], ['H HH', '१५ १५'], ['m mm', '२५ २५'], @@ -266,4 +266,4 @@ exports["lang:ne"] = { test.done(); } -}; \ No newline at end of file +}; diff --git a/test/lang/nl.js b/test/lang/nl.js index 6d6525501..b7cf1ea28 100644 --- a/test/lang/nl.js +++ b/test/lang/nl.js @@ -39,7 +39,7 @@ exports["lang:nl"] = { ['D Do DD', '14 14de 14'], ['d do dddd ddd dd', '0 0de zondag zo. Zo'], ['DDD DDDo DDDD', '45 45ste 045'], - ['w wo ww', '8 8ste 08'], + ['w wo ww', '6 6de 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/pl.js b/test/lang/pl.js index 9e315f580..d34d9cafc 100644 --- a/test/lang/pl.js +++ b/test/lang/pl.js @@ -39,7 +39,7 @@ exports["lang:pl"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. niedziela nie N'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/pt-br.js b/test/lang/pt-br.js index 9f6b93582..01ecd20c9 100644 --- a/test/lang/pt-br.js +++ b/test/lang/pt-br.js @@ -39,7 +39,7 @@ exports["lang:pt-br"] = { ['D Do DD', '14 14º 14'], ['d do dddd ddd', '0 0º Domingo Dom'], ['DDD DDDo DDDD', '45 45º 045'], - ['w wo ww', '8 8º 08'], + ['w wo ww', '6 6º 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/pt.js b/test/lang/pt.js index 27731d8e6..8d1dd6219 100644 --- a/test/lang/pt.js +++ b/test/lang/pt.js @@ -39,7 +39,7 @@ exports["lang:pt"] = { ['D Do DD', '14 14º 14'], ['d do dddd ddd dd', '0 0º Domingo Dom Dom'], ['DDD DDDo DDDD', '45 45º 045'], - ['w wo ww', '8 8º 08'], + ['w wo ww', '6 6º 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/ro.js b/test/lang/ro.js index 1773584e3..d9b13a0a0 100644 --- a/test/lang/ro.js +++ b/test/lang/ro.js @@ -39,7 +39,7 @@ exports["lang:ro"] = { ['D Do DD', '14 14 14'], ['d do dddd ddd dd', '0 0 Duminică Dum Du'], ['DDD DDDo DDDD', '45 45 045'], - ['w wo ww', '8 8 08'], + ['w wo ww', '6 6 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/ru.js b/test/lang/ru.js index 05af6a0cb..bcf4b386d 100644 --- a/test/lang/ru.js +++ b/test/lang/ru.js @@ -39,7 +39,7 @@ exports["lang:ru"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. воскресенье вск вс'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/sv.js b/test/lang/sv.js index 43c7f60f0..fc9d59ed2 100644 --- a/test/lang/sv.js +++ b/test/lang/sv.js @@ -39,7 +39,7 @@ exports["lang:sv"] = { ['D Do DD', '14 14e 14'], ['d do dddd ddd dd', '0 0e söndag sön sö'], ['DDD DDDo DDDD', '45 45e 045'], - ['w wo ww', '8 8e 08'], + ['w wo ww', '6 6e 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/tr.js b/test/lang/tr.js index 2fce8a3a2..3e01afd3b 100644 --- a/test/lang/tr.js +++ b/test/lang/tr.js @@ -38,7 +38,7 @@ exports["lang:tr"] = { ['D Do DD', '14 14\'üncü 14'], ['d do dddd ddd dd', '0 0\'ıncı Pazar Paz Pz'], ['DDD DDDo DDDD', '45 45\'inci 045'], - ['w wo ww', '8 8\'inci 08'], + ['w wo ww', '6 6\'ncı 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/zh-cn.js b/test/lang/zh-cn.js index 7bcfef54c..7ead067a6 100644 --- a/test/lang/zh-cn.js +++ b/test/lang/zh-cn.js @@ -39,7 +39,7 @@ exports["lang:zh-cn"] = { ['D Do DD', '14 14 14'], ['d do dddd ddd dd', '0 0 星期日 周日 日'], ['DDD DDDo DDDD', '45 45 045'], - ['w wo ww', '8 8 08'], + ['w wo ww', '6 6 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], diff --git a/test/lang/zh-tw.js b/test/lang/zh-tw.js index bba8cc4a1..854ab3641 100644 --- a/test/lang/zh-tw.js +++ b/test/lang/zh-tw.js @@ -39,7 +39,7 @@ exports["lang:zh-tw"] = { ['D Do DD', '14 14 14'], ['d do dddd ddd dd', '0 0 星期日 週日 日'], ['DDD DDDo DDDD', '45 45 045'], - ['w wo ww', '8 8 08'], + ['w wo ww', '6 6 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], -- 2.47.2