You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/03/18 16:17:55 UTC
svn commit: r924855 -
/wicket/branches/wicket-1.4.x/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
Author: ivaynberg
Date: Thu Mar 18 15:17:52 2010
New Revision: 924855
URL: http://svn.apache.org/viewvc?rev=924855&view=rev
Log:
WICKET-2767 DatePicker Calendar: wrong year format when 4 digits are used (yyyy), e.g. 2010 --> 0010
Modified:
wicket/branches/wicket-1.4.x/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
Modified: wicket/branches/wicket-1.4.x/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js?rev=924855&r1=924854&r2=924855&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js (original)
+++ wicket/branches/wicket-1.4.x/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js Thu Mar 18 15:17:52 2010
@@ -134,7 +134,11 @@ Wicket.DateTime.substituteDate = functio
// optionally do some padding to match the pattern
if(datePattern.match(/dd+/)) day = Wicket.DateTime.padDateFragment(day);
if(datePattern.match(/MM+/)) month = Wicket.DateTime.padDateFragment(month);
- if(datePattern.match(/yy+/)) year = Wicket.DateTime.padDateFragment(year % 100);
+ if(datePattern.match(/yyy+/)) {
+ year = Wicket.DateTime.padDateFragment(year);
+ } else if(datePattern.match(/yy+/)) {
+ year = Wicket.DateTime.padDateFragment(year % 100);
+ }
// replace pattern with real values
return datePattern.replace(/d+/, day).replace(/M+/, month).replace(/y+/, year);
}