Merge pull request #1545 from icambron/abstracted-year-parsing

Allow customized two-digit-year parsing
moment · Apr 2, 2014 · b2020bf · b2020bf
2 parents ba96963 + f781846
commit b2020bf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/moment.js b/moment.js
@@ -1086,7 +1086,7 @@
             break;
         // YEAR
         case 'YY' :
-            datePartArray[YEAR] = toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+            datePartArray[YEAR] = moment.parseTwoDigitYear(input);
             break;
         case 'YYYY' :
         case 'YYYYY' :
@@ -1782,6 +1782,10 @@
         return moment.apply(null, arguments).parseZone();
     };
 
+    moment.parseTwoDigitYear = function (input) {
+        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+    };
+
     /************************************
         Moment Prototype
     ************************************/

diff --git a/test/moment/create.js b/test/moment/create.js
@@ -824,5 +824,24 @@ exports.create = {
             moment.lang('en');
             test.done();
         }
+    },
+
+    'parsing with customized two-digit year' : function (test) {
+        var original = moment.parseTwoDigitYear;
+        try {
+            test.equal(moment('68', 'YY').year(), 2068);
+            test.equal(moment('69', 'YY').year(), 1969);
+            moment.parseTwoDigitYear = function (input) {
+                return +input + (+input > 30 ? 1900 : 2000);
+            };
+            test.equal(moment('68', 'YY').year(), 1968);
+            test.equal(moment('67', 'YY').year(), 1967);
+            test.equal(moment('31', 'YY').year(), 1931);
+            test.equal(moment('30', 'YY').year(), 2030);
+        }
+        finally {
+            moment.parseTwoDigitYear = original;
+            test.done();
+        }
     }
 };