Skip to content

Commit 317c8bc

Browse files
authored
Update MODE=tiny time zone list (#1167)
I took one canonical IANA zone ID from each of the different colored regions in this article, except those that do not observe DST and do not have a Google office. See the "Time in Europe" Wikipedia article. As to which canonical ID to use, this was somewhat arbitrary. Brussels was obvious, as the de facto capital of the EU. For the rest, I mostly just went with lexicographic ordering of the most recognizable options. I've sorted the American zones. This Keeps the U.S. ones together but does everything alphabetically otherwise. I've added the remaining Canadian zones These have DST (and Newfoundland is off by a half- hour from a UTC interval) so they cannot use Etc/. The Pacific/ zones are sort of sorted. The Chathan Islands have been added. This is the last of the zones I believe with a non-integer hour offset from UTC.
1 parent 2a1f352 commit 317c8bc

File tree

2 files changed

+40
-50
lines changed

2 files changed

+40
-50
lines changed

third_party/tz/localtime.c

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,21 @@ __static_yoink("usr/share/zoneinfo/Etc/GMT+11");
8686
__static_yoink("usr/share/zoneinfo/Etc/GMT+12");
8787

8888
__static_yoink("usr/share/zoneinfo/America/");
89-
__static_yoink("usr/share/zoneinfo/America/Los_Angeles"); // U.S.
90-
__static_yoink("usr/share/zoneinfo/America/New_York"); // U.S.
89+
__static_yoink("usr/share/zoneinfo/America/Anchorage"); // U.S.
9190
__static_yoink("usr/share/zoneinfo/America/Chicago"); // U.S.
9291
__static_yoink("usr/share/zoneinfo/America/Denver"); // U.S.
93-
__static_yoink("usr/share/zoneinfo/America/Anchorage"); // U.S.
92+
__static_yoink("usr/share/zoneinfo/America/Los_Angeles"); // U.S.
93+
__static_yoink("usr/share/zoneinfo/America/New_York"); // U.S.
9494
__static_yoink("usr/share/zoneinfo/America/Phoenix"); // U.S.
95-
__static_yoink("usr/share/zoneinfo/America/Mexico_City"); // Mexico
96-
__static_yoink("usr/share/zoneinfo/America/Sao_Paulo"); // Brazil
95+
__static_yoink("usr/share/zoneinfo/America/Argentina/");
96+
__static_yoink("usr/share/zoneinfo/America/Argentina/Buenos_Aires");
9797
__static_yoink("usr/share/zoneinfo/America/Bogota"); // Columbia
98+
__static_yoink("usr/share/zoneinfo/America/Halifax"); // Canada
99+
__static_yoink("usr/share/zoneinfo/America/St_Johns"); // Canada
98100
__static_yoink("usr/share/zoneinfo/America/Lima"); // Peru
101+
__static_yoink("usr/share/zoneinfo/America/Mexico_City"); // Mexico
99102
__static_yoink("usr/share/zoneinfo/America/Santiago"); // Chile
100-
__static_yoink("usr/share/zoneinfo/America/Argentina/");
101-
__static_yoink("usr/share/zoneinfo/America/Argentina/Buenos_Aires");
103+
__static_yoink("usr/share/zoneinfo/America/Sao_Paulo"); // Brazil
102104
#ifdef EMBED_EVERY_TIME_ZONE
103105
__static_yoink("usr/share/zoneinfo/America/Adak");
104106
__static_yoink("usr/share/zoneinfo/America/Araguaina");
@@ -145,7 +147,6 @@ __static_yoink("usr/share/zoneinfo/America/Grand_Turk");
145147
__static_yoink("usr/share/zoneinfo/America/Guatemala");
146148
__static_yoink("usr/share/zoneinfo/America/Guayaquil");
147149
__static_yoink("usr/share/zoneinfo/America/Guyana");
148-
__static_yoink("usr/share/zoneinfo/America/Halifax");
149150
__static_yoink("usr/share/zoneinfo/America/Havana");
150151
__static_yoink("usr/share/zoneinfo/America/Hermosillo");
151152
__static_yoink("usr/share/zoneinfo/America/Indiana/");
@@ -201,7 +202,6 @@ __static_yoink("usr/share/zoneinfo/America/Santarem");
201202
__static_yoink("usr/share/zoneinfo/America/Santo_Domingo");
202203
__static_yoink("usr/share/zoneinfo/America/Scoresbysund");
203204
__static_yoink("usr/share/zoneinfo/America/Sitka");
204-
__static_yoink("usr/share/zoneinfo/America/St_Johns");
205205
__static_yoink("usr/share/zoneinfo/America/Swift_Current");
206206
__static_yoink("usr/share/zoneinfo/America/Tegucigalpa");
207207
__static_yoink("usr/share/zoneinfo/America/Thule");
@@ -214,45 +214,45 @@ __static_yoink("usr/share/zoneinfo/America/Yakuatt");
214214
#endif
215215

216216
__static_yoink("usr/share/zoneinfo/Europe/");
217-
__static_yoink("usr/share/zoneinfo/Europe/Zurich"); // Switzerland
218-
__static_yoink("usr/share/zoneinfo/Europe/Dublin"); // Ireland
219-
__static_yoink("usr/share/zoneinfo/Europe/London"); // UK
220-
__static_yoink("usr/share/zoneinfo/Europe/Paris"); // France
221-
__static_yoink("usr/share/zoneinfo/Europe/Berlin"); // Germany
222-
__static_yoink("usr/share/zoneinfo/Europe/Rome"); // Italy
223-
__static_yoink("usr/share/zoneinfo/Europe/Moscow"); // Moscow
224-
__static_yoink("usr/share/zoneinfo/Europe/Madrid"); // Spain
225-
__static_yoink("usr/share/zoneinfo/Europe/Warsaw"); // Poland
226217
__static_yoink("usr/share/zoneinfo/Europe/Brussels"); // Belgium
227-
__static_yoink("usr/share/zoneinfo/Europe/Budapest"); // Hungary
228-
__static_yoink("usr/share/zoneinfo/Europe/Vienna"); // Austria
229-
__static_yoink("usr/share/zoneinfo/Europe/Prague"); // Czech Republic
230-
__static_yoink("usr/share/zoneinfo/Europe/Kyiv"); // Ukraine
218+
__static_yoink("usr/share/zoneinfo/Europe/Bucharest"); // Romania
219+
__static_yoink("usr/share/zoneinfo/Europe/Dublin"); // Ireland
231220
__static_yoink("usr/share/zoneinfo/Europe/Istanbul"); // Turkey
232221
#ifdef EMBED_EVERY_TIME_ZONE
233-
__static_yoink("usr/share/zoneinfo/Europe/Lisbon");
234-
__static_yoink("usr/share/zoneinfo/Europe/Athens");
235222
__static_yoink("usr/share/zoneinfo/Europe/Andorra");
236223
__static_yoink("usr/share/zoneinfo/Europe/Astrakhan");
224+
__static_yoink("usr/share/zoneinfo/Europe/Athens");
237225
__static_yoink("usr/share/zoneinfo/Europe/Belgrade");
238-
__static_yoink("usr/share/zoneinfo/Europe/Bucharest");
226+
__static_yoink("usr/share/zoneinfo/Europe/Berlin");
227+
__static_yoink("usr/share/zoneinfo/Europe/Budapest");
239228
__static_yoink("usr/share/zoneinfo/Europe/Chisinau");
240229
__static_yoink("usr/share/zoneinfo/Europe/Gibraltar");
241230
__static_yoink("usr/share/zoneinfo/Europe/Helsinki");
242231
__static_yoink("usr/share/zoneinfo/Europe/Kaliningrad");
243232
__static_yoink("usr/share/zoneinfo/Europe/Kirov");
233+
__static_yoink("usr/share/zoneinfo/Europe/Kyiv");
234+
__static_yoink("usr/share/zoneinfo/Europe/Lisbon");
235+
__static_yoink("usr/share/zoneinfo/Europe/London");
236+
__static_yoink("usr/share/zoneinfo/Europe/Madrid");
244237
__static_yoink("usr/share/zoneinfo/Europe/Malta");
245238
__static_yoink("usr/share/zoneinfo/Europe/Minsk");
239+
__static_yoink("usr/share/zoneinfo/Europe/Moscow");
240+
__static_yoink("usr/share/zoneinfo/Europe/Paris");
241+
__static_yoink("usr/share/zoneinfo/Europe/Prague");
246242
__static_yoink("usr/share/zoneinfo/Europe/Riga");
243+
__static_yoink("usr/share/zoneinfo/Europe/Rome");
247244
__static_yoink("usr/share/zoneinfo/Europe/Samara");
248245
__static_yoink("usr/share/zoneinfo/Europe/Saratov");
249246
__static_yoink("usr/share/zoneinfo/Europe/Simferopol");
250247
__static_yoink("usr/share/zoneinfo/Europe/Sofia");
251248
__static_yoink("usr/share/zoneinfo/Europe/Tallinn");
252249
__static_yoink("usr/share/zoneinfo/Europe/Tirane");
253250
__static_yoink("usr/share/zoneinfo/Europe/Ulyanovsk");
251+
__static_yoink("usr/share/zoneinfo/Europe/Vienna");
254252
__static_yoink("usr/share/zoneinfo/Europe/Vilnius");
255253
__static_yoink("usr/share/zoneinfo/Europe/Volgograd");
254+
__static_yoink("usr/share/zoneinfo/Europe/Warsaw");
255+
__static_yoink("usr/share/zoneinfo/Europe/Zurich");
256256
#endif
257257

258258
__static_yoink("usr/share/zoneinfo/Asia/");
@@ -335,15 +335,15 @@ __static_yoink("usr/share/zoneinfo/Asia/Yerevan");
335335
#endif
336336

337337
__static_yoink("usr/share/zoneinfo/Pacific/");
338-
__static_yoink("usr/share/zoneinfo/Pacific/Honolulu"); // U.S.
339338
__static_yoink("usr/share/zoneinfo/Pacific/Guam"); // U.S.
339+
__static_yoink("usr/share/zoneinfo/Pacific/Honolulu"); // U.S.
340340
__static_yoink("usr/share/zoneinfo/Pacific/Auckland"); // New Zealand
341+
__static_yoink("usr/share/zoneinfo/Pacific/Chatham"); // New Zealand
341342
__static_yoink("usr/share/zoneinfo/Pacific/Fiji"); // Fiji
342343
__static_yoink("usr/share/zoneinfo/Pacific/Port_Moresby"); // Papua New Guinea
343344
#ifdef EMBED_EVERY_TIME_ZONE
344345
__static_yoink("usr/share/zoneinfo/Pacific/Apia");
345346
__static_yoink("usr/share/zoneinfo/Pacific/Bougainville");
346-
__static_yoink("usr/share/zoneinfo/Pacific/Chatham");
347347
__static_yoink("usr/share/zoneinfo/Pacific/Easter");
348348
__static_yoink("usr/share/zoneinfo/Pacific/Efate");
349349
__static_yoink("usr/share/zoneinfo/Pacific/Fakaofo");
@@ -447,14 +447,11 @@ static const struct {
447447
{"Afghanistan Standard Time", "Asia/Kabul"}, // +0430 +0430
448448
{"Alaskan Standard Time", "America/Anchorage"}, // -0800 AKDT
449449
{"Arabian Standard Time", "Asia/Dubai"}, // +0400 +04
450-
{"Arabic Standard Time", "Asia/Baghdad"}, // +0300 +03
451450
{"Argentina Standard Time", "America/Argentina/Buenos_Aires"}, // -0300 -03
452451
{"Bangladesh Standard Time", "Asia/Dhaka"}, // +0600 +06
453452
{"Cen. Australia Standard Time", "Australia/Adelaide"}, // +0930 ACST
454-
{"Central Europe Standard Time", "Europe/Budapest"}, // +0200 CEST
455-
{"Central European Standard Time", "Europe/Warsaw"}, // +0200 CEST
456-
{"Central Standard Time (Mexico)", "America/Mexico_City"}, // -0600 CST
457453
{"Central Standard Time", "America/Chicago"}, // -0500 CDT
454+
{"Central Standard Time (Mexico)", "America/Mexico_City"}, // -0600 CST
458455
{"China Standard Time", "Asia/Shanghai"}, // +0800 CST
459456
{"Dateline Standard Time", "Etc/GMT+12"}, // -1200 -12
460457
{"E. Africa Standard Time", "Africa/Nairobi"}, // +0300 EAT
@@ -463,7 +460,7 @@ static const struct {
463460
{"Eastern Standard Time", "America/New_York"}, // -0400 EDT
464461
{"Egypt Standard Time", "Africa/Cairo"}, // +0300 EEST
465462
{"Fiji Standard Time", "Pacific/Fiji"}, // +1200 +12
466-
{"GMT Standard Time", "Europe/London"}, // +0100 BST
463+
{"GTB Standard Time", "Europe/Bucharest"}, // +0300 EEST
467464
{"Hawaiian Standard Time", "Pacific/Honolulu"}, // -1000 HST
468465
{"India Standard Time", "Asia/Kolkata"}, // +0530 IST
469466
{"Iran Standard Time", "Asia/Tehran"}, // +0330 +0330
@@ -475,8 +472,6 @@ static const struct {
475472
{"Pacific SA Standard Time", "America/Santiago"}, // -0400 -04
476473
{"Pacific Standard Time", "America/Los_Angeles"}, // -0700 PDT
477474
{"Pakistan Standard Time", "Asia/Karachi"}, // +0500 PKT
478-
{"Romance Standard Time", "Europe/Paris"}, // +0200 CEST
479-
{"Russian Standard Time", "Europe/Moscow"}, // +0300 MSK
480475
{"SA Pacific Standard Time", "America/Bogota"}, // -0500 -05
481476
{"SE Asia Standard Time", "Asia/Bangkok"}, // +0700 +07
482477
{"Singapore Standard Time", "Asia/Singapore"}, // +0800 +08
@@ -493,13 +488,13 @@ static const struct {
493488
{"UTC-11", "Etc/GMT+11"}, // -1100 -11
494489
{"W. Australia Standard Time", "Australia/Perth"}, // +0800 AWST
495490
{"W. Central Africa Standard Time", "Africa/Lagos"}, // +0100 WAT
496-
{"W. Europe Standard Time", "Europe/Berlin"}, // +0200 CEST
497491
{"West Pacific Standard Time", "Pacific/Port_Moresby"}, // +1000 +10
498492
#ifdef EMBED_EVERY_TIME_ZONE
499493
{"AUS Central Standard Time", "Australia/Darwin"}, // +0930 ACST
500494
{"Aleutian Standard Time", "America/Adak"}, // -0900 HDT
501495
{"Altai Standard Time", "Asia/Barnaul"}, // +0700 +07
502496
{"Arab Standard Time", "Asia/Riyadh"}, // +0300 +03
497+
{"Arabic Standard Time", "Asia/Baghdad"}, // +0300 +03
503498
{"Astrakhan Standard Time", "Europe/Astrakhan"}, // +0400 +04
504499
{"Atlantic Standard Time", "America/Halifax"}, // -0300 ADT
505500
{"Aus Central W. Standard Time", "Australia/Eucla"}, // +0845 +0845
@@ -514,17 +509,20 @@ static const struct {
514509
{"Central America Standard Time", "America/Guatemala"}, // -0600 CST
515510
{"Central Asia Standard Time", "Asia/Almaty"}, // +0500 +05
516511
{"Central Brazilian Standard Time", "America/Cuiaba"}, // -0400 -04
512+
{"Central Europe Standard Time", "Europe/Budapest"}, // +0200 CEST
513+
{"Central European Standard Time", "Europe/Warsaw"}, // +0200 CEST
517514
{"Central Pacific Standard Time", "Pacific/Guadalcanal"}, // +1100 +11
518515
{"Chatham Islands Standard Time", "Pacific/Chatham"}, // +1245 +1245
519516
{"Cuba Standard Time", "America/Havana"}, // -0400 CDT
520517
{"E. Europe Standard Time", "Europe/Chisinau"}, // +0300 EEST
521518
{"Easter Island Standard Time", "Pacific/Easter"}, // -0600 -06
522519
{"Eastern Standard Time (Mexico)", "America/Cancun"}, // -0500 EST
523520
{"Ekaterinburg Standard Time", "Asia/Yekaterinburg"}, // +0500 +05
524-
{"FLE Standard Time", "Europe/Helsinki"}, // +0300 EEST
525-
{"GTB Standard Time", "Europe/Bucharest"}, // +0300 EEST
521+
{"FLE Standard Time", "Europe/Kiev"}, // +0300 EEST
522+
{"GMT Standard Time", "Europe/London"}, // +0100 BST
526523
{"Georgian Standard Time", "Asia/Tbilisi"}, // +0400 +04
527-
{"Greenwich Standard Time", "Atlantic/St_Helena"}, // +0000 GMT
524+
{"Greenland Standard Time", "America/Godthab"}, // -0100 -01
525+
{"Greenwich Standard Time", "Atlantic/Reykjavik"}, // +0000 GMT
528526
{"Haiti Standard Time", "America/Port-au-Prince"}, // -0400 EDT
529527
{"Jordan Standard Time", "Asia/Amman"}, // +0300 +03
530528
{"Kaliningrad Standard Time", "Europe/Kaliningrad"}, // +0200 EET
@@ -551,9 +549,11 @@ static const struct {
551549
{"Omsk Standard Time", "Asia/Omsk"}, // +0600 +06
552550
{"Pacific Standard Time (Mexico)", "America/Tijuana"}, // -0700 PDT
553551
{"Paraguay Standard Time", "America/Asuncion"}, // -0400 -04
552+
{"Romance Standard Time", "Europe/Paris"}, // +0200 CEST
554553
{"Russia Time Zone 10", "Asia/Srednekolymsk"}, // +1100 +11
555554
{"Russia Time Zone 11", "Asia/Kamchatka"}, // +1200 +12
556555
{"Russia Time Zone 3", "Europe/Samara"}, // +0400 +04
556+
{"Russian Standard Time", "Europe/Moscow"}, // +0300 MSK
557557
{"SA Eastern Standard Time", "America/Cayenne"}, // -0300 -03
558558
{"SA Western Standard Time", "America/La_Paz"}, // -0400 -04
559559
{"Saint Pierre Standard Time", "America/Miquelon"}, // -0200 -02
@@ -571,6 +571,7 @@ static const struct {
571571
{"Ulaanbaatar Standard Time", "Asia/Ulaanbaatar"}, // +0800 +08
572572
{"Venezuela Standard Time", "America/Caracas"}, // -0400 -04
573573
{"Vladivostok Standard Time", "Asia/Vladivostok"}, // +1000 +10
574+
{"W. Europe Standard Time", "Europe/Berlin"}, // +0200 CEST
574575
{"W. Mongolia Standard Time", "Asia/Hovd"}, // +0700 +07
575576
{"West Asia Standard Time", "Asia/Tashkent"}, // +0500 +05
576577
{"West Bank Standard Time", "Asia/Hebron"}, // +0300 EEST

third_party/tz/windows.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,10 @@
7373
'Etc/GMT-8',
7474
'Etc/GMT-9',
7575
'Etc/UTC',
76-
'Europe/Berlin',
7776
'Europe/Brussels',
78-
'Europe/Budapest',
77+
'Europe/Bucharest',
7978
'Europe/Dublin',
8079
'Europe/Istanbul',
81-
'Europe/Kyiv',
82-
'Europe/London',
83-
'Europe/Madrid',
84-
'Europe/Moscow',
85-
'Europe/Paris',
86-
'Europe/Prague',
87-
'Europe/Rome',
88-
'Europe/Vienna',
89-
'Europe/Warsaw',
90-
'Europe/Zurich',
9180
'GMT',
9281
'HST',
9382
'MET',

0 commit comments

Comments
 (0)