Index: lams_central/web/editprofile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v
diff -u -r1.14.4.3.2.5 -r1.14.4.3.2.6
--- lams_central/web/editprofile.jsp 31 Mar 2010 19:14:32 -0000 1.14.4.3.2.5
+++ lams_central/web/editprofile.jsp 6 Apr 2010 08:56:18 -0000 1.14.4.3.2.6
@@ -133,7 +133,7 @@
- ${timezoneDto.displayName}
+ ${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.64.2.7.2.3 -r1.64.2.7.2.4
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 31 Mar 2010 19:14:38 -0000 1.64.2.7.2.3
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 6 Apr 2010 08:56:12 -0000 1.64.2.7.2.4
@@ -780,10 +780,13 @@
TreeSet timezones = new TreeSet(new TimezoneComparator());
timezones.addAll(getTimezoneService().getAllTimezones());
- int i = 0;
+ int i = 0;
for (Timezone timezone : timezones) {
- languageOutput += "" + timezone.getId() + ""
- + TimeZone.getTimeZone(timezone.getId()).getRawOffset() + "";
+ TimeZone timeZone = TimeZone.getTimeZone(timezone.getId());
+ languageOutput += "" +
+ "" + timezone.getId() + " - " + timeZone.getDisplayName() + "" +
+ "" + TimeZone.getTimeZone(timezone.getId()).getRawOffset() + "" +
+ "";
}
if (orgName != null) {