Index: trunk/admin/include/calendar.js =================================================================== diff -u -r13 -r381 --- trunk/admin/include/calendar.js (.../calendar.js) (revision 13) +++ trunk/admin/include/calendar.js (.../calendar.js) (revision 381) @@ -1074,8 +1074,18 @@ if (b[i] == "y") { y = a[i]; } - if (b[i] == "yy") { - y = parseInt(a[i]) + 1900; + if (b[i] == "yy") { + if (a[i].length == 4) { + y = a[i]; + } + else { + if (parseInt(a[i]) < 70) { + y = parseInt(a[i]) + 2000; + } + else { + y = parseInt(a[i]) + 1900; + } + } } if (b[i] == "M" || b[i] == "MM") { for (j = 0; j < 12; ++j) {