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

Commit da6ea70

Browse files
tglsfdctglsfdc
committed
Remove vestigial references to "zic" in favor of "IANA database".
Commit b2cbced instituted a policy of referring to the timezone database as the "IANA timezone database" in our user-facing documentation. Propagate that wording into a couple of places that were still using "zic" to refer to the database, which is definitely not right (zic is the compilation tool, not the data). Back-patch, not because this is very important in itself, but because we routinely cherry-pick updates to the tznames files and I don't want to risk future merge failures.
1 parent 5a07224 commit da6ea70

File tree

10 files changed

+80
-80
lines changed

10 files changed

+80
-80
lines changed

‎src/timezone/tznames/Africa.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ GMT 0 # Greenwich Mean Time
144144
# (Europe/London)
145145
# CONFLICT! SAST is not unique
146146
# Other timezones:
147-
# - SAST South Australian Standard Time (not in zic)
147+
# - SAST South Australian Standard Time (not in IANA database)
148148
SAST 7200 # South Africa Standard Time
149149
# (Africa/Johannesburg)
150150
WAST 7200 D # West Africa Summer Time

‎src/timezone/tznames/America.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ACT -18000 # Acre Time
1515
# CONFLICT! ACST is not unique
1616
# Other timezones:
1717
# - ACST: Australian Central Standard Time
18-
ACST -14400 D # Acre Summer Time (obsolete, not in zic)
18+
ACST -14400 D # Acre Summer Time (obsolete, not in IANA database)
1919
ADT -10800 D # Atlantic Daylight Time
2020
# (America/Glace_Bay)
2121
# (America/Goose_Bay)
@@ -92,7 +92,7 @@ AST -14400 # Atlantic Standard Time
9292
# (Atlantic/Bermuda)
9393
BOT -14400 # Bolivia Time
9494
# (America/La_Paz)
95-
BRA -10800 # Brazil Time (not in zic)
95+
BRA -10800 # Brazil Time (not in IANA database)
9696
BRST -7200 D # Brasil Summer Time
9797
# (America/Sao_Paulo)
9898
BRT -10800 # Brasil Time
@@ -131,7 +131,7 @@ CLST -10800 D # Chile Summer Time
131131
CLT America/Santiago # Chile Time
132132
# (America/Santiago)
133133
# (Antarctica/Palmer)
134-
COT -18000 # Columbia Time (not in zic)
134+
COT -18000 # Columbia Time (not in IANA database)
135135
# CONFLICT! CST is not unique
136136
# Other timezones:
137137
# - CST: Central Standard Time (Australia)
@@ -207,7 +207,7 @@ EST -18000 # Eastern Standard Time (America)
207207
# (America/Toronto)
208208
FNT -7200 # Fernando de Noronha Time
209209
# (America/Noronha)
210-
FNST -3600 D # Fernando de Noronha Summer Time (not in zic)
210+
FNST -3600 D # Fernando de Noronha Summer Time (not in IANA database)
211211
# (America/Noronha)
212212
GFT -10800 # French Guiana Time
213213
# (America/Cayenne)
@@ -265,7 +265,7 @@ NDT -9000 D # Newfoundland Daylight Time
265265
# CONFLICT! NFT is not unique
266266
# Other timezones:
267267
# - NFT: Norfolk Time (Pacific)
268-
NFT -12600 # Newfoundland Time (not in zic)
268+
NFT -12600 # Newfoundland Time (not in IANA database)
269269
NST -12600 # Newfoundland Standard Time
270270
# (America/St_Johns)
271271
PDT -25200 D # Pacific Daylight Time
@@ -274,7 +274,7 @@ PDT -25200 D # Pacific Daylight Time
274274
# (America/Tijuana)
275275
# (America/Vancouver)
276276
# (America/Whitehorse)
277-
PET -18000 # Peru Time (not in zic)
277+
PET -18000 # Peru Time (not in IANA database)
278278
PMDT -7200 D # Pierre & Miquelon Daylight Time
279279
# (America/Miquelon)
280280
PMST -10800 # Pierre & Miquelon Standard Time

‎src/timezone/tznames/Asia.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ BDT 21600 # Bangladesh Time
4848
# (Asia/Dhaka)
4949
BNT 28800 # Brunei Darussalam Time
5050
# (Asia/Brunei)
51-
BORT 28800 # Borneo Time (Indonesia) (not in zic)
51+
BORT 28800 # Borneo Time (Indonesia) (not in IANA database)
5252
BTT 21600 # Bhutan Time
5353
# (Asia/Thimphu)
54-
CCT 28800 # China Coastal Time (not in zic)
54+
CCT 28800 # China Coastal Time (not in IANA database)
5555
CHOST Asia/Choibalsan # Choibalsan Summer Time
5656
# (Asia/Choibalsan)
5757
CHOT Asia/Choibalsan # Choibalsan Time
@@ -123,7 +123,7 @@ GET Asia/Tbilisi # Georgia Time
123123
GST 14400 # Gulf Standard Time
124124
# (Asia/Dubai)
125125
# (Asia/Muscat)
126-
HKT 28800 # Hong Kong Time (not in zic)
126+
HKT 28800 # Hong Kong Time (not in IANA database)
127127
HOVST 28800 D # Hovd Summer Time
128128
# (Asia/Hovd)
129129
HOVT Asia/Hovd # Hovd Time
@@ -142,7 +142,7 @@ IRKT Asia/Irkutsk # Irkutsk Time
142142
# (Asia/Irkutsk)
143143
IRST Asia/Tehran # Iran Standard Time
144144
# (Asia/Tehran)
145-
IRT 12600 # Iran Time (not in zic)
145+
IRT 12600 # Iran Time (not in IANA database)
146146
# CONFLICT! IST is not unique
147147
# Other timezones:
148148
# - IST: Irish Summer Time (Europe)
@@ -155,10 +155,10 @@ IST 19800 # Indian Standard Time
155155
# - IST: Indian Standard Time (Asia)
156156
IST 7200 # Israel Standard Time
157157
# (Asia/Jerusalem)
158-
JAYT 32400 # Jayapura Time (Indonesia) (not in zic)
158+
JAYT 32400 # Jayapura Time (Indonesia) (not in IANA database)
159159
JST 32400 # Japan Standard Time
160160
# (Asia/Tokyo)
161-
KDT 36000 D # Korean Daylight Time (not in zic)
161+
KDT 36000 D # Korean Daylight Time (not in IANA database)
162162
KGST 21600 D # Kyrgyzstan Summer Time (obsolete)
163163
KGT Asia/Bishkek # Kyrgyzstan Time
164164
# (Asia/Bishkek)

‎src/timezone/tznames/Australia

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
# in case of a conflict.
2020
@OVERRIDE
2121

22-
CST 34200 # Central Standard Time (not in zic)
23-
EAST 36000 # East Australian Standard Time (not in zic)
24-
EST 36000 # Eastern Standard Time (not in zic)
25-
SAST 34200 # South Australian Standard Time (not in zic)
26-
SAT 34200 # South Australian Standard Time (not in zic)
27-
WST 28800 # Western Standard Time (not in zic)
22+
CST 34200 # Central Standard Time (not in IANA database)
23+
EAST 36000 # East Australian Standard Time (not in IANA database)
24+
EST 36000 # Eastern Standard Time (not in IANA database)
25+
SAST 34200 # South Australian Standard Time (not in IANA database)
26+
SAT 34200 # South Australian Standard Time (not in IANA database)
27+
WST 28800 # Western Standard Time (not in IANA database)

‎src/timezone/tznames/Australia.txt

+18-18
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# src/timezone/tznames/Australia.txt
88
#
99

10-
ACSST 37800 D # Central Australia (not in zic)
10+
ACSST 37800 D # Central Australia (not in IANA database)
1111
ACDT 37800 D # Australian Central Daylight Time
1212
# (Australia/Adelaide)
1313
# (Australia/Broken_Hill)
@@ -18,7 +18,7 @@ ACST 34200 # Australian Central Standard Time
1818
# (Australia/Darwin)
1919
ACWST 31500 # Australian Central Western Standard Time
2020
# (Australia/Eucla)
21-
AESST 39600 D # Australia Eastern Summer Standard Time (not in zic)
21+
AESST 39600 D # Australia Eastern Summer Standard Time (not in IANA database)
2222
AEDT 39600 D # Australian Eastern Daylight Time
2323
# (Australia/Brisbane)
2424
# (Australia/Currie)
@@ -33,42 +33,42 @@ AEST 36000 # Australian Eastern Standard Time
3333
# (Australia/Lindeman)
3434
# (Australia/Melbourne)
3535
# (Australia/Sydney)
36-
AWSST 32400 D # Australia Western Summer Standard Time (not in zic)
36+
AWSST 32400 D # Australia Western Summer Standard Time (not in IANA database)
3737
AWST 28800 # Australian Western Standard Time
3838
# (Australia/Perth)
39-
CADT 37800 D # Central Australia Daylight-Saving Time (not in zic)
40-
CAST 34200 # Central Australia Standard Time (not in zic)
39+
CADT 37800 D # Central Australia Daylight-Saving Time (not in IANA database)
40+
CAST 34200 # Central Australia Standard Time (not in IANA database)
4141
# CONFLICT! CST is not unique
4242
# Other timezones:
4343
# - CST: Central Standard Time (America)
4444
# - CST: China Standard Time (Asia)
4545
# - CST: Cuba Central Standard Time (America)
46-
CST 34200 # Central Standard Time (not in zic)
47-
CWST 31500 # Central Western Standard Time (not in zic)
46+
CST 34200 # Central Standard Time (not in IANA database)
47+
CWST 31500 # Central Western Standard Time (not in IANA database)
4848
# CONFLICT! EAST is not unique
4949
# Other timezones:
5050
# - EAST: Easter Island Time (Chile) (Pacific)
51-
EAST 36000 # East Australian Standard Time (not in zic)
51+
EAST 36000 # East Australian Standard Time (not in IANA database)
5252
# CONFLICT! EST is not unique
5353
# Other timezones:
5454
# - EST: Eastern Standard Time (America)
55-
EST 36000 # Eastern Standard Time (not in zic)
55+
EST 36000 # Eastern Standard Time (not in IANA database)
5656
LHDT Australia/Lord_Howe # Lord Howe Daylight Time
5757
# (Australia/Lord_Howe)
5858
LHST 37800 # Lord Howe Standard Time
5959
# (Australia/Lord_Howe)
60-
LIGT 36000 # Melbourne, Australia (not in zic)
61-
NZT 43200 # New Zealand Time (not in zic)
62-
SADT 37800 D # South Australian Daylight-Saving Time (not in zic)
60+
LIGT 36000 # Melbourne, Australia (not in IANA database)
61+
NZT 43200 # New Zealand Time (not in IANA database)
62+
SADT 37800 D # South Australian Daylight-Saving Time (not in IANA database)
6363
# CONFLICT! SAST is not unique
6464
# Other timezones:
6565
# - SAST South Africa Standard Time
66-
SAST 34200 # South Australian Standard Time (not in zic)
67-
SAT 34200 # South Australian Standard Time (not in zic)
68-
WADT 28800 D # West Australian Daylight-Saving Time (not in zic)
69-
WAST 25200 # West Australian Standard Time (not in zic)
70-
WDT 32400 D # West Australian Daylight-Saving Time (not in zic)
66+
SAST 34200 # South Australian Standard Time (not in IANA database)
67+
SAT 34200 # South Australian Standard Time (not in IANA database)
68+
WADT 28800 D # West Australian Daylight-Saving Time (not in IANA database)
69+
WAST 25200 # West Australian Standard Time (not in IANA database)
70+
WDT 32400 D # West Australian Daylight-Saving Time (not in IANA database)
7171
# CONFLICT! WST is not unique
7272
# Other timezones:
7373
# - WST: West Samoa Time
74-
WST 28800 # Western Standard Time (not in zic)
74+
WST 28800 # Western Standard Time (not in IANA database)

‎src/timezone/tznames/Default

+31-31
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ART America/Argentina/Buenos_Aires # Argentina Time
6868
ARST America/Argentina/Buenos_Aires # Argentina Summer Time
6969
BOT -14400 # Bolivia Time
7070
# (America/La_Paz)
71-
BRA -10800 # Brazil Time (not in zic)
71+
BRA -10800 # Brazil Time (not in IANA database)
7272
BRST -7200 D # Brasil Summer Time
7373
# (America/Sao_Paulo)
7474
BRT -10800 # Brasil Time
@@ -79,7 +79,7 @@ BRT -10800 # Brasil Time
7979
# (America/Maceio)
8080
# (America/Recife)
8181
# (America/Sao_Paulo)
82-
COT -18000 # Columbia Time (not in zic)
82+
COT -18000 # Columbia Time (not in IANA database)
8383
# CONFLICT! CDT is not unique
8484
# Other timezones:
8585
# - CDT: Mexico Central Daylight Time (America)
@@ -166,7 +166,7 @@ EST -18000 # Eastern Standard Time (America)
166166
# (America/Toronto)
167167
FNT -7200 # Fernando de Noronha Time
168168
# (America/Noronha)
169-
FNST -3600 D # Fernando de Noronha Summer Time (not in zic)
169+
FNST -3600 D # Fernando de Noronha Summer Time (not in IANA database)
170170
# (America/Noronha)
171171
GFT -10800 # French Guiana Time
172172
# (America/Cayenne)
@@ -199,7 +199,7 @@ NDT -9000 D # Newfoundland Daylight Time
199199
# (America/St_Johns)
200200
NST -12600 # Newfoundland Standard Time
201201
# (America/St_Johns)
202-
PET -18000 # Peru Time (not in zic)
202+
PET -18000 # Peru Time (not in IANA database)
203203
PDT -25200 D # Pacific Daylight Time
204204
# (America/Dawson)
205205
# (America/Los_Angeles)
@@ -269,14 +269,14 @@ BDT 21600 # Bangladesh Time
269269
# (Asia/Dhaka)
270270
BNT 28800 # Brunei Darussalam Time
271271
# (Asia/Brunei)
272-
BORT 28800 # Borneo Time (Indonesia) (not in zic)
272+
BORT 28800 # Borneo Time (Indonesia) (not in IANA database)
273273
BTT 21600 # Bhutan Time
274274
# (Asia/Thimphu)
275-
CCT 28800 # China Coastal Time (not in zic)
275+
CCT 28800 # China Coastal Time (not in IANA database)
276276
GEST Asia/Tbilisi # Georgia Summer Time (obsolete)
277277
GET Asia/Tbilisi # Georgia Time
278278
# (Asia/Tbilisi)
279-
HKT 28800 # Hong Kong Time (not in zic)
279+
HKT 28800 # Hong Kong Time (not in IANA database)
280280
ICT 25200 # Indochina Time
281281
# (Asia/Bangkok)
282282
# (Asia/Phnom_Penh)
@@ -287,17 +287,17 @@ IDT 10800 D # Israel Daylight Time
287287
IRKST Asia/Irkutsk # Irkutsk Summer Time (obsolete)
288288
IRKT Asia/Irkutsk # Irkutsk Time
289289
# (Asia/Irkutsk)
290-
IRT 12600 # Iran Time (not in zic)
290+
IRT 12600 # Iran Time (not in IANA database)
291291
# CONFLICT! IST is not unique
292292
# Other timezones:
293293
# - IST: Irish Summer Time (Europe)
294294
# - IST: Indian Standard Time (Asia)
295295
IST 7200 # Israel Standard Time
296296
# (Asia/Jerusalem)
297-
JAYT 32400 # Jayapura Time (Indonesia) (not in zic)
297+
JAYT 32400 # Jayapura Time (Indonesia) (not in IANA database)
298298
JST 32400 # Japan Standard Time
299299
# (Asia/Tokyo)
300-
KDT 36000 D # Korean Daylight Time (not in zic)
300+
KDT 36000 D # Korean Daylight Time (not in IANA database)
301301
KGST 21600 D # Kyrgyzstan Summer Time (obsolete)
302302
KGT Asia/Bishkek # Kyrgyzstan Time
303303
# (Asia/Bishkek)
@@ -408,7 +408,7 @@ FKT Atlantic/Stanley # Falkland Islands Time (obsolete)
408408

409409
#################### AUSTRALIA ####################
410410

411-
ACSST 37800 D # Australian Central Summer Standard Time (not in zic)
411+
ACSST 37800 D # Australian Central Summer Standard Time (not in IANA database)
412412
ACDT 37800 D # Australian Central Daylight Time
413413
# (Australia/Adelaide)
414414
# (Australia/Broken_Hill)
@@ -419,7 +419,7 @@ ACST 34200 # Australian Central Standard Time
419419
# (Australia/Darwin)
420420
ACWST 31500 # Australian Central Western Standard Time
421421
# (Australia/Eucla)
422-
AESST 39600 D # Australian Eastern Summer Standard Time (not in zic)
422+
AESST 39600 D # Australian Eastern Summer Standard Time (not in IANA database)
423423
AEDT 39600 D # Australian Eastern Daylight Time
424424
# (Australia/Brisbane)
425425
# (Australia/Currie)
@@ -434,21 +434,21 @@ AEST 36000 # Australian Eastern Standard Time
434434
# (Australia/Lindeman)
435435
# (Australia/Melbourne)
436436
# (Australia/Sydney)
437-
AWSST 32400 D # Australia Western Summer Standard Time (not in zic)
437+
AWSST 32400 D # Australia Western Summer Standard Time (not in IANA database)
438438
AWST 28800 # Australian Western Standard Time
439439
# (Australia/Perth)
440-
CADT 37800 D # Central Australia Daylight-Saving Time (not in zic)
441-
CAST 34200 # Central Australia Standard Time (not in zic)
440+
CADT 37800 D # Central Australia Daylight-Saving Time (not in IANA database)
441+
CAST 34200 # Central Australia Standard Time (not in IANA database)
442442
LHDT Australia/Lord_Howe # Lord Howe Daylight Time
443443
# (Australia/Lord_Howe)
444444
LHST 37800 # Lord Howe Standard Time
445445
# (Australia/Lord_Howe)
446-
LIGT 36000 # Melbourne, Australia (not in zic)
447-
NZT 43200 # New Zealand Time (not in zic)
448-
SADT 37800 D # South Australian Daylight-Saving Time (not in zic)
449-
WADT 28800 D # West Australian Daylight-Saving Time (not in zic)
450-
WAST 25200 # West Australian Standard Time (not in zic)
451-
WDT 32400 D # West Australian Daylight-Saving Time (not in zic)
446+
LIGT 36000 # Melbourne, Australia (not in IANA database)
447+
NZT 43200 # New Zealand Time (not in IANA database)
448+
SADT 37800 D # South Australian Daylight-Saving Time (not in IANA database)
449+
WADT 28800 D # West Australian Daylight-Saving Time (not in IANA database)
450+
WAST 25200 # West Australian Standard Time (not in IANA database)
451+
WDT 32400 D # West Australian Daylight-Saving Time (not in IANA database)
452452

453453
#################### ETC ####################
454454

@@ -472,7 +472,7 @@ GMT 0 # Greenwich Mean Time
472472
# (Europe/London)
473473
UCT 0 # Universal Coordinated Time
474474
# (Etc/UCT)
475-
UT 0 # Universal Time (not in zic)
475+
UT 0 # Universal Time (not in IANA database)
476476
UTC 0 # Coordinated Universal Time
477477
Z 0 # Zulu
478478
ZULU 0 # Zulu
@@ -631,10 +631,10 @@ EETDST 10800 D # East-Egypt Summertime
631631
FET 10800 # Further-eastern European Time (obsolete)
632632
# (Europe/Kaliningrad)
633633
# (Europe/Minsk)
634-
MEST 7200 D # Middle Europe Summer Time (not in zic)
635-
MET 3600 # Middle Europe Time (not in zic)
636-
METDST 7200 D # Middle Europe Summer Time (not in zic)
637-
MEZ 3600 # Mitteleuropaeische Zeit (German) (not in zic)
634+
MEST 7200 D # Middle Europe Summer Time (not in IANA database)
635+
MET 3600 # Middle Europe Time (not in IANA database)
636+
METDST 7200 D # Middle Europe Summer Time (not in IANA database)
637+
MEZ 3600 # Mitteleuropaeische Zeit (German) (not in IANA database)
638638
MSD 14400 D # Moscow Daylight Time (obsolete)
639639
MSK Europe/Moscow # Moscow Time
640640
# (Europe/Moscow)
@@ -708,11 +708,11 @@ MART -34200 # Marquesas Time
708708
MHT 43200 # Kwajalein Time
709709
# (Pacific/Kwajalein)
710710
# (Pacific/Majuro)
711-
MPT 36000 # North Mariana Islands Time (not in zic)
711+
MPT 36000 # North Mariana Islands Time (not in IANA database)
712712
# CONFLICT! NFT is not unique
713713
# Other timezones:
714714
# - NFT: Norfolk Time (Pacific)
715-
NFT -12600 # Newfoundland Time (not in zic)
715+
NFT -12600 # Newfoundland Time (not in IANA database)
716716
NUT Pacific/Niue # Niue Time
717717
# (Pacific/Niue)
718718
NZDT 46800 D # New Zealand Daylight Time
@@ -729,13 +729,13 @@ PONT 39600 # Ponape Time (Micronesia)
729729
# (Pacific/Ponape)
730730
PWT 32400 # Palau Time
731731
# (Pacific/Palau)
732-
TAHT -36000 # Tahiti Time (zic says "TAHT", other sources "THAT")
732+
TAHT -36000 # Tahiti Time (IANA database says "TAHT", other sources "THAT")
733733
# (Pacific/Tahiti)
734734
TKT Pacific/Fakaofo # Tokelau Time
735735
# (Pacific/Fakaofo)
736736
TOT 46800 # Tonga Time
737737
# (Pacific/Tongatapu)
738-
TRUT 36000 # Truk Time (zic used to say "TRUT", other sources say "TRUK")
738+
TRUT 36000 # Truk Time (IANA database used to say "TRUT", other sources say "TRUK")
739739
# (Pacific/Truk)
740740
TVT 43200 # Tuvalu Time
741741
# (Pacific/Funafuti)
@@ -745,4 +745,4 @@ WAKT 43200 # Wake Time
745745
# (Pacific/Wake)
746746
WFT 43200 # Wallis and Futuna Time
747747
# (Pacific/Wallis)
748-
YAPT 36000 # Yap Time (Micronesia) (not in zic)
748+
YAPT 36000 # Yap Time (Micronesia) (not in IANA database)

‎src/timezone/tznames/Etc.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ GMT 0 # Greenwich Mean Time
2727
# (Europe/London)
2828
UCT 0 # Universal Coordinated Time
2929
# (Etc/UCT)
30-
UT 0 # Universal Time (not in zic)
30+
UT 0 # Universal Time (not in IANA database)
3131
UTC 0 # Coordinated Universal Time
3232
# (Etc/UTC)
3333
Z 0 # Zulu

0 commit comments

Comments
 (0)