Author: sebawagner
Date: Mon Apr 23 16:48:09 2012
New Revision: 1329324
URL: http://svn.apache.org/viewvc?rev=1329324&view=rev
Log:
OPENMEETINGS-193 Bring timezones in order for installation servlet parsing, add
some docs and comments
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml?rev=1329324&r1=1329323&r2=1329324&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
Mon Apr 23 16:48:09 2012
@@ -19,11 +19,43 @@
-->
<timezones>
+ <!--
+ This file is loaded during installation to the database table
"om_timezones" of OpenMeetings.
+ Changes at runtime to this file have no effect to OpenMeetings.
+
+ Attributes:
+
+ 1) orderId
+ The orderId is just an indicator for the position in the drow
down box inside
+ OpenMeetings UI, there can be duplicates
+ However the order in the XML should be correct cause the
Web-installer/CLI-Installer
+ will display the timezones exactly in the order of the XML.
+
+ 2) name
+ A common name in short
+
+ 3) label
+ Long name, displayed in UI
+
+ 4) iCal
+ this is the actual name, OpenMeetings will use to match again
Java's timezones
+
(http://docs.oracle.com/javase/6/docs/api/java/util/TimeZone.html)
+
+ to get all available id that are available in your Java JRE see:
+
http://svn.apache.org/repos/asf/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/timezone/TestGetIds.java
+
+ For updating the JRE runtime with different tz-file, see:
+
http://www.oracle.com/technetwork/java/javase/timezones-137583.html
+ -->
<timezone orderId="1" name="Etc/GMT+12" label="New Zealand"
iCal="Pacific/Auckland" />
<timezone orderId="1" name="Etc/GMT+12" label="Kiribati (Gilbert Islands),
Fiji, Russia (Kamchatka Krai)" iCal="Pacific/Fiji" />
<timezone orderId="2" name="Etc/GMT+11" label="Vladivostok, Kamchatka,
Solomon Islands, New Caledonia" iCal="Asia/Vladivostok" />
<timezone orderId="3" name="Etc/GMT+10" label="Australia
(NSW,Sydney,Tasmania), Yakutsk" iCal="Australia/Sydney" />
+ <timezone orderId="3" name="Etc/GMT+10" label="Russia (Zabaykalsky Krai),
Papua New Guinea, Australia (Queensland)" iCal="Australia/Queensland" />
+ <timezone orderId="3" name="Etc/GMT+10" label="Lord Howe Island -
Australia GMT+10:30" iCal="Australia/Lord_Howe" />
<timezone orderId="4" name="Etc/GMT+9" label="Japan/Korea Standard Time,
Irkutsk, East Timor" iCal="Asia/Tokyo" />
+ <timezone orderId="4" name="Etc/GMT+9 (Australia-North)" label="Australia
(Nothern Territory,Darwin) GMT+9:30" iCal="Australia/Darwin" />
+ <timezone orderId="4" name="Etc/GMT+9 (Australia-South)" label="Australia
(Southern Territory,Adelaide) GMT+9:30" iCal="Australia/Adelaide" />
<timezone orderId="5" name="Etc/GMT+8" label="China Standard Time,
Krasnoyarsk, Philippines, Singapore" iCal="Asia/Singapore" />
<timezone orderId="6" name="Etc/GMT+7" label="Novosibirsk, Indochina Time,
Thailand, Vietnam, Jakarta" iCal="Asia/Jakarta" />
<timezone orderId="7" name="Etc/GMT+6" label="Yekaterinburg, Almaty,
Bangladesh" iCal="Asia/Yekaterinburg" />
@@ -34,8 +66,11 @@
<timezone orderId="12" name="Asia/Tehran" label="Tehran GMT+3.30"
iCal="Asia/Tehran" />
<timezone orderId="13" name="Etc/GMT+3" label="Kaliningrad, Minsk, Iraq,
Saudi Arabia" iCal="Europe/Kaliningrad" />
<timezone orderId="14" name="Etc/GMT+2" label="Finland, Lithuania,
Belarus, Ukraine, Romania, Bulgaria" iCal="Europe/Helsinki" />
+ <timezone orderId="14" name="Etc/GMT+2" label="Libya, Egypt, South Africa,
Zimbabwe" iCal="Africa/Cairo" />
<timezone orderId="15" name="Etc/GMT+1" label="France, Germany, Spain,
Italy" iCal="Europe/Berlin" />
+ <timezone orderId="15" name="Etc/GMT+1 (North Africa)" label="Angola,
Cameroon, Nigeria, Tunisia" iCal="Africa/Tunis" />
<timezone orderId="16" name="Etc/GMT" label="Iceland, United Kingdom,
Ireland" iCal="Europe/London" />
+ <timezone orderId="16" name="Etc/GMT" label="Côte d'Ivoire, Faroe
Islands, Ghana, Iceland, Senegal" iCal="Africa/Dakar" />
<timezone orderId="17" name="Etc/GMT-1" label="Azores, Cape Verde"
iCal="Atlantic/Cape_Verde" />
<timezone orderId="18" name="Etc/GMT-2" label="Fernando de Noronha"
iCal="America/Noronha" />
<timezone orderId="19" name="Etc/GMT-3" label="Brazil (BrasÃlia, Rio de
Janeiro, São Paulo), most of Greenland, Uruguay" iCal="America/Sao_Paulo" />
@@ -45,8 +80,11 @@
<timezone orderId="20" name="Etc/GMT-4" label="Venezuela GMT+4:30"
iCal="America/Caracas" />
<timezone orderId="21" name="Etc/GMT-5" label="Ottawa, Toronto, Montreal,
Boston, New York" iCal="America/New_York" />
<timezone orderId="21" name="Etc/GMT-5" label="Colombia, Cuba, Ecuador,
Haiti, Jamaica, Panama, Peru" iCal="America/Jamaica" />
+ <timezone orderId="22" name="Etc/GMT-5(Panama)" label="Panama
Port-au-Prince" iCal="America/Panama" />
+ <timezone orderId="23" name="Etc/GMT-6(Chicago)" label="Chicago, Dallas"
iCal="America/Chicago" />
<timezone orderId="24" name="Etc/GMT-6" label="Costa Rica , El Salvador,
Guatemala, Honduras" iCal="America/El_Salvador" />
<timezone orderId="24" name="Etc/GMT-6" label="Canada (Manitoba), United
States (Illinois, most of Texas)" iCal="America/Chicago" />
+ <timezone orderId="25" name="Etc/GMT-7(Phoenix)" label="Alberta, Colorado,
Phoenix" iCal="America/Phoenix" />
<timezone orderId="26" name="Etc/GMT-7" label="Canada (Alberta), Mexico
(Chihuahua), USA (Colorado)" iCal="America/Denver" />
<timezone orderId="26" name="Etc/GMT-7" label="Canada (northeastern
British Columbia), Mexico (Sonora), USA (Arizona)" iCal="America/Phoenix" />
<timezone orderId="27" name="Etc/GMT-8" label="Vancouver, Portland, Las
Vegas, California" iCal="America/Los_Angeles" />
@@ -54,14 +92,4 @@
<timezone orderId="28" name="Etc/GMT-9" label="United States (most of
Alaska)" iCal="US/Alaska" />
<timezone orderId="29" name="Etc/GMT-10" label="Hawaii"
iCal="Pacific/Honolulu" />
<timezone orderId="30" name="Etc/GMT-11" label="Samoa" iCal="Pacific/Apia"
/>
- <timezone orderId="23" name="Etc/GMT-6(Chicago)" label="Chicago, Dallas"
iCal="America/Chicago" />
- <timezone orderId="25" name="Etc/GMT-7(Phoenix)" label="Alberta, Colorado,
Phoenix" iCal="America/Phoenix" />
- <timezone orderId="22" name="Etc/GMT-5(Panama)" label="Panama
Port-au-Prince" iCal="America/Panama" />
- <timezone orderId="15" name="Etc/GMT+1 (North Africa)" label="Angola,
Cameroon, Nigeria, Tunisia" iCal="Africa/Tunis" />
- <timezone orderId="14" name="Etc/GMT+2" label="Libya, Egypt, South Africa,
Zimbabwe" iCal="Africa/Cairo" />
- <timezone orderId="4" name="Etc/GMT+9 (Australia-North)" label="Australia
(Nothern Territory,Darwin) GMT+9:30" iCal="Australia/Darwin" />
- <timezone orderId="4" name="Etc/GMT+9 (Australia-South)" label="Australia
(Southern Territory,Adelaide) GMT+9:30" iCal="Australia/Adelaide" />
- <timezone orderId="3" name="Etc/GMT+10" label="Russia (Zabaykalsky Krai),
Papua New Guinea, Australia (Queensland)" iCal="Australia/Queensland" />
- <timezone orderId="3" name="Etc/GMT+10" label="Lord Howe Island -
Australia GMT+10:30" iCal="Australia/Lord_Howe" />
- <timezone orderId="16" name="Etc/GMT" label="Côte d'Ivoire, Faroe
Islands, Ghana, Iceland, Senegal" iCal="Africa/Dakar" />
</timezones>