LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fehler in Time-Parameter behoben. Eine Uhrzeit zwischen 12:00 Uhr und 12:59 Uhr wurde aufgrund einer fehlenden Abfrage auf 

12- bzw. 24-Stunden-Format in eine Uhrzeit zwischen 00:00 Uhr und 00:59 Uhr umgewandelt


git-svn-id: https://svn.libreccm.org/ccm/trunk@1201 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-10-26 12:28:06 +00:00
parent eabd0ec620
commit 5269775eaa
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ccm-core/src/com/arsdigita/bebop/parameters/TimeParameter.java
View File

@ -19,11 +19,16 @@
package com.arsdigita.bebop.parameters;
import com.arsdigita.globalization.Globalization;
import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.util.StringUtils;
import java.text.DateFormat;
import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
@ -85,7 +90,7 @@ public class TimeParameter extends ParameterModel
if (!StringUtils.emptyString(hour)) {
int hourInt = Integer.parseInt(hour);
if (hourInt == 12) {
if ((hourInt == 12) && has12HourClock()) {
hourInt = 0;
}
c.set(Calendar.HOUR, hourInt);
@ -124,4 +129,17 @@ public class TimeParameter extends ParameterModel
return Date.class;
}
private boolean has12HourClock() {
Locale locale = GlobalizationHelper.getNegotiatedLocale();
DateFormat format_12Hour = DateFormat.getTimeInstance(DateFormat.SHORT, Locale.US);
DateFormat format_locale = DateFormat.getTimeInstance(DateFormat.SHORT, locale);
String midnight = "";
try {
midnight = format_locale.format(format_12Hour.parse("12:00 AM"));
} catch (ParseException ignore) {
}
return midnight.contains("12");
}
}