midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1542 Calendar doesn't recognise language Date Pattern

This commit is contained in:
Carlos Ruiz 2013-11-26 19:00:28 -05:00
parent 24477333d3
commit 5161b9b5e9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
View File

@ -37,6 +37,7 @@ import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.theme.ThemeManager;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import org.compiere.model.X_R_RequestType; import org.compiere.model.X_R_RequestType;
import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Util; import org.compiere.util.Util;
@ -52,7 +53,6 @@ import org.zkoss.calendar.event.CalendarsEvent;
import org.zkoss.calendar.impl.SimpleCalendarEvent; import org.zkoss.calendar.impl.SimpleCalendarEvent;
import org.zkoss.calendar.impl.SimpleCalendarModel; import org.zkoss.calendar.impl.SimpleCalendarModel;
import org.zkoss.image.AImage; import org.zkoss.image.AImage;
import org.zkoss.util.Locales;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
@ -410,7 +410,7 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
private void updateDateLabel() { private void updateDateLabel() {
Date b = calendars.getBeginDate(); Date b = calendars.getBeginDate();
Date e = calendars.getEndDate(); Date e = calendars.getEndDate();
SimpleDateFormat sdfV = new SimpleDateFormat("yyyy/MMM/dd", Locales.getCurrent()); SimpleDateFormat sdfV = DisplayType.getDateFormat();
sdfV.setTimeZone(calendars.getDefaultTimeZone()); sdfV.setTimeZone(calendars.getDefaultTimeZone());
lblDate.setValue(sdfV.format(b) + " - " + sdfV.format(e)); lblDate.setValue(sdfV.format(b) + " - " + sdfV.format(e));
} }

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
View File

@ -38,6 +38,7 @@ import org.compiere.model.PO;
import org.compiere.model.X_R_RequestType; import org.compiere.model.X_R_RequestType;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Trx; import org.compiere.util.Trx;
import org.compiere.util.TrxEventListener; import org.compiere.util.TrxEventListener;
@ -49,7 +50,6 @@ import org.zkoss.calendar.Calendars;
import org.zkoss.calendar.api.CalendarEvent; import org.zkoss.calendar.api.CalendarEvent;
import org.zkoss.calendar.event.CalendarsEvent; import org.zkoss.calendar.event.CalendarsEvent;
import org.zkoss.calendar.impl.SimpleCalendarModel; import org.zkoss.calendar.impl.SimpleCalendarModel;
import org.zkoss.util.Locales;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Desktop; import org.zkoss.zk.ui.Desktop;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
@ -397,7 +397,7 @@ public class DPCalendar extends DashboardPanel implements EventListener<Event>,
private void updateDateLabel() { private void updateDateLabel() {
Date b = calendars.getBeginDate(); Date b = calendars.getBeginDate();
Date e = calendars.getEndDate(); Date e = calendars.getEndDate();
SimpleDateFormat sdfV = new SimpleDateFormat("yyyy/MMM/dd", Locales.getCurrent()); SimpleDateFormat sdfV = DisplayType.getDateFormat();
sdfV.setTimeZone(calendars.getDefaultTimeZone()); sdfV.setTimeZone(calendars.getDefaultTimeZone());
lblDate.setValue(sdfV.format(b) + " - " + sdfV.format(e)); lblDate.setValue(sdfV.format(b) + " - " + sdfV.format(e));
} }