Merge pull request #375 from cyberwombat/master

Fix date formatting for 'N' (ISO-8601 numeric representation of the day of the week)
paularmstrong · Jan 10, 2014 · d70b853 · d70b853
2 parents d29067a + 2de7bd6
commit d70b853
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/dateformatter.js b/lib/dateformatter.js
@@ -68,7 +68,7 @@ exports.l = function (input) {
 };
 exports.N = function (input) {
   var d = input.getDay();
-  return (d >= 1) ? d + 1 : 7;
+  return (d >= 1) ? d : 7;
 };
 exports.S = function (input) {
   var d = input.getDate();

diff --git a/tests/filters.test.js b/tests/filters.test.js
@@ -41,7 +41,8 @@ var n = new Swig(),
       { c: 'v|date("D")', v: d, e: 'Tue' },
       { c: 'v|date("j")', v: d, e: '6' },
       { c: 'v|date("l")', v: d, e: 'Tuesday' },
-      { c: 'v|date("N")', v: d, e: '3' },
+      { c: 'v|date("N")', v: d, e: '2' },
+      { c: 'v|date("N")', v: makeDate(420, 2011, 8, 4), e: '7'},
       { c: 'v|date("S")', v: d, e: 'th' },
       { c: 'v|date("w")', v: d, e: '2' },
       { c: 'v|date("z")', v: d, e: '248' },