Skip to content

Commit

Permalink
Update time zone data to 2022fgtz (#669)
Browse files Browse the repository at this point in the history
Co-authored-by: Stephen Colebourne <[email protected]>
  • Loading branch information
github-actions[bot] and jodastephen authored Oct 29, 2022
1 parent 872d993 commit 3400f1d
Show file tree
Hide file tree
Showing 10 changed files with 256 additions and 262 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,6 @@
<!-- Other properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<tz.database.version>2022egtz</tz.database.version>
<tz.database.version>2022fgtz</tz.database.version>
</properties>
</project>
38 changes: 18 additions & 20 deletions src/main/java/org/joda/time/tz/src/africa
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,15 @@ Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9
Zone Africa/Brazzaville 1:01:08 - LMT 1912
1:00 - WAT

# Côte d'Ivoire / Ivory Coast
# Côte d'Ivoire (Ivory Coast)

# The other parts of the St Helena territory are similar:
# Tristan da Cunha: on GMT, say Whitman and the CIA
# Ascension: on GMT, say the USNO (1995-12-21) and the CIA
# Gough (scientific station since 1955; sealers wintered previously):
# on GMT, says the CIA
# Inaccessible, Nightingale: uninhabited

# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Abidjan -0:16:08 - LMT 1912
0:00 - GMT
Expand All @@ -188,6 +196,7 @@ Zone Africa/Abidjan -0:16:08 - LMT 1912
Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul
3:00 - EAT


###############################################################################

# Egypt
Expand Down Expand Up @@ -401,13 +410,6 @@ Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar
2:00 - SAST

# Ethiopia
#
# Unfortunately tzdb records only Western clock time in use in Ethiopia,
# as the tzdb format is not up to properly recording a common Ethiopian
# timekeeping practice that is based on solar time. See:
# Mortada D. If you have a meeting in Ethiopia, you'd better double
# check the time. PRI's The World. 2015-01-30 15:15 -05.
# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Addis_Ababa 2:34:48 - LMT 1870
2:35:20 - ADMT 1936 May 5 # Adis Dera MT
Expand Down Expand Up @@ -502,6 +504,14 @@ Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u
# The 1908-05-01 announcement does not give an effective date,
# so just say "1908 May".

# From Paul Eggert (2018-09-11):
# Unfortunately tzdb records only Western clock time in use in Ethiopia,
# as the tzdb format is not up to properly recording a common Ethiopian
# timekeeping practice that is based on solar time. See:
# Mortada D. If you have a meeting in Ethiopia, you'd better double
# check the time. PRI's The World. 2015-01-30 15:15 -05.
# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time

# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Nairobi 2:27:16 - LMT 1908 May
2:30 - +0230 1928 Jun 30 24:00
Expand Down Expand Up @@ -724,7 +734,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
3:00 - EAT

# Morocco
# See Africa/Ceuta for Spanish Morocco.

# From Alex Krivenyshev (2008-05-09):
# Here is an article that Morocco plan to introduce Daylight Saving Time between
Expand Down Expand Up @@ -1225,7 +1234,6 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
2:00 - CAT


# Namibia

# From Arthur David Olson (2017-08-09):
Expand Down Expand Up @@ -1393,9 +1401,6 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
# Juan de Nova - uninhabited
# Tromelin - inhabited until at least 1958

#
# The Crozet Islands also observe Réunion time; see the 'antarctica' file.

# Rwanda
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Kigali 2:00:16 - LMT 1935 Jun
Expand All @@ -1407,13 +1412,6 @@ Zone Atlantic/St_Helena -0:22:48 - LMT 1890 # Jamestown
-0:22:48 - JMT 1951 # Jamestown Mean Time
0:00 - GMT

# The other parts of the St Helena territory are similar:
# Tristan da Cunha: on GMT, say Whitman and the CIA
# Ascension: on GMT, say the USNO (1995-12-21) and the CIA
# Gough (scientific station since 1955; sealers wintered previously):
# on GMT, says the CIA
# Inaccessible, Nightingale: uninhabited

# São Tomé and Príncipe

# See Europe/Lisbon for info about the 1912 transition.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/joda/time/tz/src/antarctica
Original file line number Diff line number Diff line change
Expand Up @@ -321,4 +321,4 @@ Zone Antarctica/Rothera 0 - -00 1976 Dec 1
# we have to go around and set them back 5 minutes or so.
# Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
#
# See 'australasia' for Antarctica/McMurdo.
# See Pacific/Auckland.
21 changes: 8 additions & 13 deletions src/main/java/org/joda/time/tz/src/asia
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Bandar Seri Begawan
7:30 - +0730 1933
8:00 - +08

# Burma / Myanmar
# Myanmar (Burma)

# Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.

Expand All @@ -290,7 +290,6 @@ Zone Asia/Phnom_Penh 6:59:40 - LMT 1906 Jul 1
9:00 - +09 1945 Sep 2
7:00 - +07


# China

# From Phake Nick (2020-04-15):
Expand Down Expand Up @@ -677,10 +676,10 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901
8:00 PRC C%sT
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
# Vostok base in Antarctica matches this since 1970.
Zone Asia/Urumqi 5:50:20 - LMT 1928
6:00 - +06


# Hong Kong

# Milne gives 7:36:41.7.
Expand Down Expand Up @@ -1183,10 +1182,6 @@ Zone Asia/Famagusta 2:15:48 - LMT 1921 Nov 14
3:00 - +03 2017 Oct 29 1:00u
2:00 EUAsia EE%sT

# Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
# However, for various reasons many users expect to find it under Europe.
Link Asia/Nicosia Europe/Nicosia

# Georgia
# From Paul Eggert (1994-11-19):
# Today's _Economist_ (p 60) reports that Georgia moved its clocks forward
Expand Down Expand Up @@ -2715,8 +2710,6 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1
8:30 - KST 2018 May 4 23:30
9:00 - KST

###############################################################################

# Kuwait
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Kuwait 3:11:56 - LMT 1950
Expand All @@ -2733,7 +2726,6 @@ Zone Asia/Vientiane 6:50:24 - LMT 1906 Jul 1
8:00 - +08 1955 Apr 15
7:00 - +07


# Lebanon
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Lebanon 1920 only - Mar 28 0:00 1:00 S
Expand Down Expand Up @@ -2764,7 +2756,7 @@ Rule Lebanon 1999 max - Oct lastSun 0:00 0 -
Zone Asia/Beirut 2:22:00 - LMT 1880
2:00 Lebanon EE%sT

# Malaysia
# Malaysia (eastern)
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
Expand Down Expand Up @@ -3583,6 +3575,8 @@ Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha

# Saudi Arabia
#
# Japan's year-round bases in Antarctica match this since 1970.
#
# From Paul Eggert (2018-08-29):
# Time in Saudi Arabia and other countries in the Arabian peninsula was not
# standardized until 1968 or so; we don't know exactly when, and possibly it
Expand Down Expand Up @@ -3901,6 +3895,8 @@ Zone Asia/Ashgabat 3:53:32 - LMT 1924 May 2 # or Ashkhabad
5:00 - +05

# United Arab Emirates
#
# The Crozet Is also observe Réunion time; see the 'antarctica' file.
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Dubai 3:41:12 - LMT 1920
4:00 - +04
Expand All @@ -3923,7 +3919,7 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2
5:00 RussiaAsia +05/+06 1992
5:00 - +05

# Vietnam
# Vietnam (southern)

# From Paul Eggert (2014-10-04):
# Milne gives 7:16:56 for the meridian of Saigon in 1899, as being
Expand Down Expand Up @@ -3998,7 +3994,6 @@ Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1
# use Asia/Bangkok; see the VN entries in the file zone1970.tab.
# For timestamps before 1970, see Asia/Hanoi in the file 'backzone'.


# Yemen
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Aden 2:59:54 - LMT 1950
Expand Down
26 changes: 17 additions & 9 deletions src/main/java/org/joda/time/tz/src/australasia
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,11 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov
Zone Indian/Christmas 7:02:52 - LMT 1895 Feb
7:00 - +07

# Cocos (Keeling) Is
# Cocos (Keeling) Islands
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Cocos 6:27:40 - LMT 1900
6:30 - +0630


# Fiji

# Milne gives 11:55:44 for Suva.
Expand Down Expand Up @@ -397,8 +396,14 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# concerned shifting arrival and departure times, which may look like a simple
# thing but requires some significant logistical adjustments domestically and
# internationally."
# Assume for now that DST will resume with the recent pre-2020 rules for the
# 2022/2023 season.

# From Shalvin Narayan (2022-10-27):
# Please note that there will not be any daylight savings time change
# in Fiji for 2022-2023....
# https://www.facebook.com/FijianGovernment/posts/pfbid0mmWVTYmTibn66ybpFda75pDcf34SSpoSaskJW5gXwaKo5Sgc7273Q4fXWc6kQV6Hl
#
# From Paul Eggert (2022-10-27):
# For now, assume DST is suspended indefinitely.

# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
Expand All @@ -413,8 +418,6 @@ Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 -
Rule Fiji 2015 2021 - Jan Sun>=12 3:00 0 -
Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 -
Rule Fiji 2020 only - Dec 20 2:00 1:00 -
Rule Fiji 2022 max - Nov Sun>=8 2:00 1:00 -
Rule Fiji 2023 max - Jan Sun>=12 3:00 0 -
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
Expand All @@ -430,6 +433,7 @@ Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete
# Clipperton (near North America) is administered from French Polynesia;
# it is uninhabited.


# Guam

# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Expand Down Expand Up @@ -471,11 +475,14 @@ Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31
10:00 Guam G%sT 2000 Dec 23
10:00 - ChST # Chamorro Standard Time

# Kiribati

# Kiribati (Gilbert Is)
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Tarawa 11:32:04 - LMT 1901 # Bairiki
12:00 - +12

# Kiribati (except Gilbert Is)
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Kanton 0 - -00 1937 Aug 31
-12:00 - -12 1979 Oct
-11:00 - -11 1994 Dec 31
Expand Down Expand Up @@ -568,6 +575,7 @@ Zone Pacific/Noumea 11:05:48 - LMT 1912 Jan 13 # Nouméa
###############################################################################

# New Zealand
# McMurdo Station and Scott Base in Antarctica use Auckland time.

# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule NZ 1927 only - Nov 6 2:00 1:00 S
Expand Down Expand Up @@ -603,6 +611,7 @@ Rule Chatham 2008 max - Apr Sun>=1 2:45s 0 -
Zone Pacific/Auckland 11:39:04 - LMT 1868 Nov 2
11:30 NZ NZ%sT 1946 Jan 1
12:00 NZ NZ%sT

# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Antarctica/McMurdo 0 - -00 1956
12:00 NZ NZ%sT
Expand Down Expand Up @@ -874,7 +883,6 @@ Zone Pacific/Tongatapu 12:19:12 - LMT 1945 Sep 10
Zone Pacific/Funafuti 11:56:52 - LMT 1901
12:00 - +12


# US minor outlying islands

# Howland, Baker
Expand Down Expand Up @@ -939,7 +947,6 @@ Zone Pacific/Midway -11:49:28 - LMT 1901
Zone Pacific/Wake 11:06:28 - LMT 1901
12:00 - +12


# Vanuatu

# From P Chan (2020-11-27):
Expand Down Expand Up @@ -980,6 +987,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
Zone Pacific/Wallis 12:15:20 - LMT 1901
12:00 - +12


###############################################################################

# NOTES
Expand Down
Loading

0 comments on commit 3400f1d

Please sign in to comment.