tzinfo 1.2.7 → 1.2.8

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of tzinfo might be problematic. Click here for more details.

Files changed (54) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +0 -0
  4. data/CHANGES.md +11 -0
  5. data/README.md +1 -1
  6. data/lib/tzinfo.rb +3 -0
  7. data/lib/tzinfo/annual_rules.rb +51 -0
  8. data/lib/tzinfo/posix_time_zone_parser.rb +136 -0
  9. data/lib/tzinfo/time_or_datetime.rb +11 -0
  10. data/lib/tzinfo/transition_rule.rb +325 -0
  11. data/lib/tzinfo/zoneinfo_data_source.rb +2 -1
  12. data/lib/tzinfo/zoneinfo_timezone_info.rb +255 -40
  13. data/test/tc_annual_rules.rb +95 -0
  14. data/test/tc_posix_time_zone_parser.rb +261 -0
  15. data/test/tc_time_or_datetime.rb +14 -0
  16. data/test/tc_transition_rule.rb +663 -0
  17. data/test/tc_zoneinfo_timezone_info.rb +952 -113
  18. data/test/tzinfo-data/tzinfo/data/definitions/America/Argentina/Buenos_Aires.rb +5 -5
  19. data/test/tzinfo-data/tzinfo/data/definitions/America/New_York.rb +13 -1
  20. data/test/tzinfo-data/tzinfo/data/definitions/Australia/Melbourne.rb +13 -1
  21. data/test/tzinfo-data/tzinfo/data/definitions/EST.rb +1 -1
  22. data/test/tzinfo-data/tzinfo/data/definitions/Etc/GMT__m__1.rb +2 -2
  23. data/test/tzinfo-data/tzinfo/data/definitions/Etc/GMT__p__1.rb +2 -2
  24. data/test/tzinfo-data/tzinfo/data/definitions/Etc/UTC.rb +1 -1
  25. data/test/tzinfo-data/tzinfo/data/definitions/Europe/Amsterdam.rb +15 -3
  26. data/test/tzinfo-data/tzinfo/data/definitions/Europe/Andorra.rb +13 -1
  27. data/test/tzinfo-data/tzinfo/data/definitions/Europe/London.rb +13 -1
  28. data/test/tzinfo-data/tzinfo/data/definitions/Europe/Paris.rb +15 -3
  29. data/test/tzinfo-data/tzinfo/data/definitions/Europe/Prague.rb +19 -4
  30. data/test/tzinfo-data/tzinfo/data/definitions/UTC.rb +1 -1
  31. data/test/tzinfo-data/tzinfo/data/indexes/countries.rb +197 -184
  32. data/test/tzinfo-data/tzinfo/data/indexes/timezones.rb +60 -47
  33. data/test/tzinfo-data/tzinfo/data/version.rb +9 -3
  34. data/test/zoneinfo/America/Argentina/Buenos_Aires +0 -0
  35. data/test/zoneinfo/America/New_York +0 -0
  36. data/test/zoneinfo/Australia/Melbourne +0 -0
  37. data/test/zoneinfo/EST +0 -0
  38. data/test/zoneinfo/Etc/UTC +0 -0
  39. data/test/zoneinfo/Europe/Amsterdam +0 -0
  40. data/test/zoneinfo/Europe/Andorra +0 -0
  41. data/test/zoneinfo/Europe/London +0 -0
  42. data/test/zoneinfo/Europe/Paris +0 -0
  43. data/test/zoneinfo/Europe/Prague +0 -0
  44. data/test/zoneinfo/Factory +0 -0
  45. data/test/zoneinfo/iso3166.tab +13 -14
  46. data/test/zoneinfo/leapseconds +38 -21
  47. data/test/zoneinfo/posix/Europe/London +0 -0
  48. data/test/zoneinfo/posixrules +0 -0
  49. data/test/zoneinfo/right/Europe/London +0 -0
  50. data/test/zoneinfo/zone.tab +172 -159
  51. data/test/zoneinfo/zone1970.tab +185 -170
  52. data/tzinfo.gemspec +1 -1
  53. metadata +9 -3
  54. metadata.gz.sig +0 -0
data/test/tzinfo-data/tzinfo/data/definitions/America/Argentina/Buenos_Aires.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -14,10 +14,10 @@ module TZInfo
14
14
  timezone 'America/Argentina/Buenos_Aires' do |tz|
15
15
  tz.offset :o0, -14028, 0, :LMT
16
16
  tz.offset :o1, -15408, 0, :CMT
17
- tz.offset :o2, -14400, 0, :ART
18
- tz.offset :o3, -14400, 3600, :ARST
19
- tz.offset :o4, -10800, 0, :ART
20
- tz.offset :o5, -10800, 3600, :ARST
17
+ tz.offset :o2, -14400, 0, :'-04'
18
+ tz.offset :o3, -14400, 3600, :'-03'
19
+ tz.offset :o4, -10800, 0, :'-03'
20
+ tz.offset :o5, -10800, 3600, :'-02'
21
21
 
22
22
  tz.transition 1894, 10, :o1, -2372097972, 17374555169, 7200
23
23
  tz.transition 1920, 5, :o2, -1567453392, 1453467407, 600
data/test/tzinfo-data/tzinfo/data/definitions/America/New_York.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -307,6 +307,18 @@ module TZInfo
307
307
  tz.transition 2063, 11, :o1, 2961381600, 9899451, 4
308
308
  tz.transition 2064, 3, :o2, 2972271600, 59399731, 24
309
309
  tz.transition 2064, 11, :o1, 2992831200, 9900907, 4
310
+ tz.transition 2065, 3, :o2, 3003721200, 59408467, 24
311
+ tz.transition 2065, 11, :o1, 3024280800, 9902363, 4
312
+ tz.transition 2066, 3, :o2, 3035775600, 59417371, 24
313
+ tz.transition 2066, 11, :o1, 3056335200, 9903847, 4
314
+ tz.transition 2067, 3, :o2, 3067225200, 59426107, 24
315
+ tz.transition 2067, 11, :o1, 3087784800, 9905303, 4
316
+ tz.transition 2068, 3, :o2, 3098674800, 59434843, 24
317
+ tz.transition 2068, 11, :o1, 3119234400, 9906759, 4
318
+ tz.transition 2069, 3, :o2, 3130124400, 59443579, 24
319
+ tz.transition 2069, 11, :o1, 3150684000, 9908215, 4
320
+ tz.transition 2070, 3, :o2, 3161574000, 59452315, 24
321
+ tz.transition 2070, 11, :o1, 3182133600, 9909671, 4
310
322
  end
311
323
  end
312
324
  end
data/test/tzinfo-data/tzinfo/data/definitions/Australia/Melbourne.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -210,6 +210,18 @@ module TZInfo
210
210
  tz.transition 2063, 3, :o1, 2942582400, 14847871, 6
211
211
  tz.transition 2063, 10, :o2, 2958912000, 14849005, 6
212
212
  tz.transition 2064, 4, :o1, 2974636800, 14850097, 6
213
+ tz.transition 2064, 10, :o2, 2990361600, 14851189, 6
214
+ tz.transition 2065, 4, :o1, 3006086400, 14852281, 6
215
+ tz.transition 2065, 10, :o2, 3021811200, 14853373, 6
216
+ tz.transition 2066, 4, :o1, 3037536000, 14854465, 6
217
+ tz.transition 2066, 10, :o2, 3053260800, 14855557, 6
218
+ tz.transition 2067, 4, :o1, 3068985600, 14856649, 6
219
+ tz.transition 2067, 10, :o2, 3084710400, 14857741, 6
220
+ tz.transition 2068, 3, :o1, 3100435200, 14858833, 6
221
+ tz.transition 2068, 10, :o2, 3116764800, 14859967, 6
222
+ tz.transition 2069, 4, :o1, 3132489600, 14861059, 6
223
+ tz.transition 2069, 10, :o2, 3148214400, 14862151, 6
224
+ tz.transition 2070, 4, :o1, 3163939200, 14863243, 6
213
225
  end
214
226
  end
215
227
  end
data/test/tzinfo-data/tzinfo/data/definitions/EST.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
data/test/tzinfo-data/tzinfo/data/definitions/Etc/GMT__m__1.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -11,7 +11,7 @@ module TZInfo
11
11
  include TimezoneDefinition
12
12
 
13
13
  timezone 'Etc/GMT-1' do |tz|
14
- tz.offset :o0, 3600, 0, :'GMT-1'
14
+ tz.offset :o0, 3600, 0, :'+01'
15
15
 
16
16
  end
17
17
  end
data/test/tzinfo-data/tzinfo/data/definitions/Etc/GMT__p__1.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -11,7 +11,7 @@ module TZInfo
11
11
  include TimezoneDefinition
12
12
 
13
13
  timezone 'Etc/GMT+1' do |tz|
14
- tz.offset :o0, -3600, 0, :'GMT+1'
14
+ tz.offset :o0, -3600, 0, :'-01'
15
15
 
16
16
  end
17
17
  end
data/test/tzinfo-data/tzinfo/data/definitions/Etc/UTC.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
data/test/tzinfo-data/tzinfo/data/definitions/Europe/Amsterdam.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -14,8 +14,8 @@ module TZInfo
14
14
  tz.offset :o0, 1172, 0, :LMT
15
15
  tz.offset :o1, 1172, 0, :AMT
16
16
  tz.offset :o2, 1172, 3600, :NST
17
- tz.offset :o3, 1200, 3600, :NEST
18
- tz.offset :o4, 1200, 0, :NET
17
+ tz.offset :o3, 1200, 3600, :'+0120'
18
+ tz.offset :o4, 1200, 0, :'+0020'
19
19
  tz.offset :o5, 3600, 3600, :CEST
20
20
  tz.offset :o6, 3600, 0, :CET
21
21
 
@@ -253,6 +253,18 @@ module TZInfo
253
253
  tz.transition 2063, 10, :o6, 2960758800, 59396533, 24
254
254
  tz.transition 2064, 3, :o5, 2974064400, 59400229, 24
255
255
  tz.transition 2064, 10, :o6, 2992208400, 59405269, 24
256
+ tz.transition 2065, 3, :o5, 3005514000, 59408965, 24
257
+ tz.transition 2065, 10, :o6, 3023658000, 59414005, 24
258
+ tz.transition 2066, 3, :o5, 3036963600, 59417701, 24
259
+ tz.transition 2066, 10, :o6, 3055712400, 59422909, 24
260
+ tz.transition 2067, 3, :o5, 3068413200, 59426437, 24
261
+ tz.transition 2067, 10, :o6, 3087162000, 59431645, 24
262
+ tz.transition 2068, 3, :o5, 3099862800, 59435173, 24
263
+ tz.transition 2068, 10, :o6, 3118611600, 59440381, 24
264
+ tz.transition 2069, 3, :o5, 3131917200, 59444077, 24
265
+ tz.transition 2069, 10, :o6, 3150061200, 59449117, 24
266
+ tz.transition 2070, 3, :o5, 3163366800, 59452813, 24
267
+ tz.transition 2070, 10, :o6, 3181510800, 59457853, 24
256
268
  end
257
269
  end
258
270
  end
data/test/tzinfo-data/tzinfo/data/definitions/Europe/Andorra.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -178,6 +178,18 @@ module TZInfo
178
178
  tz.transition 2063, 10, :o2, 2960758800, 59396533, 24
179
179
  tz.transition 2064, 3, :o3, 2974064400, 59400229, 24
180
180
  tz.transition 2064, 10, :o2, 2992208400, 59405269, 24
181
+ tz.transition 2065, 3, :o3, 3005514000, 59408965, 24
182
+ tz.transition 2065, 10, :o2, 3023658000, 59414005, 24
183
+ tz.transition 2066, 3, :o3, 3036963600, 59417701, 24
184
+ tz.transition 2066, 10, :o2, 3055712400, 59422909, 24
185
+ tz.transition 2067, 3, :o3, 3068413200, 59426437, 24
186
+ tz.transition 2067, 10, :o2, 3087162000, 59431645, 24
187
+ tz.transition 2068, 3, :o3, 3099862800, 59435173, 24
188
+ tz.transition 2068, 10, :o2, 3118611600, 59440381, 24
189
+ tz.transition 2069, 3, :o3, 3131917200, 59444077, 24
190
+ tz.transition 2069, 10, :o2, 3150061200, 59449117, 24
191
+ tz.transition 2070, 3, :o3, 3163366800, 59452813, 24
192
+ tz.transition 2070, 10, :o2, 3181510800, 59457853, 24
181
193
  end
182
194
  end
183
195
  end
data/test/tzinfo-data/tzinfo/data/definitions/Europe/London.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -313,6 +313,18 @@ module TZInfo
313
313
  tz.transition 2063, 10, :o1, 2960758800, 59396533, 24
314
314
  tz.transition 2064, 3, :o2, 2974064400, 59400229, 24
315
315
  tz.transition 2064, 10, :o1, 2992208400, 59405269, 24
316
+ tz.transition 2065, 3, :o2, 3005514000, 59408965, 24
317
+ tz.transition 2065, 10, :o1, 3023658000, 59414005, 24
318
+ tz.transition 2066, 3, :o2, 3036963600, 59417701, 24
319
+ tz.transition 2066, 10, :o1, 3055712400, 59422909, 24
320
+ tz.transition 2067, 3, :o2, 3068413200, 59426437, 24
321
+ tz.transition 2067, 10, :o1, 3087162000, 59431645, 24
322
+ tz.transition 2068, 3, :o2, 3099862800, 59435173, 24
323
+ tz.transition 2068, 10, :o1, 3118611600, 59440381, 24
324
+ tz.transition 2069, 3, :o2, 3131917200, 59444077, 24
325
+ tz.transition 2069, 10, :o1, 3150061200, 59449117, 24
326
+ tz.transition 2070, 3, :o2, 3163366800, 59452813, 24
327
+ tz.transition 2070, 10, :o1, 3181510800, 59457853, 24
316
328
  end
317
329
  end
318
330
  end
data/test/tzinfo-data/tzinfo/data/definitions/Europe/Paris.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -19,8 +19,8 @@ module TZInfo
19
19
  tz.offset :o5, 3600, 0, :CET
20
20
  tz.offset :o6, 0, 7200, :WEMT
21
21
 
22
- tz.transition 1891, 3, :o1, -2486678901, 69460027033, 28800
23
- tz.transition 1911, 3, :o2, -1855958901, 69670267033, 28800
22
+ tz.transition 1891, 3, :o1, -2486592561, 69460055813, 28800
23
+ tz.transition 1911, 3, :o2, -1855958961, 69670267013, 28800
24
24
  tz.transition 1916, 6, :o3, -1689814800, 58104707, 24
25
25
  tz.transition 1916, 10, :o2, -1680397200, 58107323, 24
26
26
  tz.transition 1917, 3, :o3, -1665363600, 58111499, 24
@@ -257,6 +257,18 @@ module TZInfo
257
257
  tz.transition 2063, 10, :o5, 2960758800, 59396533, 24
258
258
  tz.transition 2064, 3, :o4, 2974064400, 59400229, 24
259
259
  tz.transition 2064, 10, :o5, 2992208400, 59405269, 24
260
+ tz.transition 2065, 3, :o4, 3005514000, 59408965, 24
261
+ tz.transition 2065, 10, :o5, 3023658000, 59414005, 24
262
+ tz.transition 2066, 3, :o4, 3036963600, 59417701, 24
263
+ tz.transition 2066, 10, :o5, 3055712400, 59422909, 24
264
+ tz.transition 2067, 3, :o4, 3068413200, 59426437, 24
265
+ tz.transition 2067, 10, :o5, 3087162000, 59431645, 24
266
+ tz.transition 2068, 3, :o4, 3099862800, 59435173, 24
267
+ tz.transition 2068, 10, :o5, 3118611600, 59440381, 24
268
+ tz.transition 2069, 3, :o4, 3131917200, 59444077, 24
269
+ tz.transition 2069, 10, :o5, 3150061200, 59449117, 24
270
+ tz.transition 2070, 3, :o4, 3163366800, 59452813, 24
271
+ tz.transition 2070, 10, :o5, 3181510800, 59457853, 24
260
272
  end
261
273
  end
262
274
  end
data/test/tzinfo-data/tzinfo/data/definitions/Europe/Prague.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -15,6 +15,7 @@ module TZInfo
15
15
  tz.offset :o1, 3464, 0, :PMT
16
16
  tz.offset :o2, 3600, 0, :CET
17
17
  tz.offset :o3, 3600, 3600, :CEST
18
+ tz.offset :o4, 3600, -3600, :GMT
18
19
 
19
20
  tz.transition 1849, 12, :o1, -3786829064, 25884991367, 10800
20
21
  tz.transition 1891, 9, :o2, -2469401864, 26049669767, 10800
@@ -29,11 +30,13 @@ module TZInfo
29
30
  tz.transition 1943, 3, :o3, -844556400, 58339501, 24
30
31
  tz.transition 1943, 10, :o2, -828226800, 58344037, 24
31
32
  tz.transition 1944, 4, :o3, -812502000, 58348405, 24
32
- tz.transition 1944, 9, :o2, -798073200, 58352413, 24
33
- tz.transition 1945, 4, :o3, -780534000, 58357285, 24
34
- tz.transition 1945, 11, :o2, -761180400, 58362661, 24
33
+ tz.transition 1944, 10, :o2, -796777200, 58352773, 24
34
+ tz.transition 1945, 4, :o3, -781052400, 58357141, 24
35
+ tz.transition 1945, 10, :o2, -765327600, 58361509, 24
35
36
  tz.transition 1946, 5, :o3, -746578800, 58366717, 24
36
37
  tz.transition 1946, 10, :o2, -733359600, 58370389, 24
38
+ tz.transition 1946, 12, :o4, -728517600, 29185867, 12
39
+ tz.transition 1947, 2, :o2, -721260000, 29186875, 12
37
40
  tz.transition 1947, 4, :o3, -716425200, 58375093, 24
38
41
  tz.transition 1947, 10, :o2, -701910000, 58379125, 24
39
42
  tz.transition 1948, 4, :o3, -684975600, 58383829, 24
@@ -212,6 +215,18 @@ module TZInfo
212
215
  tz.transition 2063, 10, :o2, 2960758800, 59396533, 24
213
216
  tz.transition 2064, 3, :o3, 2974064400, 59400229, 24
214
217
  tz.transition 2064, 10, :o2, 2992208400, 59405269, 24
218
+ tz.transition 2065, 3, :o3, 3005514000, 59408965, 24
219
+ tz.transition 2065, 10, :o2, 3023658000, 59414005, 24
220
+ tz.transition 2066, 3, :o3, 3036963600, 59417701, 24
221
+ tz.transition 2066, 10, :o2, 3055712400, 59422909, 24
222
+ tz.transition 2067, 3, :o3, 3068413200, 59426437, 24
223
+ tz.transition 2067, 10, :o2, 3087162000, 59431645, 24
224
+ tz.transition 2068, 3, :o3, 3099862800, 59435173, 24
225
+ tz.transition 2068, 10, :o2, 3118611600, 59440381, 24
226
+ tz.transition 2069, 3, :o3, 3131917200, 59444077, 24
227
+ tz.transition 2069, 10, :o2, 3150061200, 59449117, 24
228
+ tz.transition 2070, 3, :o3, 3163366800, 59452813, 24
229
+ tz.transition 2070, 10, :o2, 3181510800, 59457853, 24
215
230
  end
216
231
  end
217
232
  end
data/test/tzinfo-data/tzinfo/data/definitions/UTC.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
data/test/tzinfo-data/tzinfo/data/indexes/countries.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # This file contains data derived from the IANA Time Zone Database
4
- # (http://www.iana.org/time-zones).
4
+ # (https://www.iana.org/time-zones).
5
5
 
6
6
  module TZInfo
7
7
  module Data
@@ -31,27 +31,27 @@ module TZInfo
31
31
  c.timezone 'Asia/Yerevan', 2411, 60, 89, 2
32
32
  end
33
33
  country 'AO', 'Angola' do |c|
34
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
34
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
35
35
  end
36
36
  country 'AQ', 'Antarctica' do |c|
37
- c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera Station, Adelaide Island'
38
- c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer Station, Anvers Island'
39
- c.timezone 'Antarctica/Mawson', -338, 5, 3773, 60, 'Mawson Station, Holme Bay'
40
- c.timezone 'Antarctica/Davis', -823, 12, 2339, 30, 'Davis Station, Vestfold Hills'
41
- c.timezone 'Antarctica/Casey', -3977, 60, 6631, 60, 'Casey Station, Bailey Peninsula'
42
- c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok Station, Lake Vostok'
43
- c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville Station, Terre Adelie'
44
- c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa Station, E Ongul I'
45
- c.timezone 'Antarctica/Troll', -259241, 3600, 507, 200, 'Troll Station, Queen Maud Land'
37
+ c.timezone 'Antarctica/Casey', -3977, 60, 6631, 60, 'Casey'
38
+ c.timezone 'Antarctica/Davis', -823, 12, 2339, 30, 'Davis'
39
+ c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville'
40
+ c.timezone 'Antarctica/Mawson', -338, 5, 3773, 60, 'Mawson'
41
+ c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer'
42
+ c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera'
43
+ c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa'
44
+ c.timezone 'Antarctica/Troll', -259241, 3600, 507, 200, 'Troll'
45
+ c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok'
46
46
  c.timezone 'Pacific/Auckland', -553, 15, 5243, 30, 'New Zealand time'
47
47
  end
48
48
  country 'AR', 'Argentina' do |c|
49
49
  c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)'
50
- c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'most locations (CB, CC, CN, ER, FM, MN, SE, SF)'
51
- c.timezone 'America/Argentina/Salta', -1487, 60, -785, 12, '(SA, LP, NQ, RN)'
50
+ c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)'
51
+ c.timezone 'America/Argentina/Salta', -1487, 60, -785, 12, 'Salta (SA, LP, NQ, RN)'
52
52
  c.timezone 'America/Argentina/Jujuy', -1451, 60, -653, 10, 'Jujuy (JY)'
53
53
  c.timezone 'America/Argentina/Tucuman', -1609, 60, -3913, 60, 'Tucumán (TM)'
54
- c.timezone 'America/Argentina/Catamarca', -427, 15, -3947, 60, 'Catamarca (CT), Chubut (CH)'
54
+ c.timezone 'America/Argentina/Catamarca', -427, 15, -3947, 60, 'Catamarca (CT); Chubut (CH)'
55
55
  c.timezone 'America/Argentina/La_Rioja', -883, 30, -1337, 20, 'La Rioja (LR)'
56
56
  c.timezone 'America/Argentina/San_Juan', -473, 15, -4111, 60, 'San Juan (SJ)'
57
57
  c.timezone 'America/Argentina/Mendoza', -1973, 60, -4129, 60, 'Mendoza (MZ)'
@@ -68,22 +68,22 @@ module TZInfo
68
68
  country 'AU', 'Australia' do |c|
69
69
  c.timezone 'Australia/Lord_Howe', -631, 20, 1909, 12, 'Lord Howe Island'
70
70
  c.timezone 'Antarctica/Macquarie', -109, 2, 3179, 20, 'Macquarie Island'
71
- c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania - most locations'
72
- c.timezone 'Australia/Currie', -599, 15, 2158, 15, 'Tasmania - King Island'
71
+ c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania (most areas)'
72
+ c.timezone 'Australia/Currie', -599, 15, 2158, 15, 'Tasmania (King Island)'
73
73
  c.timezone 'Australia/Melbourne', -2269, 60, 4349, 30, 'Victoria'
74
- c.timezone 'Australia/Sydney', -508, 15, 9073, 60, 'New South Wales - most locations'
75
- c.timezone 'Australia/Broken_Hill', -639, 20, 2829, 20, 'New South Wales - Yancowinna'
76
- c.timezone 'Australia/Brisbane', -412, 15, 4591, 30, 'Queensland - most locations'
77
- c.timezone 'Australia/Lindeman', -304, 15, 149, 1, 'Queensland - Holiday Islands'
74
+ c.timezone 'Australia/Sydney', -508, 15, 9073, 60, 'New South Wales (most areas)'
75
+ c.timezone 'Australia/Broken_Hill', -639, 20, 2829, 20, 'New South Wales (Yancowinna)'
76
+ c.timezone 'Australia/Brisbane', -412, 15, 4591, 30, 'Queensland (most areas)'
77
+ c.timezone 'Australia/Lindeman', -304, 15, 149, 1, 'Queensland (Whitsunday Islands)'
78
78
  c.timezone 'Australia/Adelaide', -419, 12, 1663, 12, 'South Australia'
79
79
  c.timezone 'Australia/Darwin', -187, 15, 785, 6, 'Northern Territory'
80
- c.timezone 'Australia/Perth', -639, 20, 2317, 20, 'Western Australia - most locations'
81
- c.timezone 'Australia/Eucla', -1903, 60, 1933, 15, 'Western Australia - Eucla area'
80
+ c.timezone 'Australia/Perth', -639, 20, 2317, 20, 'Western Australia (most areas)'
81
+ c.timezone 'Australia/Eucla', -1903, 60, 1933, 15, 'Western Australia (Eucla)'
82
82
  end
83
83
  country 'AW', 'Aruba' do |c|
84
84
  c.timezone 'America/Curacao', 731, 60, -69, 1
85
85
  end
86
- country 'AX', 'Aaland Islands' do |c|
86
+ country 'AX', 'Åland Islands' do |c|
87
87
  c.timezone 'Europe/Helsinki', 361, 6, 749, 30
88
88
  end
89
89
  country 'AZ', 'Azerbaijan' do |c|
@@ -111,10 +111,10 @@ module TZInfo
111
111
  c.timezone 'Asia/Qatar', 1517, 60, 773, 15
112
112
  end
113
113
  country 'BI', 'Burundi' do |c|
114
- c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
114
+ c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
115
115
  end
116
116
  country 'BJ', 'Benin' do |c|
117
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
117
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
118
118
  end
119
119
  country 'BL', 'St Barthelemy' do |c|
120
120
  c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
@@ -128,25 +128,25 @@ module TZInfo
128
128
  country 'BO', 'Bolivia' do |c|
129
129
  c.timezone 'America/La_Paz', -33, 2, -1363, 20
130
130
  end
131
- country 'BQ', 'Caribbean Netherlands' do |c|
131
+ country 'BQ', 'Caribbean NL' do |c|
132
132
  c.timezone 'America/Curacao', 731, 60, -69, 1
133
133
  end
134
134
  country 'BR', 'Brazil' do |c|
135
135
  c.timezone 'America/Noronha', -77, 20, -389, 12, 'Atlantic islands'
136
- c.timezone 'America/Belem', -29, 20, -2909, 60, 'Amapá, E Pará'
137
- c.timezone 'America/Fortaleza', -223, 60, -77, 2, 'NE Brazil (MA, PI, CE, RN, PB)'
136
+ c.timezone 'America/Belem', -29, 20, -2909, 60, 'Pará (east); Amapá'
137
+ c.timezone 'America/Fortaleza', -223, 60, -77, 2, 'Brazil (northeast: MA, PI, CE, RN, PB)'
138
138
  c.timezone 'America/Recife', -161, 20, -349, 10, 'Pernambuco'
139
139
  c.timezone 'America/Araguaina', -36, 5, -241, 5, 'Tocantins'
140
140
  c.timezone 'America/Maceio', -29, 3, -2143, 60, 'Alagoas, Sergipe'
141
141
  c.timezone 'America/Bahia', -779, 60, -2311, 60, 'Bahia'
142
- c.timezone 'America/Sao_Paulo', -353, 15, -2797, 60, 'S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)'
142
+ c.timezone 'America/Sao_Paulo', -353, 15, -2797, 60, 'Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)'
143
143
  c.timezone 'America/Campo_Grande', -409, 20, -3277, 60, 'Mato Grosso do Sul'
144
144
  c.timezone 'America/Cuiaba', -187, 12, -673, 12, 'Mato Grosso'
145
- c.timezone 'America/Santarem', -73, 30, -823, 15, 'W Pará'
145
+ c.timezone 'America/Santarem', -73, 30, -823, 15, 'Pará (west)'
146
146
  c.timezone 'America/Porto_Velho', -263, 30, -639, 10, 'Rondônia'
147
147
  c.timezone 'America/Boa_Vista', 169, 60, -182, 3, 'Roraima'
148
- c.timezone 'America/Manaus', -47, 15, -3601, 60, 'E Amazonas'
149
- c.timezone 'America/Eirunepe', -20, 3, -1048, 15, 'W Amazonas'
148
+ c.timezone 'America/Manaus', -47, 15, -3601, 60, 'Amazonas (east)'
149
+ c.timezone 'America/Eirunepe', -20, 3, -1048, 15, 'Amazonas (west)'
150
150
  c.timezone 'America/Rio_Branco', -299, 30, -339, 5, 'Acre'
151
151
  end
152
152
  country 'BS', 'Bahamas' do |c|
@@ -157,7 +157,7 @@ module TZInfo
157
157
  end
158
158
  country 'BV', 'Bouvet Island'
159
159
  country 'BW', 'Botswana' do |c|
160
- c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
160
+ c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
161
161
  end
162
162
  country 'BY', 'Belarus' do |c|
163
163
  c.timezone 'Europe/Minsk', 539, 10, 827, 30
@@ -166,62 +166,64 @@ module TZInfo
166
166
  c.timezone 'America/Belize', 35, 2, -441, 5
167
167
  end
168
168
  country 'CA', 'Canada' do |c|
169
- c.timezone 'America/St_Johns', 1427, 30, -3163, 60, 'Newfoundland Time, including SE Labrador'
170
- c.timezone 'America/Halifax', 893, 20, -318, 5, 'Atlantic Time - Nova Scotia (most places), PEI'
171
- c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971'
172
- c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic Time - New Brunswick'
173
- c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic Time - Labrador - most locations'
174
- c.timezone 'America/Blanc-Sablon', 617, 12, -3427, 60, 'Atlantic Standard Time - Quebec - Lower North Shore'
175
- c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern Time - Ontario & Quebec - most locations'
176
- c.timezone 'America/Nipigon', 2941, 60, -1324, 15, 'Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973'
177
- c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern Time - Thunder Bay, Ontario'
178
- c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern Time - east Nunavut - most locations'
179
- c.timezone 'America/Pangnirtung', 992, 15, -986, 15, 'Eastern Time - Pangnirtung, Nunavut'
180
- c.timezone 'America/Resolute', 33613, 450, -22759, 240, 'Central Time - Resolute, Nunavut'
181
- c.timezone 'America/Atikokan', 175531, 3600, -54973, 600, 'Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut'
182
- c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central Time - central Nunavut'
183
- c.timezone 'America/Winnipeg', 2993, 60, -1943, 20, 'Central Time - Manitoba & west Ontario'
184
- c.timezone 'America/Rainy_River', 2923, 60, -2837, 30, 'Central Time - Rainy River & Fort Frances, Ontario'
185
- c.timezone 'America/Regina', 252, 5, -2093, 20, 'Central Standard Time - Saskatchewan - most locations'
186
- c.timezone 'America/Swift_Current', 3017, 60, -647, 6, 'Central Standard Time - Saskatchewan - midwest'
187
- c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain Time - Alberta, east British Columbia & west Saskatchewan'
188
- c.timezone 'America/Cambridge_Bay', 24881, 360, -37819, 360, 'Mountain Time - west Nunavut'
189
- c.timezone 'America/Yellowknife', 1249, 20, -2287, 20, 'Mountain Time - central Northwest Territories'
190
- c.timezone 'America/Inuvik', 246059, 3600, -8023, 60, 'Mountain Time - west Northwest Territories'
191
- c.timezone 'America/Creston', 491, 10, -6991, 60, 'Mountain Standard Time - Creston, British Columbia'
192
- c.timezone 'America/Dawson_Creek', 1793, 30, -3607, 30, 'Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia'
193
- c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific Time - west British Columbia'
194
- c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific Time - south Yukon'
195
- c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific Time - north Yukon'
169
+ c.timezone 'America/St_Johns', 1427, 30, -3163, 60, 'Newfoundland; Labrador (southeast)'
170
+ c.timezone 'America/Halifax', 893, 20, -318, 5, 'Atlantic - NS (most areas); PE'
171
+ c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic - NS (Cape Breton)'
172
+ c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic - New Brunswick'
173
+ c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic - Labrador (most areas)'
174
+ c.timezone 'America/Blanc-Sablon', 617, 12, -3427, 60, 'AST - QC (Lower North Shore)'
175
+ c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas)'
176
+ c.timezone 'America/Nipigon', 2941, 60, -1324, 15, 'Eastern - ON, QC (no DST 1967-73)'
177
+ c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern - ON (Thunder Bay)'
178
+ c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern - NU (most east areas)'
179
+ c.timezone 'America/Pangnirtung', 992, 15, -986, 15, 'Eastern - NU (Pangnirtung)'
180
+ c.timezone 'America/Atikokan', 175531, 3600, -54973, 600, 'EST - ON (Atikokan); NU (Coral H)'
181
+ c.timezone 'America/Winnipeg', 2993, 60, -1943, 20, 'Central - ON (west); Manitoba'
182
+ c.timezone 'America/Rainy_River', 2923, 60, -2837, 30, 'Central - ON (Rainy R, Ft Frances)'
183
+ c.timezone 'America/Resolute', 33613, 450, -22759, 240, 'Central - NU (Resolute)'
184
+ c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central - NU (central)'
185
+ c.timezone 'America/Regina', 252, 5, -2093, 20, 'CST - SK (most areas)'
186
+ c.timezone 'America/Swift_Current', 3017, 60, -647, 6, 'CST - SK (midwest)'
187
+ c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain - AB; BC (E); SK (W)'
188
+ c.timezone 'America/Cambridge_Bay', 24881, 360, -37819, 360, 'Mountain - NU (west)'
189
+ c.timezone 'America/Yellowknife', 1249, 20, -2287, 20, 'Mountain - NT (central)'
190
+ c.timezone 'America/Inuvik', 246059, 3600, -8023, 60, 'Mountain - NT (west)'
191
+ c.timezone 'America/Creston', 491, 10, -6991, 60, 'MST - BC (Creston)'
192
+ c.timezone 'America/Dawson_Creek', 1793, 30, -3607, 30, 'MST - BC (Dawson Cr, Ft St John)'
193
+ c.timezone 'America/Fort_Nelson', 294, 5, -1227, 10, 'MST - BC (Ft Nelson)'
194
+ c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific - BC (most areas)'
195
+ c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific - Yukon (east)'
196
+ c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific - Yukon (west)'
196
197
  end
197
198
  country 'CC', 'Cocos (Keeling) Islands' do |c|
198
199
  c.timezone 'Indian/Cocos', -73, 6, 1163, 12
199
200
  end
200
201
  country 'CD', 'Congo (Dem. Rep.)' do |c|
201
- c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
202
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
202
+ c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
203
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
203
204
  end
204
205
  country 'CF', 'Central African Rep.' do |c|
205
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
206
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
206
207
  end
207
208
  country 'CG', 'Congo (Rep.)' do |c|
208
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
209
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
209
210
  end
210
211
  country 'CH', 'Switzerland' do |c|
211
212
  c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time'
212
213
  end
213
- country 'CI', 'Cote d\'Ivoire' do |c|
214
+ country 'CI', 'Côte d\'Ivoire' do |c|
214
215
  c.timezone 'Africa/Abidjan', 319, 60, -121, 30
215
216
  end
216
217
  country 'CK', 'Cook Islands' do |c|
217
218
  c.timezone 'Pacific/Rarotonga', -637, 30, -4793, 30
218
219
  end
219
220
  country 'CL', 'Chile' do |c|
220
- c.timezone 'America/Santiago', -669, 20, -212, 3, 'most locations'
221
+ c.timezone 'America/Santiago', -669, 20, -212, 3, 'Chile (most areas)'
222
+ c.timezone 'America/Punta_Arenas', -1063, 20, -851, 12, 'Region of Magallanes'
221
223
  c.timezone 'Pacific/Easter', -543, 20, -3283, 30, 'Easter Island'
222
224
  end
223
225
  country 'CM', 'Cameroon' do |c|
224
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
226
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
225
227
  end
226
228
  country 'CN', 'China' do |c|
227
229
  c.timezone 'Asia/Shanghai', 937, 30, 1822, 15, 'Beijing Time'
@@ -239,20 +241,21 @@ module TZInfo
239
241
  country 'CV', 'Cape Verde' do |c|
240
242
  c.timezone 'Atlantic/Cape_Verde', 179, 12, -1411, 60
241
243
  end
242
- country 'CW', 'Curacao' do |c|
244
+ country 'CW', 'Curaçao' do |c|
243
245
  c.timezone 'America/Curacao', 731, 60, -69, 1
244
246
  end
245
247
  country 'CX', 'Christmas Island' do |c|
246
248
  c.timezone 'Indian/Christmas', -125, 12, 6343, 60
247
249
  end
248
250
  country 'CY', 'Cyprus' do |c|
249
- c.timezone 'Asia/Nicosia', 211, 6, 1001, 30
251
+ c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'Cyprus (most areas)'
252
+ c.timezone 'Asia/Famagusta', 2107, 60, 679, 20, 'Northern Cyprus'
250
253
  end
251
254
  country 'CZ', 'Czech Republic' do |c|
252
255
  c.timezone 'Europe/Prague', 601, 12, 433, 30
253
256
  end
254
257
  country 'DE', 'Germany' do |c|
255
- c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Berlin time'
258
+ c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas)'
256
259
  c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time'
257
260
  end
258
261
  country 'DJ', 'Djibouti' do |c|
@@ -271,7 +274,7 @@ module TZInfo
271
274
  c.timezone 'Africa/Algiers', 2207, 60, 61, 20
272
275
  end
273
276
  country 'EC', 'Ecuador' do |c|
274
- c.timezone 'America/Guayaquil', -13, 6, -479, 6, 'mainland'
277
+ c.timezone 'America/Guayaquil', -13, 6, -479, 6, 'Ecuador (mainland)'
275
278
  c.timezone 'Pacific/Galapagos', -9, 10, -448, 5, 'Galápagos Islands'
276
279
  end
277
280
  country 'EE', 'Estonia' do |c|
@@ -287,8 +290,8 @@ module TZInfo
287
290
  c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
288
291
  end
289
292
  country 'ES', 'Spain' do |c|
290
- c.timezone 'Europe/Madrid', 202, 5, -221, 60, 'mainland'
291
- c.timezone 'Africa/Ceuta', 2153, 60, -319, 60, 'Ceuta & Melilla'
293
+ c.timezone 'Europe/Madrid', 202, 5, -221, 60, 'Spain (mainland)'
294
+ c.timezone 'Africa/Ceuta', 2153, 60, -319, 60, 'Ceuta, Melilla'
292
295
  c.timezone 'Atlantic/Canary', 281, 10, -77, 5, 'Canary Islands'
293
296
  end
294
297
  country 'ET', 'Ethiopia' do |c|
@@ -304,8 +307,8 @@ module TZInfo
304
307
  c.timezone 'Atlantic/Stanley', -517, 10, -1157, 20
305
308
  end
306
309
  country 'FM', 'Micronesia' do |c|
307
- c.timezone 'Pacific/Chuuk', 89, 12, 9107, 60, 'Chuuk (Truk) and Yap'
308
- c.timezone 'Pacific/Pohnpei', 209, 30, 9493, 60, 'Pohnpei (Ponape)'
310
+ c.timezone 'Pacific/Chuuk', 89, 12, 9107, 60, 'Chuuk/Truk, Yap'
311
+ c.timezone 'Pacific/Pohnpei', 209, 30, 9493, 60, 'Pohnpei/Ponape'
309
312
  c.timezone 'Pacific/Kosrae', 319, 60, 9779, 60, 'Kosrae'
310
313
  end
311
314
  country 'FO', 'Faroe Islands' do |c|
@@ -315,7 +318,7 @@ module TZInfo
315
318
  c.timezone 'Europe/Paris', 733, 15, 7, 3
316
319
  end
317
320
  country 'GA', 'Gabon' do |c|
318
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
321
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
319
322
  end
320
323
  country 'GB', 'Britain (UK)' do |c|
321
324
  c.timezone 'Europe/London', 6181, 120, -451, 3600
@@ -339,10 +342,10 @@ module TZInfo
339
342
  c.timezone 'Europe/Gibraltar', 542, 15, -107, 20
340
343
  end
341
344
  country 'GL', 'Greenland' do |c|
342
- c.timezone 'America/Godthab', 3851, 60, -776, 15, 'most locations'
343
- c.timezone 'America/Danmarkshavn', 2303, 30, -56, 3, 'east coast, north of Scoresbysund'
344
- c.timezone 'America/Scoresbysund', 4229, 60, -659, 30, 'Scoresbysund / Ittoqqortoormiit'
345
- c.timezone 'America/Thule', 2297, 30, -4127, 60, 'Thule / Pituffik'
345
+ c.timezone 'America/Nuuk', 3851, 60, -776, 15, 'Greenland (most areas)'
346
+ c.timezone 'America/Danmarkshavn', 2303, 30, -56, 3, 'National Park (east coast)'
347
+ c.timezone 'America/Scoresbysund', 4229, 60, -659, 30, 'Scoresbysund/Ittoqqortoormiit'
348
+ c.timezone 'America/Thule', 2297, 30, -4127, 60, 'Thule/Pituffik'
346
349
  end
347
350
  country 'GM', 'Gambia' do |c|
348
351
  c.timezone 'Africa/Abidjan', 319, 60, -121, 30
@@ -354,7 +357,7 @@ module TZInfo
354
357
  c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
355
358
  end
356
359
  country 'GQ', 'Equatorial Guinea' do |c|
357
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
360
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
358
361
  end
359
362
  country 'GR', 'Greece' do |c|
360
363
  c.timezone 'Europe/Athens', 1139, 30, 1423, 60
@@ -391,10 +394,10 @@ module TZInfo
391
394
  c.timezone 'Europe/Budapest', 95, 2, 229, 12
392
395
  end
393
396
  country 'ID', 'Indonesia' do |c|
394
- c.timezone 'Asia/Jakarta', -37, 6, 534, 5, 'Java & Sumatra'
395
- c.timezone 'Asia/Pontianak', -1, 30, 328, 3, 'west & central Borneo'
396
- c.timezone 'Asia/Makassar', -307, 60, 597, 5, 'east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor'
397
- c.timezone 'Asia/Jayapura', -38, 15, 1407, 10, 'west New Guinea (Irian Jaya) & Malukus (Moluccas)'
397
+ c.timezone 'Asia/Jakarta', -37, 6, 534, 5, 'Java, Sumatra'
398
+ c.timezone 'Asia/Pontianak', -1, 30, 328, 3, 'Borneo (west, central)'
399
+ c.timezone 'Asia/Makassar', -307, 60, 597, 5, 'Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)'
400
+ c.timezone 'Asia/Jayapura', -38, 15, 1407, 10, 'New Guinea (West Papua / Irian Jaya); Malukus/Moluccas'
398
401
  end
399
402
  country 'IE', 'Ireland' do |c|
400
403
  c.timezone 'Europe/Dublin', 160, 3, -25, 4
@@ -442,7 +445,7 @@ module TZInfo
442
445
  c.timezone 'Asia/Bishkek', 429, 10, 373, 5
443
446
  end
444
447
  country 'KH', 'Cambodia' do |c|
445
- c.timezone 'Asia/Bangkok', 55, 4, 6031, 60
448
+ c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
446
449
  end
447
450
  country 'KI', 'Kiribati' do |c|
448
451
  c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilbert Islands'
@@ -468,14 +471,16 @@ module TZInfo
468
471
  c.timezone 'America/Panama', 269, 30, -1193, 15
469
472
  end
470
473
  country 'KZ', 'Kazakhstan' do |c|
471
- c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'most locations'
472
- c.timezone 'Asia/Qyzylorda', 224, 5, 982, 15, 'Qyzylorda (Kyzylorda, Kzyl-Orda)'
473
- c.timezone 'Asia/Aqtobe', 3017, 60, 343, 6, 'Aqtobe (Aktobe)'
474
- c.timezone 'Asia/Aqtau', 2671, 60, 754, 15, 'Atyrau (Atirau, Gur\'yev), Mangghystau (Mankistau)'
474
+ c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'Kazakhstan (most areas)'
475
+ c.timezone 'Asia/Qyzylorda', 224, 5, 982, 15, 'Qyzylorda/Kyzylorda/Kzyl-Orda'
476
+ c.timezone 'Asia/Qostanay', 266, 5, 3817, 60, 'Qostanay/Kostanay/Kustanay'
477
+ c.timezone 'Asia/Aqtobe', 3017, 60, 343, 6, 'Aqtöbe/Aktobe'
478
+ c.timezone 'Asia/Aqtau', 2671, 60, 754, 15, 'Mangghystaū/Mankistau'
479
+ c.timezone 'Asia/Atyrau', 2827, 60, 779, 15, 'Atyraū/Atirau/Gur\'yev'
475
480
  c.timezone 'Asia/Oral', 3073, 60, 1027, 20, 'West Kazakhstan'
476
481
  end
477
482
  country 'LA', 'Laos' do |c|
478
- c.timezone 'Asia/Bangkok', 55, 4, 6031, 60
483
+ c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
479
484
  end
480
485
  country 'LB', 'Lebanon' do |c|
481
486
  c.timezone 'Asia/Beirut', 2033, 60, 71, 2
@@ -519,32 +524,32 @@ module TZInfo
519
524
  country 'ME', 'Montenegro' do |c|
520
525
  c.timezone 'Europe/Belgrade', 269, 6, 41, 2
521
526
  end
522
- country 'MF', 'St Martin (French part)' do |c|
527
+ country 'MF', 'St Martin (French)' do |c|
523
528
  c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
524
529
  end
525
530
  country 'MG', 'Madagascar' do |c|
526
531
  c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
527
532
  end
528
533
  country 'MH', 'Marshall Islands' do |c|
529
- c.timezone 'Pacific/Majuro', 143, 20, 856, 5, 'most locations'
534
+ c.timezone 'Pacific/Majuro', 143, 20, 856, 5, 'Marshall Islands (most areas)'
530
535
  c.timezone 'Pacific/Kwajalein', 109, 12, 502, 3, 'Kwajalein'
531
536
  end
532
- country 'MK', 'Macedonia' do |c|
537
+ country 'MK', 'North Macedonia' do |c|
533
538
  c.timezone 'Europe/Belgrade', 269, 6, 41, 2
534
539
  end
535
540
  country 'ML', 'Mali' do |c|
536
541
  c.timezone 'Africa/Abidjan', 319, 60, -121, 30
537
542
  end
538
543
  country 'MM', 'Myanmar (Burma)' do |c|
539
- c.timezone 'Asia/Rangoon', 1007, 60, 577, 6
544
+ c.timezone 'Asia/Yangon', 1007, 60, 577, 6
540
545
  end
541
546
  country 'MN', 'Mongolia' do |c|
542
- c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'most locations'
547
+ c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'Mongolia (most areas)'
543
548
  c.timezone 'Asia/Hovd', 2881, 60, 1833, 20, 'Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan'
544
549
  c.timezone 'Asia/Choibalsan', 721, 15, 229, 2, 'Dornod, Sükhbaatar'
545
550
  end
546
551
  country 'MO', 'Macau' do |c|
547
- c.timezone 'Asia/Macau', 667, 30, 1363, 12
552
+ c.timezone 'Asia/Macau', 7991, 360, 2725, 24
548
553
  end
549
554
  country 'MP', 'Northern Mariana Islands' do |c|
550
555
  c.timezone 'Pacific/Guam', 202, 15, 579, 4
@@ -568,28 +573,27 @@ module TZInfo
568
573
  c.timezone 'Indian/Maldives', 25, 6, 147, 2
569
574
  end
570
575
  country 'MW', 'Malawi' do |c|
571
- c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
576
+ c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
572
577
  end
573
578
  country 'MX', 'Mexico' do |c|
574
- c.timezone 'America/Mexico_City', 97, 5, -1983, 20, 'Central Time - most locations'
575
- c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Central Time - Quintana Roo'
579
+ c.timezone 'America/Mexico_City', 97, 5, -1983, 20, 'Central Time'
580
+ c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Eastern Standard Time - Quintana Roo'
576
581
  c.timezone 'America/Merida', 629, 30, -5377, 60, 'Central Time - Campeche, Yucatán'
577
- c.timezone 'America/Monterrey', 77, 3, -6019, 60, 'Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border'
578
- c.timezone 'America/Matamoros', 155, 6, -195, 2, 'US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border'
579
- c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Mountain Time - S Baja, Nayarit, Sinaloa'
580
- c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Mexican Mountain Time - Chihuahua away from US border'
581
- c.timezone 'America/Ojinaga', 887, 30, -1253, 12, 'US Mountain Time - Chihuahua near US border'
582
+ c.timezone 'America/Monterrey', 77, 3, -6019, 60, 'Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)'
583
+ c.timezone 'America/Matamoros', 155, 6, -195, 2, 'Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)'
584
+ c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Mountain Time - Baja California Sur, Nayarit, Sinaloa'
585
+ c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Mountain Time - Chihuahua (most areas)'
586
+ c.timezone 'America/Ojinaga', 887, 30, -1253, 12, 'Mountain Time US - Chihuahua (US border)'
582
587
  c.timezone 'America/Hermosillo', 436, 15, -3329, 30, 'Mountain Standard Time - Sonora'
583
- c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'US Pacific Time - Baja California near US border'
584
- c.timezone 'America/Santa_Isabel', 303, 10, -1723, 15, 'Mexican Pacific Time - Baja California away from US border'
585
- c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Mexican Central Time - Bahía de Banderas'
588
+ c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'Pacific Time US - Baja California'
589
+ c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Central Time - Bahía de Banderas'
586
590
  end
587
591
  country 'MY', 'Malaysia' do |c|
588
- c.timezone 'Asia/Kuala_Lumpur', 19, 6, 1017, 10, 'peninsular Malaysia'
589
- c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah & Sarawak'
592
+ c.timezone 'Asia/Kuala_Lumpur', 19, 6, 1017, 10, 'Malaysia (peninsula)'
593
+ c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak'
590
594
  end
591
595
  country 'MZ', 'Mozambique' do |c|
592
- c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
596
+ c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
593
597
  end
594
598
  country 'NA', 'Namibia' do |c|
595
599
  c.timezone 'Africa/Windhoek', -677, 30, 171, 10
@@ -598,13 +602,13 @@ module TZInfo
598
602
  c.timezone 'Pacific/Noumea', -334, 15, 3329, 20
599
603
  end
600
604
  country 'NE', 'Niger' do |c|
601
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
605
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
602
606
  end
603
607
  country 'NF', 'Norfolk Island' do |c|
604
608
  c.timezone 'Pacific/Norfolk', -581, 20, 5039, 30
605
609
  end
606
610
  country 'NG', 'Nigeria' do |c|
607
- c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time (UTC+1)'
611
+ c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time'
608
612
  end
609
613
  country 'NI', 'Nicaragua' do |c|
610
614
  c.timezone 'America/Managua', 243, 20, -5177, 60
@@ -643,7 +647,8 @@ module TZInfo
643
647
  c.timezone 'Pacific/Gambier', -347, 15, -2699, 20, 'Gambier Islands'
644
648
  end
645
649
  country 'PG', 'Papua New Guinea' do |c|
646
- c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6
650
+ c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas)'
651
+ c.timezone 'Pacific/Bougainville', -373, 60, 4667, 30, 'Bougainville'
647
652
  end
648
653
  country 'PH', 'Philippines' do |c|
649
654
  c.timezone 'Asia/Manila', 175, 12, 121, 1
@@ -668,7 +673,7 @@ module TZInfo
668
673
  c.timezone 'Asia/Hebron', 473, 15, 7019, 200, 'West Bank'
669
674
  end
670
675
  country 'PT', 'Portugal' do |c|
671
- c.timezone 'Europe/Lisbon', 2323, 60, -137, 15, 'mainland'
676
+ c.timezone 'Europe/Lisbon', 2323, 60, -137, 15, 'Portugal (mainland)'
672
677
  c.timezone 'Atlantic/Madeira', 979, 30, -169, 10, 'Madeira Islands'
673
678
  c.timezone 'Atlantic/Azores', 566, 15, -77, 3, 'Azores'
674
679
  end
@@ -681,8 +686,8 @@ module TZInfo
681
686
  country 'QA', 'Qatar' do |c|
682
687
  c.timezone 'Asia/Qatar', 1517, 60, 773, 15
683
688
  end
684
- country 'RE', 'Reunion' do |c|
685
- c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet Is, Scattered Is'
689
+ country 'RE', 'Réunion' do |c|
690
+ c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet, Scattered Islands'
686
691
  end
687
692
  country 'RO', 'Romania' do |c|
688
693
  c.timezone 'Europe/Bucharest', 1333, 30, 261, 10
@@ -691,30 +696,36 @@ module TZInfo
691
696
  c.timezone 'Europe/Belgrade', 269, 6, 41, 2
692
697
  end
693
698
  country 'RU', 'Russia' do |c|
694
- c.timezone 'Europe/Kaliningrad', 3283, 60, 41, 2, 'Moscow-01 - Kaliningrad'
695
- c.timezone 'Europe/Moscow', 66907, 1200, 8464, 225, 'Moscow+00 - west Russia'
696
- c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Moscow+00 - Crimea'
697
- c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'Moscow+00 - Caspian Sea'
698
- c.timezone 'Europe/Samara', 266, 5, 1003, 20, 'Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia'
699
- c.timezone 'Asia/Yekaterinburg', 1137, 20, 303, 5, 'Moscow+02 - Urals'
700
- c.timezone 'Asia/Omsk', 55, 1, 367, 5, 'Moscow+03 - west Siberia'
701
- c.timezone 'Asia/Novosibirsk', 1651, 30, 995, 12, 'Moscow+03 - Novosibirsk'
702
- c.timezone 'Asia/Novokuznetsk', 215, 4, 5227, 60, 'Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo'
703
- c.timezone 'Asia/Krasnoyarsk', 3361, 60, 557, 6, 'Moscow+04 - Yenisei River'
704
- c.timezone 'Asia/Irkutsk', 784, 15, 313, 3, 'Moscow+05 - Lake Baikal'
705
- c.timezone 'Asia/Chita', 1041, 20, 1702, 15, 'Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky'
706
- c.timezone 'Asia/Yakutsk', 62, 1, 389, 3, 'Moscow+06 - Lena River'
707
- c.timezone 'Asia/Khandyga', 225563, 3600, 243997, 1800, 'Moscow+06 - Tomponsky, Ust-Maysky'
708
- c.timezone 'Asia/Vladivostok', 259, 6, 1979, 15, 'Moscow+07 - Amur River'
709
- c.timezone 'Asia/Sakhalin', 1409, 30, 1427, 10, 'Moscow+07 - Sakhalin Island'
710
- c.timezone 'Asia/Ust-Nera', 232417, 3600, 10742, 75, 'Moscow+07 - Oymyakonsky'
711
- c.timezone 'Asia/Magadan', 1787, 30, 754, 5, 'Moscow+08 (Moscow+07 after 2014-10-26) - Magadan'
712
- c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'Moscow+08 - E Sakha, N Kuril Is'
713
- c.timezone 'Asia/Kamchatka', 3181, 60, 3173, 20, 'Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka'
714
- c.timezone 'Asia/Anadyr', 259, 4, 10649, 60, 'Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea'
699
+ c.timezone 'Europe/Kaliningrad', 3283, 60, 41, 2, 'MSK-01 - Kaliningrad'
700
+ c.timezone 'Europe/Moscow', 66907, 1200, 8464, 225, 'MSK+00 - Moscow area'
701
+ c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea'
702
+ c.timezone 'Europe/Kirov', 293, 5, 993, 20, 'MSK+00 - Kirov'
703
+ c.timezone 'Europe/Astrakhan', 927, 20, 961, 20, 'MSK+01 - Astrakhan'
704
+ c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'MSK+01 - Volgograd'
705
+ c.timezone 'Europe/Saratov', 1547, 30, 1381, 30, 'MSK+01 - Saratov'
706
+ c.timezone 'Europe/Ulyanovsk', 163, 3, 242, 5, 'MSK+01 - Ulyanovsk'
707
+ c.timezone 'Europe/Samara', 266, 5, 1003, 20, 'MSK+01 - Samara, Udmurtia'
708
+ c.timezone 'Asia/Yekaterinburg', 1137, 20, 303, 5, 'MSK+02 - Urals'
709
+ c.timezone 'Asia/Omsk', 55, 1, 367, 5, 'MSK+03 - Omsk'
710
+ c.timezone 'Asia/Novosibirsk', 1651, 30, 995, 12, 'MSK+04 - Novosibirsk'
711
+ c.timezone 'Asia/Barnaul', 1601, 30, 335, 4, 'MSK+04 - Altai'
712
+ c.timezone 'Asia/Tomsk', 113, 2, 2549, 30, 'MSK+04 - Tomsk'
713
+ c.timezone 'Asia/Novokuznetsk', 215, 4, 5227, 60, 'MSK+04 - Kemerovo'
714
+ c.timezone 'Asia/Krasnoyarsk', 3361, 60, 557, 6, 'MSK+04 - Krasnoyarsk area'
715
+ c.timezone 'Asia/Irkutsk', 784, 15, 313, 3, 'MSK+05 - Irkutsk, Buryatia'
716
+ c.timezone 'Asia/Chita', 1041, 20, 1702, 15, 'MSK+06 - Zabaykalsky'
717
+ c.timezone 'Asia/Yakutsk', 62, 1, 389, 3, 'MSK+06 - Lena River'
718
+ c.timezone 'Asia/Khandyga', 225563, 3600, 243997, 1800, 'MSK+06 - Tomponsky, Ust-Maysky'
719
+ c.timezone 'Asia/Vladivostok', 259, 6, 1979, 15, 'MSK+07 - Amur River'
720
+ c.timezone 'Asia/Ust-Nera', 232417, 3600, 10742, 75, 'MSK+07 - Oymyakonsky'
721
+ c.timezone 'Asia/Magadan', 1787, 30, 754, 5, 'MSK+08 - Magadan'
722
+ c.timezone 'Asia/Sakhalin', 1409, 30, 1427, 10, 'MSK+08 - Sakhalin Island'
723
+ c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'MSK+08 - Sakha (E); North Kuril Is'
724
+ c.timezone 'Asia/Kamchatka', 3181, 60, 3173, 20, 'MSK+09 - Kamchatka'
725
+ c.timezone 'Asia/Anadyr', 259, 4, 10649, 60, 'MSK+09 - Bering Sea'
715
726
  end
716
727
  country 'RW', 'Rwanda' do |c|
717
- c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
728
+ c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
718
729
  end
719
730
  country 'SA', 'Saudi Arabia' do |c|
720
731
  c.timezone 'Asia/Riyadh', 739, 30, 2803, 60
@@ -762,21 +773,21 @@ module TZInfo
762
773
  c.timezone 'America/Paramaribo', 35, 6, -331, 6
763
774
  end
764
775
  country 'SS', 'South Sudan' do |c|
765
- c.timezone 'Africa/Khartoum', 78, 5, 488, 15
776
+ c.timezone 'Africa/Juba', 97, 20, 1897, 60
766
777
  end
767
778
  country 'ST', 'Sao Tome & Principe' do |c|
768
- c.timezone 'Africa/Abidjan', 319, 60, -121, 30
779
+ c.timezone 'Africa/Sao_Tome', 1, 3, 101, 15
769
780
  end
770
781
  country 'SV', 'El Salvador' do |c|
771
782
  c.timezone 'America/El_Salvador', 137, 10, -446, 5
772
783
  end
773
- country 'SX', 'St Maarten (Dutch part)' do |c|
784
+ country 'SX', 'St Maarten (Dutch)' do |c|
774
785
  c.timezone 'America/Curacao', 731, 60, -69, 1
775
786
  end
776
787
  country 'SY', 'Syria' do |c|
777
788
  c.timezone 'Asia/Damascus', 67, 2, 363, 10
778
789
  end
779
- country 'SZ', 'Swaziland' do |c|
790
+ country 'SZ', 'Eswatini (Swaziland)' do |c|
780
791
  c.timezone 'Africa/Johannesburg', -105, 4, 28, 1
781
792
  end
782
793
  country 'TC', 'Turks & Caicos Is' do |c|
@@ -786,14 +797,14 @@ module TZInfo
786
797
  c.timezone 'Africa/Ndjamena', 727, 60, 301, 20
787
798
  end
788
799
  country 'TF', 'French Southern & Antarctic Lands' do |c|
789
- c.timezone 'Indian/Kerguelen', -17767, 360, 28087, 400, 'Kerguelen, St Paul I, Amsterdam I'
790
- c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet Is, Scattered Is'
800
+ c.timezone 'Indian/Kerguelen', -17767, 360, 28087, 400, 'Kerguelen, St Paul Island, Amsterdam Island'
801
+ c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet, Scattered Islands'
791
802
  end
792
803
  country 'TG', 'Togo' do |c|
793
804
  c.timezone 'Africa/Abidjan', 319, 60, -121, 30
794
805
  end
795
806
  country 'TH', 'Thailand' do |c|
796
- c.timezone 'Asia/Bangkok', 55, 4, 6031, 60
807
+ c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
797
808
  end
798
809
  country 'TJ', 'Tajikistan' do |c|
799
810
  c.timezone 'Asia/Dushanbe', 463, 12, 344, 5
@@ -829,9 +840,10 @@ module TZInfo
829
840
  c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
830
841
  end
831
842
  country 'UA', 'Ukraine' do |c|
832
- c.timezone 'Europe/Kiev', 1513, 30, 1831, 60, 'most locations'
833
- c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Ruthenia'
834
- c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozh\'ye, E Lugansk / Zaporizhia, E Luhansk'
843
+ c.timezone 'Europe/Kiev', 1513, 30, 1831, 60, 'Ukraine (most areas)'
844
+ c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Transcarpathia'
845
+ c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozhye and east Lugansk'
846
+ c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea'
835
847
  end
836
848
  country 'UG', 'Uganda' do |c|
837
849
  c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
@@ -839,45 +851,45 @@ module TZInfo
839
851
  country 'UM', 'US minor outlying islands' do |c|
840
852
  c.timezone 'Pacific/Wake', 1157, 60, 9997, 60, 'Wake Island'
841
853
  c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Samoa, Midway'
842
- c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii time'
854
+ c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii'
843
855
  end
844
856
  country 'US', 'United States' do |c|
845
- c.timezone 'America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time'
846
- c.timezone 'America/Detroit', 152393, 3600, -19931, 240, 'Eastern Time - Michigan - most locations'
847
- c.timezone 'America/Kentucky/Louisville', 9181, 240, -154367, 1800, 'Eastern Time - Kentucky - Louisville area'
848
- c.timezone 'America/Kentucky/Monticello', 132587, 3600, -101819, 1200, 'Eastern Time - Kentucky - Wayne County'
849
- c.timezone 'America/Indiana/Indianapolis', 23861, 600, -310169, 3600, 'Eastern Time - Indiana - most locations'
850
- c.timezone 'America/Indiana/Vincennes', 69619, 1800, -315103, 3600, 'Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties'
851
- c.timezone 'America/Indiana/Winamac', 29557, 720, -311771, 3600, 'Eastern Time - Indiana - Pulaski County'
852
- c.timezone 'America/Indiana/Marengo', 17269, 450, -310841, 3600, 'Eastern Time - Indiana - Crawford County'
853
- c.timezone 'America/Indiana/Petersburg', 138571, 3600, -314203, 3600, 'Eastern Time - Indiana - Pike County'
854
- c.timezone 'America/Indiana/Vevay', 34873, 900, -153121, 1800, 'Eastern Time - Indiana - Switzerland County'
855
- c.timezone 'America/Chicago', 837, 20, -1753, 20, 'Central Time'
856
- c.timezone 'America/Indiana/Tell_City', 136631, 3600, -312341, 3600, 'Central Time - Indiana - Perry County'
857
- c.timezone 'America/Indiana/Knox', 9911, 240, -693, 8, 'Central Time - Indiana - Starke County'
858
- c.timezone 'America/Menominee', 40597, 900, -105137, 1200, 'Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties'
859
- c.timezone 'America/North_Dakota/Center', 169619, 3600, -121559, 1200, 'Central Time - North Dakota - Oliver County'
860
- c.timezone 'America/North_Dakota/New_Salem', 9369, 200, -121693, 1200, 'Central Time - North Dakota - Morton County (except Mandan area)'
861
- c.timezone 'America/North_Dakota/Beulah', 56717, 1200, -916, 9, 'Central Time - North Dakota - Mercer County'
862
- c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain Time'
863
- c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain Time - south Idaho & east Oregon'
864
- c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'Mountain Standard Time - Arizona (except Navajo)'
865
- c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific Time'
866
- c.timezone 'America/Metlakatla', 198457, 3600, -18947, 144, 'Pacific Standard Time - Annette Island, Alaska'
867
- c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska Time'
868
- c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska Time - Alaska panhandle'
869
- c.timezone 'America/Sitka', 41167, 720, -487087, 3600, 'Alaska Time - southeast Alaska panhandle'
870
- c.timezone 'America/Yakutat', 214369, 3600, -251509, 1800, 'Alaska Time - Alaska panhandle neck'
871
- c.timezone 'America/Nome', 58051, 900, -595463, 3600, 'Alaska Time - west Alaska'
857
+ c.timezone 'America/New_York', 48857, 1200, -266423, 3600, 'Eastern (most areas)'
858
+ c.timezone 'America/Detroit', 152393, 3600, -19931, 240, 'Eastern - MI (most areas)'
859
+ c.timezone 'America/Kentucky/Louisville', 9181, 240, -154367, 1800, 'Eastern - KY (Louisville area)'
860
+ c.timezone 'America/Kentucky/Monticello', 132587, 3600, -101819, 1200, 'Eastern - KY (Wayne)'
861
+ c.timezone 'America/Indiana/Indianapolis', 23861, 600, -310169, 3600, 'Eastern - IN (most areas)'
862
+ c.timezone 'America/Indiana/Vincennes', 69619, 1800, -315103, 3600, 'Eastern - IN (Da, Du, K, Mn)'
863
+ c.timezone 'America/Indiana/Winamac', 29557, 720, -311771, 3600, 'Eastern - IN (Pulaski)'
864
+ c.timezone 'America/Indiana/Marengo', 17269, 450, -310841, 3600, 'Eastern - IN (Crawford)'
865
+ c.timezone 'America/Indiana/Petersburg', 138571, 3600, -314203, 3600, 'Eastern - IN (Pike)'
866
+ c.timezone 'America/Indiana/Vevay', 34873, 900, -153121, 1800, 'Eastern - IN (Switzerland)'
867
+ c.timezone 'America/Chicago', 837, 20, -1753, 20, 'Central (most areas)'
868
+ c.timezone 'America/Indiana/Tell_City', 136631, 3600, -312341, 3600, 'Central - IN (Perry)'
869
+ c.timezone 'America/Indiana/Knox', 9911, 240, -693, 8, 'Central - IN (Starke)'
870
+ c.timezone 'America/Menominee', 40597, 900, -105137, 1200, 'Central - MI (Wisconsin border)'
871
+ c.timezone 'America/North_Dakota/Center', 169619, 3600, -121559, 1200, 'Central - ND (Oliver)'
872
+ c.timezone 'America/North_Dakota/New_Salem', 9369, 200, -121693, 1200, 'Central - ND (Morton rural)'
873
+ c.timezone 'America/North_Dakota/Beulah', 56717, 1200, -916, 9, 'Central - ND (Mercer)'
874
+ c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain (most areas)'
875
+ c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain - ID (south); OR (east)'
876
+ c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - Arizona (except Navajo)'
877
+ c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific'
878
+ c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska (most areas)'
879
+ c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska - Juneau area'
880
+ c.timezone 'America/Sitka', 41167, 720, -487087, 3600, 'Alaska - Sitka area'
881
+ c.timezone 'America/Metlakatla', 198457, 3600, -18947, 144, 'Alaska - Annette Island'
882
+ c.timezone 'America/Yakutat', 214369, 3600, -251509, 1800, 'Alaska - Yakutat'
883
+ c.timezone 'America/Nome', 58051, 900, -595463, 3600, 'Alaska (west)'
872
884
  c.timezone 'America/Adak', 1297, 25, -635969, 3600, 'Aleutian Islands'
873
- c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii time'
885
+ c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii'
874
886
  end
875
887
  country 'UY', 'Uruguay' do |c|
876
- c.timezone 'America/Montevideo', -2093, 60, -3371, 60
888
+ c.timezone 'America/Montevideo', -41891, 1200, -4497, 80
877
889
  end
878
890
  country 'UZ', 'Uzbekistan' do |c|
879
- c.timezone 'Asia/Samarkand', 119, 3, 334, 5, 'west Uzbekistan'
880
- c.timezone 'Asia/Tashkent', 124, 3, 693, 10, 'east Uzbekistan'
891
+ c.timezone 'Asia/Samarkand', 119, 3, 334, 5, 'Uzbekistan (west)'
892
+ c.timezone 'Asia/Tashkent', 124, 3, 693, 10, 'Uzbekistan (east)'
881
893
  end
882
894
  country 'VA', 'Vatican City' do |c|
883
895
  c.timezone 'Europe/Rome', 419, 10, 749, 60
@@ -895,7 +907,8 @@ module TZInfo
895
907
  c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
896
908
  end
897
909
  country 'VN', 'Vietnam' do |c|
898
- c.timezone 'Asia/Bangkok', 55, 4, 6031, 60
910
+ c.timezone 'Asia/Ho_Chi_Minh', 43, 4, 320, 3, 'Vietnam (south)'
911
+ c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)'
899
912
  end
900
913
  country 'VU', 'Vanuatu' do |c|
901
914
  c.timezone 'Pacific/Efate', -53, 3, 2021, 12
@@ -916,10 +929,10 @@ module TZInfo
916
929
  c.timezone 'Africa/Johannesburg', -105, 4, 28, 1
917
930
  end
918
931
  country 'ZM', 'Zambia' do |c|
919
- c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
932
+ c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
920
933
  end
921
934
  country 'ZW', 'Zimbabwe' do |c|
922
- c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time (UTC+2)'
935
+ c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time'
923
936
  end
924
937
  end
925
938
  end