Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v diff -u -r1.71.2.16.2.6 -r1.71.2.16.2.7 --- lams_central/conf/language/lams/ApplicationResources.properties 4 Mar 2010 01:21:47 -0000 1.71.2.16.2.6 +++ lams_central/conf/language/lams/ApplicationResources.properties 22 Mar 2010 09:02:49 -0000 1.71.2.16.2.7 @@ -145,36 +145,60 @@ label.show.groups =Show Groups label.state =State label.timezone.0 =(GMT -12:00) Eniwetok, Kwajalein -label.timezone.1 =(GMT -11:00) Midway Island, Samoa -label.timezone.10 =(GMT -3:00) Brazil, Buenos Aires, Georgetown -label.timezone.11 =(GMT -2:00) Mid-Atlantic -label.timezone.12 =(GMT -1:00 hour) Azores, Cape Verde Islands -label.timezone.13 =(GMT) Western Europe Time, London, Lisbon, Casablanca -label.timezone.14 =(GMT +1:00 hour) Brussels, Copenhagen, Madrid, Paris -label.timezone.15 =(GMT +2:00) Kaliningrad, South Africa -label.timezone.16 =(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg -label.timezone.17 =(GMT +3:30) Tehran -label.timezone.18 =(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi -label.timezone.19 =(GMT +4:30) Kabul +label.timezone.1 =(GMT -11:00) Midway Island, Samoa label.timezone.2 =(GMT -10:00) Hawaii -label.timezone.20 =(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent -label.timezone.21 =(GMT +5:30) Bombay, Calcutta, Madras, New Delhi -label.timezone.22 =(GMT +5:45) Kathmandu -label.timezone.23 =(GMT +6:00) Almaty, Dhaka, Colombo -label.timezone.24 =(GMT +7:00) Bangkok, Hanoi, Jakarta -label.timezone.25 =(GMT +8:00) Beijing, Perth, Singapore, Hong Kong -label.timezone.26 =(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk -label.timezone.27 =(GMT +9:30) Adelaide, Darwin -label.timezone.28 =(GMT +10:00) Eastern Australia, Guam, Vladivostok -label.timezone.29 =(GMT +11:00) Magadan, Solomon Islands, New Caledonia -label.timezone.3 =(GMT -9:00) Alaska -label.timezone.30 =(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka -label.timezone.4 =(GMT -8:00) Pacific Time (US & Canada) -label.timezone.5 =(GMT -7:00) Mountain Time (US & Canada) -label.timezone.6 =(GMT -6:00) Central Time (US & Canada), Mexico City -label.timezone.7 =(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima -label.timezone.8 =(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz -label.timezone.9 =(GMT -3:30) Newfoundland +label.timezone.3 =(GMT -9:00 *Daylight Saving Time) Alaska +label.timezone.4 =(GMT -8:00 *Daylight Saving Time) Pacific Time (US & Canada) +label.timezone.5 =(GMT -8:00) Pacific Time (US & Canada) +label.timezone.6 =(GMT -7:00 *Daylight Saving Time) Mountain Time (US & Canada) +label.timezone.7 =(GMT -7:00) Mountain Time (US & Canada) +label.timezone.8 =(GMT -6:00 *Daylight Saving Time) Central Time (US & Canada) +label.timezone.9 =(GMT -6:00) Central Time (US & Canada) +label.timezone.10 =(GMT -6:00 *Daylight Saving Time) Mexico City +label.timezone.11 =(GMT -5:00 *Daylight Saving Time) Eastern Time (US & Canada) +label.timezone.12 =(GMT -5:00) Eastern Time (US & Canada) , Bogota, Lima +label.timezone.13 =(GMT -4:00 *Daylight Saving Time) Atlantic Time (Canada) +label.timezone.14 =(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz +label.timezone.15 =(GMT -3:30 *Daylight Saving Time) Newfoundland +label.timezone.16 =(GMT -3:00 *Daylight Saving Time) Brazil +label.timezone.17 =(GMT -3:00) Brazil, Buenos Aires, Georgetown +label.timezone.18 =(GMT -2:00) Mid-Atlantic +label.timezone.19 =(GMT -1:00 hour *Daylight Saving Time) Azores +label.timezone.20 =(GMT -1:00 hour) Cape Verde Islands +label.timezone.21 =(GMT *Daylight Saving Time) Western Europe Time, London, Lisbon, Casablanca +label.timezone.22 =(GMT) Greenwich Mean Time, Casablanca +label.timezone.23 =(GMT +1:00 hour *Daylight Saving Time) Brussels, Copenhagen, Madrid, Paris +label.timezone.24 =(GMT +1:00 hour) Western African Time +label.timezone.25 =(GMT +2:00 *Daylight Saving Time) Athens, Istanbul, Kaliningrad +label.timezone.26 =(GMT +2:00) Central African Time +label.timezone.27 =(GMT +3:00 *Daylight Saving Time) Baghdad, Moscow, St. Petersburg +label.timezone.28 =(GMT +3:00) Qatar, Riyadh +label.timezone.29 =(GMT +3:30 *Daylight Saving Time) Tehran +label.timezone.30 =(GMT +4:00 *Daylight Saving Time) Baku, Tbilisi +label.timezone.31 =(GMT +4:00) Abu Dhabi, Muscat +label.timezone.32 =(GMT +4:30) Kabul +label.timezone.33 =(GMT +5:00 *Daylight Saving Time) Ekaterinburg +label.timezone.34 =(GMT +5:00) Karachi, Tashkent +label.timezone.35 =(GMT +5:30) Bombay, Calcutta, Madras, New Delhi +label.timezone.36 =(GMT +5:45) Kathmandu +label.timezone.37 =(GMT +6:00 *Daylight Saving Time) Almaty, Novosibirsk +label.timezone.38 =(GMT +6:00) Dhaka, Colombo +label.timezone.39 =(GMT +7:00 *Daylight Saving Time) Krasnoyarsk +label.timezone.40 =(GMT +7:00) Bangkok, Hanoi, Jakarta +label.timezone.41 =(GMT +8:00 *Daylight Saving Time) Irkutsk +label.timezone.42 =(GMT +8:00) Beijing, Perth, Singapore, Hong Kong +label.timezone.43 =(GMT +9:00 *Daylight Saving Time) Yakutsk +label.timezone.44 =(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo +label.timezone.45 =(GMT +9:30 *Daylight Saving Time) Adelaide +label.timezone.46 =(GMT +9:30) Darwin +label.timezone.47 =(GMT +10:00 *Daylight Saving Time) Eastern Australia +label.timezone.48 =(GMT +10:00 *Daylight Saving Time) Vladivostok +label.timezone.49 =(GMT +10:00) Brisbane, Guam +label.timezone.50 =(GMT +11:00 *Daylight Saving Time) Magadan +label.timezone.51 =(GMT +11:00) Solomon Islands, New Caledonia +label.timezone.52 =(GMT +12:00 *Daylight Saving Time) Auckland, Wellington +label.timezone.53 =(GMT +12:00 *Daylight Saving Time) Kamchatka +label.timezone.54 =(GMT +12:00) Fiji label.timezone.title =Time Zone label.title =Title label.user.guide =[HELP] Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.67.2.13.4.6 -r1.67.2.13.4.7 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties 4 Mar 2010 01:21:48 -0000 1.67.2.13.4.6 +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties 22 Mar 2010 09:02:49 -0000 1.67.2.13.4.7 @@ -145,36 +145,61 @@ label.show.groups =Show Groups label.state =State label.timezone.0 =(GMT -12:00) Eniwetok, Kwajalein -label.timezone.1 =(GMT -11:00) Midway Island, Samoa -label.timezone.10 =(GMT -3:00) Brazil, Buenos Aires, Georgetown -label.timezone.11 =(GMT -2:00) Mid-Atlantic -label.timezone.12 =(GMT -1:00 hour) Azores, Cape Verde Islands -label.timezone.13 =(GMT) Western Europe Time, London, Lisbon, Casablanca -label.timezone.14 =(GMT +1:00 hour) Brussels, Copenhagen, Madrid, Paris -label.timezone.15 =(GMT +2:00) Kaliningrad, South Africa -label.timezone.16 =(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg -label.timezone.17 =(GMT +3:30) Tehran -label.timezone.18 =(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi -label.timezone.19 =(GMT +4:30) Kabul +label.timezone.1 =(GMT -11:00) Midway Island, Samoa label.timezone.2 =(GMT -10:00) Hawaii -label.timezone.20 =(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent -label.timezone.21 =(GMT +5:30) Bombay, Calcutta, Madras, New Delhi -label.timezone.22 =(GMT +5:45) Kathmandu -label.timezone.23 =(GMT +6:00) Almaty, Dhaka, Colombo -label.timezone.24 =(GMT +7:00) Bangkok, Hanoi, Jakarta -label.timezone.25 =(GMT +8:00) Beijing, Perth, Singapore, Hong Kong -label.timezone.26 =(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk -label.timezone.27 =(GMT +9:30) Adelaide, Darwin -label.timezone.28 =(GMT +10:00) Eastern Australia, Guam, Vladivostok -label.timezone.29 =(GMT +11:00) Magadan, Solomon Islands, New Caledonia -label.timezone.3 =(GMT -9:00) Alaska -label.timezone.30 =(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka -label.timezone.4 =(GMT -8:00) Pacific Time (US & Canada) -label.timezone.5 =(GMT -7:00) Mountain Time (US & Canada) -label.timezone.6 =(GMT -6:00) Central Time (US & Canada), Mexico City -label.timezone.7 =(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima -label.timezone.8 =(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz -label.timezone.9 =(GMT -3:30) Newfoundland +label.timezone.3 =(GMT -9:00 *Daylight Saving Time) Alaska +label.timezone.4 =(GMT -8:00 *Daylight Saving Time) Pacific Time (US & Canada) +label.timezone.5 =(GMT -8:00) Pacific Time (US & Canada) +label.timezone.6 =(GMT -7:00 *Daylight Saving Time) Mountain Time (US & Canada) +label.timezone.7 =(GMT -7:00) Mountain Time (US & Canada) +label.timezone.8 =(GMT -6:00 *Daylight Saving Time) Central Time (US & Canada) +label.timezone.9 =(GMT -6:00) Central Time (US & Canada) +label.timezone.10 =(GMT -6:00 *Daylight Saving Time) Mexico City +label.timezone.11 =(GMT -5:00 *Daylight Saving Time) Eastern Time (US & Canada) +label.timezone.12 =(GMT -5:00) Eastern Time (US & Canada) , Bogota, Lima +label.timezone.13 =(GMT -4:00 *Daylight Saving Time) Atlantic Time (Canada) +label.timezone.14 =(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz +label.timezone.15 =(GMT -3:30 *Daylight Saving Time) Newfoundland +label.timezone.16 =(GMT -3:00 *Daylight Saving Time) Brazil +label.timezone.17 =(GMT -3:00) Brazil, Buenos Aires, Georgetown +label.timezone.18 =(GMT -2:00) Mid-Atlantic +label.timezone.19 =(GMT -1:00 hour *Daylight Saving Time) Azores +label.timezone.20 =(GMT -1:00 hour) Cape Verde Islands +label.timezone.21 =(GMT *Daylight Saving Time) Western Europe Time, London, Lisbon, Casablanca +label.timezone.22 =(GMT) Greenwich Mean Time, Casablanca +label.timezone.23 =(GMT +1:00 hour *Daylight Saving Time) Brussels, Copenhagen, Madrid, Paris +label.timezone.24 =(GMT +1:00 hour) Western African Time +label.timezone.25 =(GMT +2:00 *Daylight Saving Time) Athens, Istanbul, Kaliningrad +label.timezone.26 =(GMT +2:00) Central African Time +label.timezone.27 =(GMT +3:00 *Daylight Saving Time) Baghdad, Moscow, St. Petersburg +label.timezone.28 =(GMT +3:00) Qatar, Riyadh +label.timezone.29 =(GMT +3:30 *Daylight Saving Time) Tehran +label.timezone.30 =(GMT +4:00 *Daylight Saving Time) Baku, Tbilisi +label.timezone.31 =(GMT +4:00) Abu Dhabi, Muscat +label.timezone.32 =(GMT +4:30) Kabul +label.timezone.33 =(GMT +5:00 *Daylight Saving Time) Ekaterinburg +label.timezone.34 =(GMT +5:00) Karachi, Tashkent +label.timezone.35 =(GMT +5:30) Bombay, Calcutta, Madras, New Delhi +label.timezone.36 =(GMT +5:45) Kathmandu +label.timezone.37 =(GMT +6:00 *Daylight Saving Time) Almaty, Novosibirsk +label.timezone.38 =(GMT +6:00) Dhaka, Colombo +label.timezone.39 =(GMT +7:00 *Daylight Saving Time) Krasnoyarsk +label.timezone.40 =(GMT +7:00) Bangkok, Hanoi, Jakarta +label.timezone.41 =(GMT +8:00 *Daylight Saving Time) Irkutsk +label.timezone.42 =(GMT +8:00) Beijing, Perth, Singapore, Hong Kong +label.timezone.43 =(GMT +9:00 *Daylight Saving Time) Yakutsk +label.timezone.44 =(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo +label.timezone.45 =(GMT +9:30 *Daylight Saving Time) Adelaide +label.timezone.46 =(GMT +9:30) Darwin +label.timezone.47 =(GMT +10:00 *Daylight Saving Time) Eastern Australia +label.timezone.48 =(GMT +10:00 *Daylight Saving Time) Vladivostok +label.timezone.49 =(GMT +10:00) Brisbane, Guam +label.timezone.50 =(GMT +11:00 *Daylight Saving Time) Magadan +label.timezone.51 =(GMT +11:00) Solomon Islands, New Caledonia +label.timezone.52 =(GMT +12:00 *Daylight Saving Time) Auckland, Wellington +label.timezone.53 =(GMT +12:00 *Daylight Saving Time) Kamchatka +label.timezone.54 =(GMT +12:00) Fiji +label.timezone.dst =*DST - Daylight Saving Time is observed label.timezone.title =Time Zone label.title =Title label.user.guide =[HELP] Index: lams_central/web/editprofile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v diff -u -r1.14.4.3.2.1 -r1.14.4.3.2.2 --- lams_central/web/editprofile.jsp 1 Mar 2010 04:55:46 -0000 1.14.4.3.2.1 +++ lams_central/web/editprofile.jsp 22 Mar 2010 09:02:49 -0000 1.14.4.3.2.2 @@ -131,7 +131,7 @@ : - + Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v diff -u -r1.36.4.5.2.2 -r1.36.4.5.2.3 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 1 Mar 2010 04:54:34 -0000 1.36.4.5.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 22 Mar 2010 09:02:45 -0000 1.36.4.5.2.3 @@ -167,12 +167,18 @@ private Set recentlyModifiedLearningDesigns = new LinkedHashSet(); // ------- TIMEZONES (hardcoded, there is no need to put them into database -------------- - - public static String[] timezoneList = new String[] { "GMT-12", "GMT-11", "GMT-10", "GMT-9", "GMT-8", "GMT-7", - "GMT-6", "GMT-5", "GMT-4", "GMT-3:30", "GMT-3", "GMT-2", "GMT-1", "GMT", "GMT+1", "GMT+2", - "GMT+3", "GMT+3:30", "GMT+4", "GMT+4:30", "GMT+5", "GMT+5:30", "GMT+5:45", "GMT+6", "GMT+7", - "GMT+8", "GMT+9", "GMT+9:30", "GMT+10", "GMT+11", "GMT+12" }; - + + public static String[] timezoneList = new String[] { "Etc/GMT+12", "Etc/GMT+11", "Etc/GMT+10", "US/Alaska", + "America/Vancouver", "Etc/GMT+8", "America/Denver", "Etc/GMT+7", "America/Chicago", "Etc/GMT+6", + "America/Mexico_City", "America/Detroit", "Etc/GMT+5", "America/Halifax", "Etc/GMT+4", + "Canada/Newfoundland", "America/Sao_Paulo", "Etc/GMT+3", "Etc/GMT+2", "Atlantic/Azores", + "Atlantic/Cape_Verde", "Europe/London", "Etc/GMT0", "Europe/Brussels", "Etc/GMT-1", "Europe/Athens", + "Etc/GMT-2", "Europe/Moscow", "Etc/GMT-3", "Asia/Tehran", "Asia/Baku", "Etc/GMT-4", "Asia/Kabul", + "Asia/Yekaterinburg", "Etc/GMT-5", "Asia/Calcutta", "Asia/Katmandu", "Asia/Almaty", "Etc/GMT-6", + "Asia/Krasnoyarsk", "Etc/GMT-7", "Asia/Irkutsk", "Etc/GMT-8", "Asia/Yakutsk", "Etc/GMT-9", + "Australia/Adelaide", "Australia/Darwin", "Australia/Sydney", "Asia/Vladivostok", "Etc/GMT-10", + "Asia/Magadan", "Etc/GMT-11", "Pacific/Auckland", "Asia/Kamchatka", "Etc/GMT-12" }; + /** full constructor */ public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, String postcode, String country, @@ -828,7 +834,7 @@ TimeZone defaultTimeZone = TimeZone.getDefault(); int defaultRawOffset = defaultTimeZone.getRawOffset(); // initial index of GMT time zone, but later it is verified - short fallbackTimeZone = 13; + short fallbackTimeZone = 22; for (short timeZoneIndex = 0; timeZoneIndex < User.timezoneList.length; timeZoneIndex++) { TimeZone candidateTimeZone = TimeZone.getTimeZone(User.timezoneList[timeZoneIndex]); if (defaultRawOffset == candidateTimeZone.getRawOffset()) { @@ -848,7 +854,6 @@ } public void setTimeZone(Short timeZone) { - this.timeZone = timeZone; }