Author: ivaynberg
Date: Thu Jan 20 08:01:26 2011
New Revision: 1061149
URL: http://svn.apache.org/viewvc?rev=1061149&view=rev
Log:
WICKET-3348 fixed am/pm support
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=1061149&r1=1061148&r2=1061149&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Thu Jan 20 08:01:26 2011
@@ -351,9 +351,9 @@ public class DateTimeField extends FormC
// Adjust for halfday if needed
if (use12HourFormat())
{
- int halfday = (amOrPm == AM_PM.PM ? 1 : 0);
+ int halfday = (amOrPmInput == AM_PM.PM ? 1 : 0);
date.set(DateTimeFieldType.halfdayOfDay(),
halfday);
- date.set(DateTimeFieldType.hourOfDay(), hours %
12);
+ date.set(DateTimeFieldType.hourOfHalfday(),
hours % 12);
}
// The date will be in the server's timezone
