Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4f499ee

Browse files
committed
Update time zone abbreviations lists.
This updates known_abbrevs.txt to be what it should have been already, were my -P patch not broken; and updates some tznames/ entries that missed getting any love in previous timezone data updates because zic failed to flag the change of abbreviation. The non-cosmetic updates: * Remove references to "ADT" as "Arabia Daylight Time", an abbreviation that's been out of use since 2007; therefore, claiming there is a conflict with "Atlantic Daylight Time" doesn't seem especially helpful. (We have left obsolete entries in the files when they didn't conflict with anything, but that seems like a different situation.) * Fix entirely incorrect GMT offsets for CKT (Cook Islands), FJT, FJST (Fiji); we didn't even have them on the proper side of the date line. (Seems to have been aboriginal errors in our tznames data; there's no evidence anything actually changed recently.) * FKST (Falkland Islands Summer Time) is now used all year round, so don't mark it as a DST abbreviation. * Update SAKT (Sakhalin) to mean GMT+11 not GMT+10. In cosmetic changes, I fixed a bunch of wrong (or at least obsolete) claims about abbreviations not being present in the zic files, and tried to be consistent about how obsolete abbreviations are labeled. Note the underlying timezone/data files are still at release 2014e; this is just trying to get us in sync with what those files actually say before we go to the next update.
1 parent 78d7256 commit 4f499ee

File tree

7 files changed

+104
-153
lines changed

7 files changed

+104
-153
lines changed

src/timezone/known_abbrevs.txt

+48-67
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,67 @@
1-
ADDT -7200 D
1+
ACT -18000
22
ADT -10800 D
3-
ADT 14400 D
43
AFT 16200
4+
AKDT -28800 D
55
AKST -32400
6-
ALMST 25200 D
6+
ALMT 21600
7+
AMST -10800 D
78
AMT -14400
89
AMT 14400
9-
ANAT 39600
10-
APT -10800 D
11-
AQTT 14400
10+
ANAT 43200
1211
AQTT 18000
1312
ART -10800
1413
AST -14400
1514
AST 10800
16-
AWT -10800 D
15+
AZOST 0 D
1716
AZOT -3600
1817
AZST 18000 D
19-
BDST 25200 D
20-
BEAT 9000
21-
BEAUT 9900
18+
AZT 14400
19+
BDT 21600
2220
BNT 28800
2321
BOT -14400
22+
BRST -7200 D
2423
BRT -10800
24+
BST 3600 D
2525
BTT 21600
26-
CAST 10800 D
2726
CAT 7200
2827
CCT 23400
2928
CDT -14400 D
3029
CDT -18000 D
31-
CDT 32400 D
3230
CEST 7200 D
3331
CET 3600
32+
CHADT 49500 D
3433
CHAST 45900
3534
CHOT 28800
3635
CHUT 36000
37-
CKHST -34200 D
36+
CKT -36000
37+
CLST -10800 D
3838
CLT -14400
3939
COT -18000
40-
CPT -18000 D
40+
CST -18000
4141
CST -21600
4242
CST 28800
4343
CST 34200
44+
CST 37800 D
4445
CVT -3600
4546
CWST 31500
46-
CWT -18000 D
4747
CXT 25200
4848
ChST 36000
4949
DAVT 25200
5050
DDUT 36000
5151
EASST -18000 D
52+
EAST -21600
5253
EAT 10800
5354
ECT -18000
5455
EDT -14400 D
5556
EEST 10800 D
5657
EET 7200
5758
EGST 0 D
58-
EPT -14400 D
59+
EGT -3600
5960
EST -18000
6061
EST 36000
62+
EST 39600 D
6163
FET 10800
64+
FJST 46800 D
6265
FJT 43200
6366
FKST -10800
6467
FNT -7200
@@ -68,99 +71,77 @@ GET 14400
6871
GFT -10800
6972
GILT 43200
7073
GMT 0
71-
GMT+1 -3600
72-
GMT+10 -36000
73-
GMT+11 -39600
74-
GMT+12 -43200
75-
GMT+2 -7200
76-
GMT+3 -10800
77-
GMT+4 -14400
78-
GMT+5 -18000
79-
GMT+6 -21600
80-
GMT+7 -25200
81-
GMT+8 -28800
82-
GMT+9 -32400
83-
GMT-1 3600
84-
GMT-10 36000
85-
GMT-11 39600
86-
GMT-12 43200
87-
GMT-13 46800
88-
GMT-14 50400
89-
GMT-2 7200
90-
GMT-3 10800
91-
GMT-4 14400
92-
GMT-5 18000
93-
GMT-6 21600
94-
GMT-7 25200
95-
GMT-8 28800
96-
GMT-9 32400
9774
GST -7200
9875
GST 14400
9976
GYT -14400
77+
HADT -32400 D
10078
HAST -36000
79+
HKT 28800
10180
HOVT 25200
10281
HST -36000
10382
ICT 25200
104-
ICT 28800
105-
IDDT 14400 D
83+
IDT 10800 D
10684
IOT 21600
10785
IRDT 16200 D
10886
IRKT 32400
109-
IST 23400 D
87+
IRST 12600
88+
IST 19800
89+
IST 3600 D
90+
IST 7200
11091
JST 32400
111-
KDT 36000 D
11292
KGT 21600
113-
KOST 43200
93+
KOST 39600
11494
KRAT 28800
115-
KST 28800
95+
KST 32400
96+
LHST 37800
11697
LHST 39600 D
11798
LINT 50400
118-
LKT 21600
11999
MAGT 43200
120100
MART -34200
121101
MAWT 18000
122102
MDT -21600 D
103+
MEST 7200 D
123104
MET 3600
124105
MHT 43200
125106
MIST 39600
126107
MMT 23400
127-
MPT -21600 D
128108
MSK 14400
129109
MST -25200
130110
MUT 14400
131111
MVT 18000
132-
MWT -21600 D
133112
MYT 28800
134113
MeST -28800
135114
NCT 39600
136-
NDDT -5400 D
115+
NDT -9000 D
137116
NFT 41400
138-
NOVST 25200 D
139117
NOVT 25200
140118
NPT 20700
141119
NRT 43200
120+
NST -12600
142121
NUT -39600
122+
NZDT 46800 D
143123
NZST 43200
144124
OMST 25200
145125
ORAT 18000
146126
PDT -25200 D
147127
PET -18000
148-
PETT 39600
128+
PETT 43200
149129
PGT 36000
150130
PHOT 46800
131+
PHT 28800
151132
PKT 18000
152133
PMDT -7200 D
134+
PMST -10800
153135
PONT 39600
154-
PPT -25200 D
155136
PST -28800
156137
PWT 32400
157138
PYST -10800 D
139+
PYT -14400
158140
QYZT 21600
159141
RET 14400
160142
ROTT -10800
161-
SAKT 36000
162-
SAMT 10800
163-
SAST 10800 D
143+
SAKT 39600
144+
SAMT 14400
164145
SAST 7200
165146
SBT 39600
166147
SCT 14400
@@ -172,32 +153,32 @@ TAHT -36000
172153
TFT 18000
173154
TJT 18000
174155
TKT 46800
156+
TLT 32400
175157
TMT 18000
176-
TOST 50400 D
158+
TOT 46800
177159
TVT 43200
178-
UCT 0
179160
ULAT 28800
180161
UTC 0
181-
UYHST -9000 D
162+
UYST -7200 D
163+
UYT -10800
182164
UZT 18000
183-
VET -14400
165+
VET -16200
184166
VLAT 39600
185-
VOLT 10800
167+
VOLT 14400
186168
VOST 21600
187169
VUT 39600
188170
WAKT 43200
189-
WARST -10800 D
190-
WART -14400
191171
WAST 7200 D
192-
WAT -3600
193-
WAT 0
194172
WAT 3600
195173
WEST 3600 D
196174
WET 0
197175
WFT 43200
198176
WGST -7200 D
177+
WGT -10800
199178
WIB 25200
179+
WIT 32400
200180
WITA 28800
181+
WSDT 50400 D
201182
WST 28800
202183
WST 46800
203184
YAKT 36000

src/timezone/tznames/America.txt

+6-7
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ ACT -18000 # Acre Time
1818
ACST -14400 D # Acre Summer Time (not in zic)
1919
# (America/Eirunepe)
2020
# (America/Rio_Branco)
21-
# CONFLICT! ADT is not unique
22-
# Other timezones:
23-
# - ADT: Arabic Daylight Time (Asia)
2421
ADT -10800 D # Atlantic Daylight Time
2522
# (America/Glace_Bay)
2623
# (America/Goose_Bay)
@@ -235,9 +232,9 @@ GMT 0 # Greenwich Mean Time
235232
# (Europe/London)
236233
GYT -14400 # Guyana Time
237234
# (America/Guyana)
238-
HADT -32400 D # Hawaii-Aleutain Daylight Time
235+
HADT -32400 D # Hawaii-Aleutian Daylight Time
239236
# (America/Adak)
240-
HAST -36000 # Hawaii-Aleutain Standard Time
237+
HAST -36000 # Hawaii-Aleutian Standard Time
241238
# (America/Adak)
242239
MDT -21600 D # Mexico Mountain Daylight Time
243240
# Mountain Daylight Time
@@ -294,8 +291,10 @@ PYT -14400 # Paraguay Time
294291
# (America/Asuncion)
295292
SRT -10800 # Suriname Time
296293
# (America/Paramaribo)
297-
UYST -7200 D # Uruguay Summer Time (not in zic)
298-
UYT -10800 # Uruguay Time (not in zic)
294+
UYST -7200 D # Uruguay Summer Time
295+
# (America/Montevideo)
296+
UYT -10800 # Uruguay Time
297+
# (America/Montevideo)
299298
VET -16200 # Venezuela Time (caution: this used to mean -14400)
300299
# (America/Caracas)
301300
WGST -7200 D # Western Greenland Summer Time

0 commit comments

Comments
 (0)