[PATCH 0/5] Standardize zone table comments format
Not having a standard format for zone table comments is creating ambiguity. For example: 1 Thule / Pituffik 2 Pohnpei (Ponape) 3 Nova Scotia (peninsula) 4 peninsular Malaysia 5 Eastern Time - Pangnirtung, Nunavut 6 Central Time - Campeche, Yucatán 1 and 2 are different formats for alternate names/spellings. 3 shows a sub-region, but uses the same format as the previous alternate name. 4 places the sub-region before the region, where 3 has it after and uses a different format. 5 and 6 use the same format, but 5 defines a single sub-region while 6 defines two regions. These ambiguities make it impossible to interpret the comments without having prior knowledge of the area. This patch set is an effort to standardize the column 4 comments format as follows: A dash (-) is consistently used to delimit a zone_id prefix, so that was retained. A comma (,) is consistently used to delimit regions, so that was retained. Using a slash (/) to delimit alternate names/spellings is accepted English grammar, so that was chosen. Placing sub-regions after regions facilitates having list items begin in uppercase (which is both aesthetically pleasing and grammatically correct) and improves the usability of a sorted list; so that was chosen. Delimiting sub-regions with with curved braces () is in current practice, so that was chosen. Finally two letter codes for regions/sub-regions are included at the end of the sub-region(s) within the curved braces. Multiple regions grouped with the same sub-region(s) are delimited with a comma between the final region of the group and the sub-region(s). Region sub-region groups are delimited from other regions with a semicolon. At least one zone_id or region must be given. When adding a foreign country code to a zone_id on border locations, add it after the zone_id to accommodate implementations that sort the list. This will group zone_id's together, for example: Mountain Time - Chihuahua (away from US border) Mountain Time US - Chihuahua (near US border) Use full words in favor of abbreviations. This format can be represent as: [zone_id] [-] [region[(sub_region, ... [2_letter_code, ... ])][,|;] ... ] There currently are no zone table comments that model the full specification, so here is an imaginary example of the full spec: Central Scooter Time - Yamaha (YZ); Harley, Davidson, Sprint, (west coast XL, XR, FL, ST); Honda (most locations CB, CR), Suzuki, Kawasaki, Vespa The following changes since commit 99b658c3a129dfd0cb777337575e200656b8ff9d: * NEWS, Theory: Clear up descriptions of tzdata abbreviations. (2016-02-14 12:36:54 -0800) are available in the git repository at: git@github.com:jwpi/tz.git zonetab0215 for you to fetch changes up to cf921321194419bc88104da5d7a3a7cfac0ca47e: Standardize zone table comment format (2016-02-20 11:30:20 -0500) ---------------------------------------------------------------- J William Piggott (5): Holiday Islands does not exist. North of Scoresbysund is named National Park Durango is not a border state Use proper names for Baja California States Standardize zone table comment format australasia | 8 +++ europe | 8 +++ northamerica | 6 +- zone.tab | 240 +++++++++++++++++++++++++++++++-------------------------------- zone1970.tab | 250 +++++++++++++++++++++++++++++++++--------------------------------- 5 files changed, 264 insertions(+), 248 deletions(-) --- 8< Example zone1970.tab comments using the standardized format: Adelaide Island (Rothera Station) Anvers Island (Palmer Station) Holme Bay (Mawson Station) Vestfold Hills (Davis Station) Bailey Peninsula (Casey Station) Lake Vostok (Vostok Station) Adélie Land (Dumont-d'Urville Station) East Ongul Island (Syowa Station) Queen Maud Land (Troll Station) Buenos Aires (BA, CF) Argentina (most locations CB, CC, CN, ER, FM, MN, SE, SF) Salta (SA, LP, NQ, RN) Jujuy (JY) Tucumán (TM) Catamarca (CT), Chubut (CH) La Rioja (LR) San Juan (SJ) Mendoza (MZ) San Luis (SL) Santa Cruz (SC) Tierra del Fuego (TF) Samoa, Midway Lord Howe Island Macquarie Island Tasmania (most locations) Tasmania (King Island) Victoria New South Wales (most locations) New South Wales (Yancowinna) Queensland (most locations) Queensland (Whitsunday Islands) South Australia Northern Territory Western Australia (most locations) Western Australia (Eucla) Atlantic islands Pará (east), Amapá Northeast Brazil (MA, PI, CE, RN, PB) Pernambuco Tocantins Alagoas, Sergipe Bahia South Brazil, Southeast Brazil, (GO, DF, MG, ES, RJ, SP, PR, SC, RS) Mato Grosso do Sul Mato Grosso Pará (west) Rondônia Roraima Amazonas (east) Amazonas (west) Acre Newfoundland, Labrador (southeast) Atlantic Time - Nova Scotia (peninsula), Prince Edward Island Atlantic Time - Nova Scotia (Cape Breton) Atlantic Time - New Brunswick Atlantic Time - Labrador (most locations) Atlantic Standard Time - Quebec (Lower North Shore) Eastern Time - Ontario, Quebec, (most locations) Eastern Time - Ontario, Quebec, (places that did not observe DST 1967-1973) Eastern Time - Ontario (Thunder Bay) Eastern Time - Nunavut (most eastern locations) Eastern Time - Nunavut (Pangnirtung) Central Time - Nunavut (Resolute) Eastern Standard Time - Ontario (Atikokan), Nunavut (Southampton Island) Central Time - Nunavut (central) Central Time - Ontario (west), Manitoba Central Time - Ontario (Rainy River, Fort Frances) Central Standard Time - Saskatchewan (most locations) Central Standard Time - Saskatchewan (midwest) Mountain Time - Alberta, British Columbia (east), Saskatchewan (west) Mountain Time - Nunavut (west) Mountain Time - Northwest Territories (central) Mountain Time - Northwest Territories (west) Mountain Standard Time - British Columbia (Creston) Mountain Standard Time - British Columbia (Dawson Creek, Fort Saint John) Mountain Standard Time - British Columbia (Fort Nelson) Pacific Time - British Columbia (west) Pacific Time - Yukon (south) Pacific Time - Yukon (north) Swiss Time Chile (most locations) Easter Island Beijing Time Xinjiang Time Germany (most locations) Ecuador (mainland) Galápagos Islands Spain (mainland) Ceuta, Melilla Canary Islands Chuuk/Truk, Yap Pohnpei/Ponape Kosrae Greenland (most locations) National Park (east coast) Scoresbysund/Ittoqqortoormiit Thule/Pituffik Java, Sumatra Borneo (west, central) Borneo (east, south), Sulawesi (Celebes), Bali, Nusa Tengarra, Timor (west) New Guinea (West Papua / Irian Jaya), Maluku/Moluccas Gilbert Islands Phoenix Islands Line Islands Kazakhstan (most locations) Qyzylorda/Kyzylorda/Kzyl-Orda Aqtobe/Aktobe Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau West Kazakhstan Marshall Islands (most locations) Kwajalein Mongolia (most locations) Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan Dornod, Sükhbaatar Central Time Eastern Standard Time - Quintana Roo Central Time - Campeche, Yucatán Central Time - Durango; Coahuila, Nuevo León, Tamaulipas, (away from US border) Central Time US - Coahuila, Nuevo León, Tamaulipas, (near US border) Mountain Time - Baja California Sur, Nayarit, Sinaloa Mountain Time - Chihuahua (away from US border) Mountain Time US - Chihuahua (near US border) Mountain Standard Time - Sonora Pacific Time US - Baja California Central Time - Bahía de Banderas Malaysia (peninsula) Sabah, Sarawak UTC+2 - Central Africa Time UTC+1 - West Africa Time New Zealand Time Chatham Islands Society Islands Marquesas Islands Gambier Islands Papua New Guinea (most locations) Bougainville Gaza Strip West Bank Portugal (mainland) Madeira Islands Azores Réunion Island, Crozet Islands, Scattered Islands Moscow-01 - Kaliningrad Moscow+00 - Russia (west) Moscow+00 - Crimea Moscow+00 - Caspian Sea Moscow+01 - Samara, Udmurtia Moscow+02 - Urals Moscow+03 - Siberia (west) Moscow+03 - Novosibirsk Moscow+04 - Kemerovo Moscow+04 - Yenisei River Moscow+05 - Lake Baikal Moscow+05 - Zabaykalsky Moscow+06 - Lena River Moscow+06 - Tomponsky, Ust-Maysky Moscow+07 - Amur River Moscow+07 - Sakhalin Island Moscow+07 - Oymyakonsky Moscow+07 - Magadan Moscow+08 - Sakha (east), North Kuril Islands Moscow+09 - Kamchatka Moscow+09 - Bering Sea Kerguelen, St Paul Island, Amsterdam Island Indochina (most locations) Ukraine (most locations) Ruthenia Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) Wake Island Eastern Time Eastern Time - Michigan (most locations) Eastern Time - Kentucky (Louisville area) Eastern Time - Kentucky (Wayne) Eastern Time - Indiana (most locations) Eastern Time - Indiana (Daviess, Dubois, Knox, Martin) Eastern Time - Indiana (Pulaski) Eastern Time - Indiana (Crawford) Eastern Time - Indiana (Pike) Eastern Time - Indiana (Switzerland) Central Time Central Time - Indiana (Perry) Central Time - Indiana (Starke) Central Time - Michigan (Dickinson, Gogebic, Iron, Menominee) Central Time - North Dakota (Oliver) Central Time - North Dakota (Morton except Mandan area) Central Time - North Dakota (Mercer) Mountain Time Mountain Time - Idaho (south), Oregon (east) Mountain Standard Time - Arizona (except Navajo) Pacific Time Alaska Time Alaska Time - Alaska Panhandle Alaska Time - Alaska Panhandle (southeast) Alaska Time - Annette Island Alaska Time - Alaska Panhandle (neck) Alaska Time - Alaska (west) Aleutian Islands Hawaii Time Uzbekistan (west) Uzbekistan (east) Vietnam (south)
* australasia: Document this. * zone.tab, zone1970.tab: Correct the name in column 4 comments. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- australasia | 8 ++++++++ zone.tab | 2 +- zone1970.tab | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/australasia b/australasia index 5c272db..236063a 100644 --- a/australasia +++ b/australasia @@ -60,6 +60,14 @@ Zone Australia/Eucla 8:35:28 - LMT 1895 Dec # Hamilton is the largest, but there is also a Hamilton in Victoria, # so use Lindeman. # +# From J William Piggott (2016-02-04): +# There is no location named Holiday Islands in Queensland Australia, holiday +# islands is a colloquial term used globally. Hayman and Lindeman are at the +# North and South extremes of the Whitsunday Islands archipelago, and +# Hamalton is in between; it is reasonable to believe that this time zone +# applies to all of the Whitsundays. +# http://www.australia.gov.au/about-australia/australian-story/austn-islands +# # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule AQ 1971 only - Oct lastSun 2:00s 1:00 D Rule AQ 1972 only - Feb lastSun 2:00s 0 S diff --git a/zone.tab b/zone.tab index 36dfa65..e8a037f 100644 --- a/zone.tab +++ b/zone.tab @@ -62,7 +62,7 @@ AU -3749+14458 Australia/Melbourne Victoria AU -3352+15113 Australia/Sydney New South Wales - most locations AU -3157+14127 Australia/Broken_Hill New South Wales - Yancowinna AU -2728+15302 Australia/Brisbane Queensland - most locations -AU -2016+14900 Australia/Lindeman Queensland - Holiday Islands +AU -2016+14900 Australia/Lindeman Queensland - Whitsunday Islands AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory AU -3157+11551 Australia/Perth Western Australia - most locations diff --git a/zone1970.tab b/zone1970.tab index cc2654e..7a35cee 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -69,7 +69,7 @@ AU -3749+14458 Australia/Melbourne Victoria AU -3352+15113 Australia/Sydney New South Wales - most locations AU -3157+14127 Australia/Broken_Hill New South Wales - Yancowinna AU -2728+15302 Australia/Brisbane Queensland - most locations -AU -2016+14900 Australia/Lindeman Queensland - Holiday Islands +AU -2016+14900 Australia/Lindeman Queensland - Whitsunday Islands AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory AU -3157+11551 Australia/Perth Western Australia - most locations
Date: Sat, 20 Feb 2016 17:04:24 -0500 From: J William Piggott <elseifthen@gmx.com> Message-ID: <56C8E2E8.5080700@gmx.com> | +# There is no location named Holiday Islands in Queensland Australia, holiday | +# islands is a colloquial term used globally. That's true, but it is a widely used nomenclature, and probably better known that Whitsunday Islands. | Hayman and Lindeman are at the | +# North and South extremes of the Whitsunday Islands archipelago, and | +# Hamalton is in between; That would be Hamilton, and while Lindeman is near the southern extreme, Thomas Island is probably the actual limit. | it is reasonable to believe that this time zone | +# applies to all of the Whitsundays. That would require confirmation from someone in that part of the world I expect - some of the islands are probably uninhabited, and so have no real timezone. Inhabited ones that are not tourist destinations (if such a thing really exists) could just use reqular Qld time (I have no idea.) kre ps: is all of this structure really needed for what are just comments intended for (local knowledgeable) humans?
On 02/20/2016 08:43 PM, Robert Elz wrote:
Date: Sat, 20 Feb 2016 17:04:24 -0500 From: J William Piggott <elseifthen@gmx.com> Message-ID: <56C8E2E8.5080700@gmx.com>
| +# There is no location named Holiday Islands in Queensland Australia, holiday | +# islands is a colloquial term used globally.
That's true, but it is a widely used nomenclature, and probably better known that Whitsunday Islands.
Its wide use is what makes it a poor identifier to use in the zone tables. It is used in referring to all of the Great Barrier Reef holiday destinations, e.g., Bribie Island, Fraser Island, Great Keppel Island, Lizard Island, Magnetic Island. This zone doesn't apply to them. Most of the commercial websites I've found that cater to this specific group of holiday islands refer to them by their proper name, ether 'Whitsunday Islands' or simply the 'Whitsundays'. For example: http://holiday-whitsundays.com/ http://www.yachtcharters.com.au/whitsunday-islands-visit/ Before making further arguments, I'd like to make clear that this patch is about using an unambiguous name in the zone table comments. The zone table comments are intended for use in applications like tzselect. These applications should not assume the user has any prior knowledge of the areas. To help users choose a file from the Time Zone Database it is better to identify areas with their proper names, than some vague colloquial term. The use of 'Holiday Islands' in the zone tables seems to originate from the comments in zone source file. So I think there should be some mention of the proper name there. I do not have a strong opinion as to the exact wording.
| Hayman and Lindeman are at the | +# North and South extremes of the Whitsunday Islands archipelago, and | +# Hamalton is in between;
That would be Hamilton
True, my mistake.
, and while Lindeman is near the southern extreme, Thomas Island is probably the actual limit.
I did not mean to imply that it was _the_ southern most point. However, replacing 'at' with 'near' would be better.
| it is reasonable to believe that this time zone | +# applies to all of the Whitsundays.
That would require confirmation from someone in that part of the world I expect - some of the islands are probably uninhabited, and so have no real timezone. Inhabited ones that are not tourist destinations (if such a thing really exists) could just use reqular Qld time (I have no idea.)
This was only a two year period, they're on 'reqular Qld time' now. It probably is not relevant which islands in the group the database considers part this zone. Will someone really try to use this database to ascertain a time in 1993 on an uninhabited Whitsunday island? Using the proper name to identify the area is relevant.
kre
ps: is all of this structure really needed for what are just comments intended for (local knowledgeable) humans?
I do not think it should be assumed everyone working on this file will have local knowledge, especially colloquial terms. I find the source file comments useful.
J William Piggott said:
On 02/20/2016 08:43 PM, Robert Elz wrote:
Date: Sat, 20 Feb 2016 17:04:24 -0500 From: J William Piggott <elseifthen@gmx.com> Message-ID: <56C8E2E8.5080700@gmx.com>
| +# There is no location named Holiday Islands in Queensland Australia, holiday | +# islands is a colloquial term used globally.
That's true, but it is a widely used nomenclature, and probably better known that Whitsunday Islands.
Its wide use is what makes it a poor identifier to use in the zone tables. It is used in referring to all of the Great Barrier Reef holiday destinations, e.g., Bribie Island, Fraser Island, Great Keppel Island, Lizard Island, Magnetic Island. This zone doesn't apply to them.
Most of the commercial websites I've found that cater to this specific group of holiday islands refer to them by their proper name, ether 'Whitsunday Islands' or simply the 'Whitsundays'.
If someone can clarify the question, I can ask my boss, who sits at the next desk to me and is a Queenslander. -- Clive D.W. Feather | If you lie to the compiler, Email: clive@davros.org | it will get its revenge. Web: http://www.davros.org | - Henry Spencer Mobile: +44 7973 377646
Clive D.W. Feather wrote:
If someone can clarify the question, I can ask my boss, who sits at the next desk to me and is a Queenslander.
The question is how to describe, in the form of brief commentary, the islands where holiday operators chose to observe daylight-saving time for a couple of years after summer 1992, even though Queensland officially stopped observing DST that year. For a bit more about this, please see: https://mm.icann.org/pipermail/tz/1996-November/009697.html which says "the IATA SSIM ... says that the Holiday Islands (Hayman, Lindeman, Hamilton) observed DST through 1993/1994."
Paul Eggert said:
If someone can clarify the question, I can ask my boss, who sits at the next desk to me and is a Queenslander.
More to the point, he's from Brisbane and so knows the area (unlike, say, someone from Cairns).
The question is how to describe, in the form of brief commentary, the islands where holiday operators chose to observe daylight-saving time for a couple of years after summer 1992, even though Queensland officially stopped observing DST that year. For a bit more about this, please see:
https://mm.icann.org/pipermail/tz/1996-November/009697.html
which says "the IATA SSIM ... says that the Holiday Islands (Hayman, Lindeman, Hamilton) observed DST through 1993/1994."
He says that everyone calls them "The Whitsundays" and he's never heard the term "the Holiday Islands". -- Clive D.W. Feather | If you lie to the compiler, Email: clive@davros.org | it will get its revenge. Web: http://www.davros.org | - Henry Spencer Mobile: +44 7973 377646
On 23 Feb 2016, at 5:51 am, Clive D.W. Feather <clive@davros.org> wrote:
He says that everyone calls them "The Whitsundays" and he's never heard the term "the Holiday Islands".
Adding my 2 cents as someone who’s lived in either New South Wales or Victoria my whole life. I’ve also only ever heard of those islands being referred to as the Whitsundays or Whitsunday Islands. When people on the east coast of Australia go holidaying there, they either use the group term of “the Whitsundays” or mention the specific island they’re going to (e.g. “a holiday on Hamilton Island”). To the point about local vs global names, it’s the term used in official tourist guides: http://www.australia.com/en/places/qld/whitsundays-islands.html https://www.lonelyplanet.com/australia/queensland/whitsunday-islands
More to the point, he's from Brisbane and so knows the area (unlike, say, someone from Cairns).
Minor nitpick here, but the islands are around 400km closer to Cairns than they are to Brisbane.
Gilmore Davidson said:
More to the point, he's from Brisbane and so knows the area (unlike, say, someone from Cairns). Minor nitpick here, but the islands are around 400km closer to Cairns than they are to Brisbane.
<checks> So it is. I shall have a go at him tomorrow morning. -- Clive D.W. Feather | If you lie to the compiler, Email: clive@davros.org | it will get its revenge. Web: http://www.davros.org | - Henry Spencer Mobile: +44 7973 377646
Thanks, my guess is that Whitsunday will work just as well as Holiday in practice and it is more technically correct, so I installed this one. We can always change it back; it's just a comment.
* europe: Document this. * zone.tab, zone1970.tab: Use the proper name in column 4 comments. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- europe | 8 ++++++++ zone.tab | 2 +- zone1970.tab | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/europe b/europe index 6eea558..1deaa16 100644 --- a/europe +++ b/europe @@ -1005,6 +1005,14 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn # startkart.no says Thule does not observe DST, but this is clearly an error, # so go with Shanks & Pottenger for Thule transitions until this year. # For 2007 on assume Thule will stay in sync with US DST rules. + +# From J William Piggott (2016-02-12): +# "Greenland north of the community of Scoresbysund" is officially named +# "National Park" by Executive Order: +# naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf +# +# It is their only National Park: +# naalakkersuisut.gl/en/Naalakkersuisut/Departments/Natur-Miljoe-og-Justitsomraadet/Natur_-Energi-og-Klimaafdelingen/Natur/Fredede-landomraader # # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D diff --git a/zone.tab b/zone.tab index e8a037f..6985ad4 100644 --- a/zone.tab +++ b/zone.tab @@ -188,7 +188,7 @@ GG +4927-00232 Europe/Guernsey GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar GL +6411-05144 America/Godthab Greenland - most locations -GL +7646-01840 America/Danmarkshavn east coast, north of Scoresbysund +GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund / Ittoqqortoormiit GL +7634-06847 America/Thule Thule / Pituffik GM +1328-01639 Africa/Banjul diff --git a/zone1970.tab b/zone1970.tab index 7a35cee..39ef112 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -172,7 +172,7 @@ GF +0456-05220 America/Cayenne GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar GL +6411-05144 America/Godthab Greenland - most locations -GL +7646-01840 America/Danmarkshavn east coast, north of Scoresbysund +GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund / Ittoqqortoormiit GL +7634-06847 America/Thule Thule / Pituffik GR +3758+02343 Europe/Athens
Thanks, I installed this one.
Durango does not use US time. This appears to be a copy/paste oversight when the new zone was created. * northamerica: fix comments * zone.tab, zone1970.tab: fix column 4 comments Signed-off-by: J William Piggott <elseifthen@gmx.com> --- northamerica | 4 ++-- zone.tab | 4 ++-- zone1970.tab | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/northamerica b/northamerica index 78e5881..b9c8386 100644 --- a/northamerica +++ b/northamerica @@ -2475,13 +2475,13 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32 -6:00 - CST 1981 Dec 23 -5:00 - EST 1982 Dec 2 -6:00 Mexico C%sT -# Coahuila, Durango, Nuevo León, Tamaulipas (near US border) +# Coahuila, Nuevo León, Tamaulipas, (near US border) Zone America/Matamoros -6:40:00 - LMT 1921 Dec 31 23:20:00 -6:00 - CST 1988 -6:00 US C%sT 1989 -6:00 Mexico C%sT 2010 -6:00 US C%sT -# Coahuila, Durango, Nuevo León, Tamaulipas (away from US border) +# Durango; Coahuila, Nuevo León, Tamaulipas, (away from US border) Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44 -6:00 - CST 1988 -6:00 US C%sT 1989 diff --git a/zone.tab b/zone.tab index 6985ad4..9e0f61b 100644 --- a/zone.tab +++ b/zone.tab @@ -277,8 +277,8 @@ MW -1547+03500 Africa/Blantyre MX +1924-09909 America/Mexico_City Mexican Central Time - most locations MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatan -MX +2540-10019 America/Monterrey Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border -MX +2550-09730 America/Matamoros US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border +MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas, (away from US border) +MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo Leon, Tamaulipas, (near US border) MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border diff --git a/zone1970.tab b/zone1970.tab index 39ef112..ecc8a0f 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -236,8 +236,8 @@ MV +0410+07330 Indian/Maldives MX +1924-09909 America/Mexico_City Mexican Central Time - most locations MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatán -MX +2540-10019 America/Monterrey Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border -MX +2550-09730 America/Matamoros US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border +MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo León, Tamaulipas, (away from US border) +MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo León, Tamaulipas, (near US border) MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border
Thanks for catching that typo; I installed the patch.
"S Baja" could be interpreted as the southern part of Baja California instead of the intended target which is Baja California Sur. * northamerica: America/Tijuana applies to all of Baja California * zone.tab, zone1970.tab: fix column 4 comments Signed-off-by: J William Piggott <elseifthen@gmx.com> --- northamerica | 2 +- zone.tab | 4 ++-- zone1970.tab | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/northamerica b/northamerica index b9c8386..c52421d 100644 --- a/northamerica +++ b/northamerica @@ -2584,7 +2584,7 @@ Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00 -7:00 Mexico M%sT 2010 Apr 4 2:00 -6:00 Mexico C%sT -# Baja California (near US border) +# Baja California Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56 -7:00 - MST 1924 -8:00 - PST 1927 Jun 10 23:00 diff --git a/zone.tab b/zone.tab index 9e0f61b..64cdb4d 100644 --- a/zone.tab +++ b/zone.tab @@ -279,11 +279,11 @@ MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatan MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas, (away from US border) MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo Leon, Tamaulipas, (near US border) -MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa +MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora -MX +3232-11701 America/Tijuana US Pacific Time - Baja California state +MX +3232-11701 America/Tijuana Pacific Time US - Baja California MX +2048-10515 America/Bahia_Banderas Mexican Central Time - Bahia de Banderas MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia MY +0133+11020 Asia/Kuching Sabah & Sarawak diff --git a/zone1970.tab b/zone1970.tab index ecc8a0f..2361c1b 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -238,11 +238,11 @@ MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatán MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo León, Tamaulipas, (away from US border) MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo León, Tamaulipas, (near US border) -MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa +MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora -MX +3232-11701 America/Tijuana US Pacific Time - Baja California state +MX +3232-11701 America/Tijuana Pacific Time US - Baja California MX +2048-10515 America/Bahia_Banderas Mexican Central Time - BahÃa de Banderas MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia MY +0133+11020 Asia/Kuching Sabah & Sarawak
Thanks, these all look reasonable; installed.
* zone.tab, zone1970.tab: Change column 4 comments to use a standard format. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 230 ++++++++++++++++++++++++++++---------------------------- zone1970.tab | 240 +++++++++++++++++++++++++++++------------------------------ 2 files changed, 235 insertions(+), 235 deletions(-) diff --git a/zone.tab b/zone.tab index 64cdb4d..7007607 100644 --- a/zone.tab +++ b/zone.tab @@ -30,18 +30,18 @@ AI +1812-06304 America/Anguilla AL +4120+01950 Europe/Tirane AM +4011+04430 Asia/Yerevan AO -0848+01314 Africa/Luanda -AQ -7750+16636 Antarctica/McMurdo McMurdo, South Pole, Scott (New Zealand time) -AQ -6734-06808 Antarctica/Rothera Rothera Station, Adelaide Island -AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island -AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay -AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills -AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula -AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok -AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Adelie Land -AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I -AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land +AQ -7750+16636 Antarctica/McMurdo New Zealand Time - McMurdo, South Pole, Scott +AQ -6734-06808 Antarctica/Rothera Adelaide Island (Rothera Station) +AQ -6448-06406 Antarctica/Palmer Anvers Island (Palmer Station) +AQ -6736+06253 Antarctica/Mawson Holme Bay (Mawson Station) +AQ -6835+07758 Antarctica/Davis Vestfold Hills (Davis Station) +AQ -6617+11031 Antarctica/Casey Bailey Peninsula (Casey Station) +AQ -7824+10654 Antarctica/Vostok Lake Vostok (Vostok Station) +AQ -6640+14001 Antarctica/DumontDUrville Adelie Land (Dumont-d'Urville Station) +AQ -690022+0393524 Antarctica/Syowa East Ongul Island (Syowa Station) +AQ -720041+0023206 Antarctica/Troll Queen Maud Land (Troll Station) AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) -AR -3124-06411 America/Argentina/Cordoba Argentina - most locations (CB, CC, CN, ER, FM, MN, SE, SF) +AR -3124-06411 America/Argentina/Cordoba Argentina (most locations CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucuman (TM) @@ -56,17 +56,17 @@ AS -1416-17042 Pacific/Pago_Pago AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island AU -5430+15857 Antarctica/Macquarie Macquarie Island -AU -4253+14719 Australia/Hobart Tasmania - most locations -AU -3956+14352 Australia/Currie Tasmania - King Island +AU -4253+14719 Australia/Hobart Tasmania (most locations) +AU -3956+14352 Australia/Currie Tasmania (King Island) AU -3749+14458 Australia/Melbourne Victoria -AU -3352+15113 Australia/Sydney New South Wales - most locations -AU -3157+14127 Australia/Broken_Hill New South Wales - Yancowinna -AU -2728+15302 Australia/Brisbane Queensland - most locations -AU -2016+14900 Australia/Lindeman Queensland - Whitsunday Islands +AU -3352+15113 Australia/Sydney New South Wales (most locations) +AU -3157+14127 Australia/Broken_Hill New South Wales (Yancowinna) +AU -2728+15302 Australia/Brisbane Queensland (most locations) +AU -2016+14900 Australia/Lindeman Queensland (Whitsunday Islands) AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory -AU -3157+11551 Australia/Perth Western Australia - most locations -AU -3143+12852 Australia/Eucla Western Australia - Eucla area +AU -3157+11551 Australia/Perth Western Australia (most locations) +AU -3143+12852 Australia/Eucla Western Australia (Eucla) AW +1230-06958 America/Aruba AX +6006+01957 Europe/Mariehamn AZ +4023+04951 Asia/Baku @@ -85,63 +85,63 @@ BN +0456+11455 Asia/Brunei BO -1630-06809 America/La_Paz BQ +120903-0681636 America/Kralendijk BR -0351-03225 America/Noronha Atlantic islands -BR -0127-04829 America/Belem Amapa, E Para -BR -0343-03830 America/Fortaleza NE Brazil (MA, PI, CE, RN, PB) +BR -0127-04829 America/Belem Para (east), Amapa +BR -0343-03830 America/Fortaleza Northeast Brazil (MA, PI, CE, RN, PB) BR -0803-03454 America/Recife Pernambuco BR -0712-04812 America/Araguaina Tocantins BR -0940-03543 America/Maceio Alagoas, Sergipe BR -1259-03831 America/Bahia Bahia -BR -2332-04637 America/Sao_Paulo S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS) +BR -2332-04637 America/Sao_Paulo South Brazil, Southeast Brazil, (GO, DF, MG, ES, RJ, SP, PR, SC, RS) BR -2027-05437 America/Campo_Grande Mato Grosso do Sul BR -1535-05605 America/Cuiaba Mato Grosso -BR -0226-05452 America/Santarem W Para +BR -0226-05452 America/Santarem Para (west) BR -0846-06354 America/Porto_Velho Rondonia BR +0249-06040 America/Boa_Vista Roraima -BR -0308-06001 America/Manaus E Amazonas -BR -0640-06952 America/Eirunepe W Amazonas +BR -0308-06001 America/Manaus Amazonas (east) +BR -0640-06952 America/Eirunepe Amazonas (west) BR -0958-06748 America/Rio_Branco Acre BS +2505-07721 America/Nassau BT +2728+08939 Asia/Thimphu BW -2439+02555 Africa/Gaborone BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize -CA +4734-05243 America/St_Johns Newfoundland Time, including SE Labrador -CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (peninsula), PEI +CA +4734-05243 America/St_Johns Newfoundland, Labrador (southeast) +CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (peninsula), Prince Edward Island CA +4612-05957 America/Glace_Bay Atlantic Time - Nova Scotia (Cape Breton) CA +4606-06447 America/Moncton Atlantic Time - New Brunswick -CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador - most locations -CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec - Lower North Shore -CA +4339-07923 America/Toronto Eastern Time - Ontario & Quebec - most locations -CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973 -CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario -CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations -CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut -CA +744144-0944945 America/Resolute Central Time - Resolute, Nunavut -CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut -CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut -CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario -CA +4843-09434 America/Rainy_River Central Time - Rainy River & Fort Frances, Ontario -CA +5024-10439 America/Regina Central Standard Time - Saskatchewan - most locations -CA +5017-10750 America/Swift_Current Central Standard Time - Saskatchewan - midwest -CA +5333-11328 America/Edmonton Mountain Time - Alberta, east British Columbia & west Saskatchewan -CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut -CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories -CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories -CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia -CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia -CA +5848-12242 America/Fort_Nelson Mountain Standard Time - Fort Nelson, British Columbia -CA +4916-12307 America/Vancouver Pacific Time - west British Columbia -CA +6043-13503 America/Whitehorse Pacific Time - south Yukon -CA +6404-13925 America/Dawson Pacific Time - north Yukon +CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador (most locations) +CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec (Lower North Shore) +CA +4339-07923 America/Toronto Eastern Time - Ontario, Quebec, (most locations) +CA +4901-08816 America/Nipigon Eastern Time - Ontario, Quebec, (places that did not observe DST 1967-1973) +CA +4823-08915 America/Thunder_Bay Eastern Time - Ontario (Thunder Bay) +CA +6344-06828 America/Iqaluit Eastern Time - Nunavut (most eastern locations) +CA +6608-06544 America/Pangnirtung Eastern Time - Nunavut (Pangnirtung) +CA +744144-0944945 America/Resolute Central Time - Nunavut (Resolute) +CA +484531-0913718 America/Atikokan Eastern Standard Time - Ontario (Atikokan), Nunavut (Southampton Island) +CA +624900-0920459 America/Rankin_Inlet Central Time - Nunavut (central) +CA +4953-09709 America/Winnipeg Central Time - Ontario (west), Manitoba +CA +4843-09434 America/Rainy_River Central Time - Ontario (Rainy River, Fort Frances) +CA +5024-10439 America/Regina Central Standard Time - Saskatchewan (most locations) +CA +5017-10750 America/Swift_Current Central Standard Time - Saskatchewan (midwest) +CA +5333-11328 America/Edmonton Mountain Time - Alberta, British Columbia (east), Saskatchewan (west) +CA +690650-1050310 America/Cambridge_Bay Mountain Time - Nunavut (west) +CA +6227-11421 America/Yellowknife Mountain Time - Northwest Territories (central) +CA +682059-1334300 America/Inuvik Mountain Time - Northwest Territories (west) +CA +4906-11631 America/Creston Mountain Standard Time - British Columbia (Creston) +CA +5946-12014 America/Dawson_Creek Mountain Standard Time - British Columbia (Dawson Creek, Fort Saint John) +CA +5848-12242 America/Fort_Nelson Mountain Standard Time - British Columbia (Fort Nelson) +CA +4916-12307 America/Vancouver Pacific Time - British Columbia (west) +CA +6043-13503 America/Whitehorse Pacific Time - Yukon (south) +CA +6404-13925 America/Dawson Pacific Time - Yukon (north) CC -1210+09655 Indian/Cocos -CD -0418+01518 Africa/Kinshasa west Dem. Rep. of Congo -CD -1140+02728 Africa/Lubumbashi east Dem. Rep. of Congo +CD -0418+01518 Africa/Kinshasa Dem. Rep. of Congo (west) +CD -1140+02728 Africa/Lubumbashi Dem. Rep. of Congo (east) CF +0422+01835 Africa/Bangui CG -0416+01517 Africa/Brazzaville CH +4723+00832 Europe/Zurich CI +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago Chile - most locations +CL -3327-07040 America/Santiago Chile (most locations) CL -2709-10926 Pacific/Easter Easter Island CM +0403+00942 Africa/Douala CN +3114+12128 Asia/Shanghai Beijing Time @@ -154,28 +154,28 @@ CW +1211-06900 America/Curacao CX -1025+10543 Indian/Christmas CY +3510+03322 Asia/Nicosia CZ +5005+01426 Europe/Prague -DE +5230+01322 Europe/Berlin Germany - most locations +DE +5230+01322 Europe/Berlin Germany (most locations) DE +4742+00841 Europe/Busingen Busingen DJ +1136+04309 Africa/Djibouti DK +5540+01235 Europe/Copenhagen DM +1518-06124 America/Dominica DO +1828-06954 America/Santo_Domingo DZ +3647+00303 Africa/Algiers -EC -0210-07950 America/Guayaquil mainland +EC -0210-07950 America/Guayaquil Ecuador (mainland) EC -0054-08936 Pacific/Galapagos Galapagos Islands EE +5925+02445 Europe/Tallinn EG +3003+03115 Africa/Cairo EH +2709-01312 Africa/El_Aaiun ER +1520+03853 Africa/Asmara -ES +4024-00341 Europe/Madrid mainland -ES +3553-00519 Africa/Ceuta Ceuta & Melilla +ES +4024-00341 Europe/Madrid Spain (mainland) +ES +3553-00519 Africa/Ceuta Ceuta, Melilla ES +2806-01524 Atlantic/Canary Canary Islands ET +0902+03842 Africa/Addis_Ababa FI +6010+02458 Europe/Helsinki FJ -1808+17825 Pacific/Fiji FK -5142-05751 Atlantic/Stanley -FM +0725+15147 Pacific/Chuuk Chuuk (Truk) and Yap -FM +0658+15813 Pacific/Pohnpei Pohnpei (Ponape) +FM +0725+15147 Pacific/Chuuk Chuuk/Truk, Yap +FM +0658+15813 Pacific/Pohnpei Pohnpei/Ponape FM +0519+16259 Pacific/Kosrae Kosrae FO +6201-00646 Atlantic/Faroe FR +4852+00220 Europe/Paris @@ -187,10 +187,10 @@ GF +0456-05220 America/Cayenne GG +4927-00232 Europe/Guernsey GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Godthab Greenland - most locations +GL +6411-05144 America/Godthab Greenland (most locations) GL +7646-01840 America/Danmarkshavn National Park (east coast) -GL +7029-02158 America/Scoresbysund Scoresbysund / Ittoqqortoormiit -GL +7634-06847 America/Thule Thule / Pituffik +GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit +GL +7634-06847 America/Thule Thule/Pituffik GM +1328-01639 Africa/Banjul GN +0931-01343 Africa/Conakry GP +1614-06132 America/Guadeloupe @@ -206,10 +206,10 @@ HN +1406-08713 America/Tegucigalpa HR +4548+01558 Europe/Zagreb HT +1832-07220 America/Port-au-Prince HU +4730+01905 Europe/Budapest -ID -0610+10648 Asia/Jakarta Java & Sumatra -ID -0002+10920 Asia/Pontianak west & central Borneo -ID -0507+11924 Asia/Makassar east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor -ID -0232+14042 Asia/Jayapura west New Guinea (Irian Jaya) & Malukus (Moluccas) +ID -0610+10648 Asia/Jakarta Java, Sumatra +ID -0002+10920 Asia/Pontianak Borneo (west, central) +ID -0507+11924 Asia/Makassar Borneo (east, south), Sulawesi (Celebes), Bali, Nusa Tengarra, Timor (west) +ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya), Malukus/Moluccas IE +5320-00615 Europe/Dublin IL +314650+0351326 Asia/Jerusalem IM +5409-00428 Europe/Isle_of_Man @@ -235,10 +235,10 @@ KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul KW +2920+04759 Asia/Kuwait KY +1918-08123 America/Cayman -KZ +4315+07657 Asia/Almaty Kazakhstan - most locations -KZ +4448+06528 Asia/Qyzylorda Qyzylorda (Kyzylorda, Kzyl-Orda) -KZ +5017+05710 Asia/Aqtobe Aqtobe (Aktobe) -KZ +4431+05016 Asia/Aqtau Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau) +KZ +4315+07657 Asia/Almaty Kazakhstan (most locations) +KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda +KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe +KZ +4431+05016 Asia/Aqtau Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau KZ +5113+05121 Asia/Oral West Kazakhstan LA +1758+10236 Asia/Vientiane LB +3353+03530 Asia/Beirut @@ -257,12 +257,12 @@ MD +4700+02850 Europe/Chisinau ME +4226+01916 Europe/Podgorica MF +1804-06305 America/Marigot MG -1855+04731 Indian/Antananarivo -MH +0709+17112 Pacific/Majuro Marshall Islands - most locations +MH +0709+17112 Pacific/Majuro Marshall Islands (most locations) MH +0905+16720 Pacific/Kwajalein Kwajalein MK +4159+02126 Europe/Skopje ML +1239-00800 Africa/Bamako MM +1647+09610 Asia/Rangoon -MN +4755+10653 Asia/Ulaanbaatar Mongolia - most locations +MN +4755+10653 Asia/Ulaanbaatar Mongolia (most locations) MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar MO +2214+11335 Asia/Macau @@ -274,19 +274,19 @@ MT +3554+01431 Europe/Malta MU -2010+05730 Indian/Mauritius MV +0410+07330 Indian/Maldives MW -1547+03500 Africa/Blantyre -MX +1924-09909 America/Mexico_City Mexican Central Time - most locations +MX +1924-09909 America/Mexico_City Central Time MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatan MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas, (away from US border) MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo Leon, Tamaulipas, (near US border) MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa -MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border -MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border +MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (away from US border) +MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (near US border) MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora MX +3232-11701 America/Tijuana Pacific Time US - Baja California -MX +2048-10515 America/Bahia_Banderas Mexican Central Time - Bahia de Banderas -MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia -MY +0133+11020 Asia/Kuching Sabah & Sarawak +MX +2048-10515 America/Bahia_Banderas Central Time - Bahia de Banderas +MY +0310+10142 Asia/Kuala_Lumpur Malaysia (peninsula) +MY +0133+11020 Asia/Kuching Sabah, Sarawak MZ -2558+03235 Africa/Maputo NA -2234+01706 Africa/Windhoek NC -2216+16627 Pacific/Noumea @@ -299,7 +299,7 @@ NO +5955+01045 Europe/Oslo NP +2743+08519 Asia/Kathmandu NR -0031+16655 Pacific/Nauru NU -1901-16955 Pacific/Niue -NZ -3652+17446 Pacific/Auckland New Zealand - most locations +NZ -3652+17446 Pacific/Auckland New Zealand (most locations) NZ -4357-17633 Pacific/Chatham Chatham Islands OM +2336+05835 Asia/Muscat PA +0858-07932 America/Panama @@ -307,7 +307,7 @@ PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby Papua New Guinea - most locations +PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most locations) PG -0613+15534 Pacific/Bougainville Bougainville PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi @@ -317,7 +317,7 @@ PN -2504-13005 Pacific/Pitcairn PR +182806-0660622 America/Puerto_Rico PS +3130+03428 Asia/Gaza Gaza Strip PS +313200+0350542 Asia/Hebron West Bank -PT +3843-00908 Europe/Lisbon mainland +PT +3843-00908 Europe/Lisbon Portugal (mainland) PT +3238-01654 Atlantic/Madeira Madeira Islands PT +3744-02540 Atlantic/Azores Azores PW +0720+13429 Pacific/Palau @@ -327,26 +327,26 @@ RE -2052+05528 Indian/Reunion RO +4426+02606 Europe/Bucharest RS +4450+02030 Europe/Belgrade RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad -RU +554521+0373704 Europe/Moscow Moscow+00 - west Russia +RU +554521+0373704 Europe/Moscow Moscow+00 - Russia (west) RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea -RU +5312+05009 Europe/Samara Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia +RU +5312+05009 Europe/Samara Moscow+01 - Samara, Udmurtia RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals -RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia +RU +5500+07324 Asia/Omsk Moscow+03 - Siberia (west) RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk -RU +5345+08707 Asia/Novokuznetsk Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo +RU +5345+08707 Asia/Novokuznetsk Moscow+04 - Kemerovo RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal -RU +5203+11328 Asia/Chita Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky +RU +5203+11328 Asia/Chita Moscow+05 - Zabaykalsky RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky -RU +5934+15048 Asia/Magadan Moscow+08 (Moscow+07 after 2014-10-26) - Magadan -RU +6728+15343 Asia/Srednekolymsk Moscow+08 - E Sakha, N Kuril Is -RU +5301+15839 Asia/Kamchatka Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka -RU +6445+17729 Asia/Anadyr Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea +RU +5934+15048 Asia/Magadan Moscow+07 - Magadan +RU +6728+15343 Asia/Srednekolymsk Moscow+08 - Sakha (east), North Kuril Islands +RU +5301+15839 Asia/Kamchatka Moscow+09 - Kamchatka +RU +6445+17729 Asia/Anadyr Moscow+09 - Bering Sea RW -0157+03004 Africa/Kigali SA +2438+04643 Asia/Riyadh SB -0932+16012 Pacific/Guadalcanal @@ -385,45 +385,45 @@ TT +1039-06131 America/Port_of_Spain TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei TZ -0648+03917 Africa/Dar_es_Salaam -UA +5026+03031 Europe/Kiev Ukraine - most locations +UA +5026+03031 Europe/Kiev Ukraine (most locations) UA +4837+02218 Europe/Uzhgorod Ruthenia -UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk +UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) UG +0019+03225 Africa/Kampala UM +1645-16931 Pacific/Johnston Johnston Atoll UM +2813-17722 Pacific/Midway Midway Islands UM +1917+16637 Pacific/Wake Wake Island US +404251-0740023 America/New_York Eastern Time -US +421953-0830245 America/Detroit Eastern Time - Michigan - most locations -US +381515-0854534 America/Kentucky/Louisville Eastern Time - Kentucky - Louisville area -US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County -US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana - most locations -US +384038-0873143 America/Indiana/Vincennes Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties -US +410305-0863611 America/Indiana/Winamac Eastern Time - Indiana - Pulaski County -US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana - Crawford County -US +382931-0871643 America/Indiana/Petersburg Eastern Time - Indiana - Pike County -US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana - Switzerland County +US +421953-0830245 America/Detroit Eastern Time - Michigan (most locations) +US +381515-0854534 America/Kentucky/Louisville Eastern Time - Kentucky (Louisville area) +US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky (Wayne) +US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana (most locations) +US +384038-0873143 America/Indiana/Vincennes Eastern Time - Indiana (Daviess, Dubois, Knox, Martin) +US +410305-0863611 America/Indiana/Winamac Eastern Time - Indiana (Pulaski) +US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana (Crawford) +US +382931-0871643 America/Indiana/Petersburg Eastern Time - Indiana (Pike) +US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana (Switzerland) US +415100-0873900 America/Chicago Central Time -US +375711-0864541 America/Indiana/Tell_City Central Time - Indiana - Perry County -US +411745-0863730 America/Indiana/Knox Central Time - Indiana - Starke County -US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties -US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County -US +465042-1012439 America/North_Dakota/New_Salem Central Time - North Dakota - Morton County (except Mandan area) -US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County +US +375711-0864541 America/Indiana/Tell_City Central Time - Indiana (Perry) +US +411745-0863730 America/Indiana/Knox Central Time - Indiana (Starke) +US +450628-0873651 America/Menominee Central Time - Michigan (Dickinson, Gogebic, Iron, Menominee) +US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota (Oliver) +US +465042-1012439 America/North_Dakota/New_Salem Central Time - North Dakota (Morton except Mandan area) +US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota (Mercer) US +394421-1045903 America/Denver Mountain Time -US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon +US +433649-1161209 America/Boise Mountain Time - Idaho (south), Oregon (east) US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo) US +340308-1181434 America/Los_Angeles Pacific Time US +611305-1495401 America/Anchorage Alaska Time -US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle -US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle +US +581807-1342511 America/Juneau Alaska Time - Alaska Panhandle +US +571035-1351807 America/Sitka Alaska Time - Alaska Panhandle (southeast) US +550737-1313435 America/Metlakatla Alaska Time - Annette Island -US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck -US +643004-1652423 America/Nome Alaska Time - west Alaska +US +593249-1394338 America/Yakutat Alaska Time - Alaska Panhandle (neck) +US +643004-1652423 America/Nome Alaska Time - Alaska (west) US +515248-1763929 America/Adak Aleutian Islands US +211825-1575130 Pacific/Honolulu Hawaii UY -3453-05611 America/Montevideo -UZ +3940+06648 Asia/Samarkand west Uzbekistan -UZ +4120+06918 Asia/Tashkent east Uzbekistan +UZ +3940+06648 Asia/Samarkand Uzbekistan (west) +UZ +4120+06918 Asia/Tashkent Uzbekistan (east) VA +415408+0122711 Europe/Vatican VC +1309-06114 America/St_Vincent VE +1030-06656 America/Caracas diff --git a/zone1970.tab b/zone1970.tab index 2361c1b..3cd7526 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -38,17 +38,17 @@ AE,OM +2518+05518 Asia/Dubai AF +3431+06912 Asia/Kabul AL +4120+01950 Europe/Tirane AM +4011+04430 Asia/Yerevan -AQ -6734-06808 Antarctica/Rothera Rothera Station, Adelaide Island -AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island -AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay -AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills -AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula -AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok -AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Adélie Land -AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I -AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land +AQ -6734-06808 Antarctica/Rothera Adelaide Island (Rothera Station) +AQ -6448-06406 Antarctica/Palmer Anvers Island (Palmer Station) +AQ -6736+06253 Antarctica/Mawson Holme Bay (Mawson Station) +AQ -6835+07758 Antarctica/Davis Vestfold Hills (Davis Station) +AQ -6617+11031 Antarctica/Casey Bailey Peninsula (Casey Station) +AQ -7824+10654 Antarctica/Vostok Lake Vostok (Vostok Station) +AQ -6640+14001 Antarctica/DumontDUrville Adélie Land (Dumont-d'Urville Station) +AQ -690022+0393524 Antarctica/Syowa East Ongul Island (Syowa Station) +AQ -720041+0023206 Antarctica/Troll Queen Maud Land (Troll Station) AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) -AR -3124-06411 America/Argentina/Cordoba Argentina - most locations (CB, CC, CN, ER, FM, MN, SE, SF) +AR -3124-06411 America/Argentina/Cordoba Argentina (most locations CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucumán (TM) @@ -63,17 +63,17 @@ AS,UM -1416-17042 Pacific/Pago_Pago Samoa, Midway AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island AU -5430+15857 Antarctica/Macquarie Macquarie Island -AU -4253+14719 Australia/Hobart Tasmania - most locations -AU -3956+14352 Australia/Currie Tasmania - King Island +AU -4253+14719 Australia/Hobart Tasmania (most locations) +AU -3956+14352 Australia/Currie Tasmania (King Island) AU -3749+14458 Australia/Melbourne Victoria -AU -3352+15113 Australia/Sydney New South Wales - most locations -AU -3157+14127 Australia/Broken_Hill New South Wales - Yancowinna -AU -2728+15302 Australia/Brisbane Queensland - most locations -AU -2016+14900 Australia/Lindeman Queensland - Whitsunday Islands +AU -3352+15113 Australia/Sydney New South Wales (most locations) +AU -3157+14127 Australia/Broken_Hill New South Wales (Yancowinna) +AU -2728+15302 Australia/Brisbane Queensland (most locations) +AU -2016+14900 Australia/Lindeman Queensland (Whitsunday Islands) AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory -AU -3157+11551 Australia/Perth Western Australia - most locations -AU -3143+12852 Australia/Eucla Western Australia - Eucla area +AU -3157+11551 Australia/Perth Western Australia (most locations) +AU -3143+12852 Australia/Eucla Western Australia (Eucla) AZ +4023+04951 Asia/Baku BB +1306-05937 America/Barbados BD +2343+09025 Asia/Dhaka @@ -83,58 +83,58 @@ BM +3217-06446 Atlantic/Bermuda BN +0456+11455 Asia/Brunei BO -1630-06809 America/La_Paz BR -0351-03225 America/Noronha Atlantic islands -BR -0127-04829 America/Belem Amapá, E Pará -BR -0343-03830 America/Fortaleza NE Brazil (MA, PI, CE, RN, PB) +BR -0127-04829 America/Belem Pará (east), Amapá +BR -0343-03830 America/Fortaleza Northeast Brazil (MA, PI, CE, RN, PB) BR -0803-03454 America/Recife Pernambuco BR -0712-04812 America/Araguaina Tocantins BR -0940-03543 America/Maceio Alagoas, Sergipe BR -1259-03831 America/Bahia Bahia -BR -2332-04637 America/Sao_Paulo S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS) +BR -2332-04637 America/Sao_Paulo South Brazil, Southeast Brazil, (GO, DF, MG, ES, RJ, SP, PR, SC, RS) BR -2027-05437 America/Campo_Grande Mato Grosso do Sul BR -1535-05605 America/Cuiaba Mato Grosso -BR -0226-05452 America/Santarem W Pará +BR -0226-05452 America/Santarem Pará (west) BR -0846-06354 America/Porto_Velho Rondônia BR +0249-06040 America/Boa_Vista Roraima -BR -0308-06001 America/Manaus E Amazonas -BR -0640-06952 America/Eirunepe W Amazonas +BR -0308-06001 America/Manaus Amazonas (east) +BR -0640-06952 America/Eirunepe Amazonas (west) BR -0958-06748 America/Rio_Branco Acre BS +2505-07721 America/Nassau BT +2728+08939 Asia/Thimphu BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize -CA +4734-05243 America/St_Johns Newfoundland Time, including SE Labrador -CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (peninsula), PEI +CA +4734-05243 America/St_Johns Newfoundland, Labrador (southeast) +CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (peninsula), Prince Edward Island CA +4612-05957 America/Glace_Bay Atlantic Time - Nova Scotia (Cape Breton) CA +4606-06447 America/Moncton Atlantic Time - New Brunswick -CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador - most locations -CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec - Lower North Shore -CA +4339-07923 America/Toronto Eastern Time - Ontario & Quebec - most locations -CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973 -CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario -CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations -CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut -CA +744144-0944945 America/Resolute Central Time - Resolute, Nunavut -CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut -CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut -CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario -CA +4843-09434 America/Rainy_River Central Time - Rainy River & Fort Frances, Ontario -CA +5024-10439 America/Regina Central Standard Time - Saskatchewan - most locations -CA +5017-10750 America/Swift_Current Central Standard Time - Saskatchewan - midwest -CA +5333-11328 America/Edmonton Mountain Time - Alberta, east British Columbia & west Saskatchewan -CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut -CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories -CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories -CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia -CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia -CA +5848-12242 America/Fort_Nelson Mountain Standard Time - Fort Nelson, British Columbia -CA +4916-12307 America/Vancouver Pacific Time - west British Columbia -CA +6043-13503 America/Whitehorse Pacific Time - south Yukon -CA +6404-13925 America/Dawson Pacific Time - north Yukon +CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador (most locations) +CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec (Lower North Shore) +CA +4339-07923 America/Toronto Eastern Time - Ontario, Quebec, (most locations) +CA +4901-08816 America/Nipigon Eastern Time - Ontario, Quebec, (places that did not observe DST 1967-1973) +CA +4823-08915 America/Thunder_Bay Eastern Time - Ontario (Thunder Bay) +CA +6344-06828 America/Iqaluit Eastern Time - Nunavut (most eastern locations) +CA +6608-06544 America/Pangnirtung Eastern Time - Nunavut (Pangnirtung) +CA +744144-0944945 America/Resolute Central Time - Nunavut (Resolute) +CA +484531-0913718 America/Atikokan Eastern Standard Time - Ontario (Atikokan), Nunavut (Southampton Island) +CA +624900-0920459 America/Rankin_Inlet Central Time - Nunavut (central) +CA +4953-09709 America/Winnipeg Central Time - Ontario (west), Manitoba +CA +4843-09434 America/Rainy_River Central Time - Ontario (Rainy River, Fort Frances) +CA +5024-10439 America/Regina Central Standard Time - Saskatchewan (most locations) +CA +5017-10750 America/Swift_Current Central Standard Time - Saskatchewan (midwest) +CA +5333-11328 America/Edmonton Mountain Time - Alberta, British Columbia (east), Saskatchewan (west) +CA +690650-1050310 America/Cambridge_Bay Mountain Time - Nunavut (west) +CA +6227-11421 America/Yellowknife Mountain Time - Northwest Territories (central) +CA +682059-1334300 America/Inuvik Mountain Time - Northwest Territories (west) +CA +4906-11631 America/Creston Mountain Standard Time - British Columbia (Creston) +CA +5946-12014 America/Dawson_Creek Mountain Standard Time - British Columbia (Dawson Creek, Fort Saint John) +CA +5848-12242 America/Fort_Nelson Mountain Standard Time - British Columbia (Fort Nelson) +CA +4916-12307 America/Vancouver Pacific Time - British Columbia (west) +CA +6043-13503 America/Whitehorse Pacific Time - Yukon (south) +CA +6404-13925 America/Dawson Pacific Time - Yukon (north) CC -1210+09655 Indian/Cocos -CH,DE,LI +4723+00832 Europe/Zurich Swiss time +CH,DE,LI +4723+00832 Europe/Zurich Swiss Time CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago Chile - most locations +CL -3327-07040 America/Santiago Chile (most locations) CL -2709-10926 Pacific/Easter Easter Island CN +3114+12128 Asia/Shanghai Beijing Time CN +4348+08735 Asia/Urumqi Xinjiang Time @@ -146,23 +146,23 @@ CW,AW,BQ,SX +1211-06900 America/Curacao CX -1025+10543 Indian/Christmas CY +3510+03322 Asia/Nicosia CZ,SK +5005+01426 Europe/Prague -DE +5230+01322 Europe/Berlin Germany - most locations +DE +5230+01322 Europe/Berlin Germany (most locations) DK +5540+01235 Europe/Copenhagen DO +1828-06954 America/Santo_Domingo DZ +3647+00303 Africa/Algiers -EC -0210-07950 America/Guayaquil mainland +EC -0210-07950 America/Guayaquil Ecuador (mainland) EC -0054-08936 Pacific/Galapagos Galápagos Islands EE +5925+02445 Europe/Tallinn EG +3003+03115 Africa/Cairo EH +2709-01312 Africa/El_Aaiun -ES +4024-00341 Europe/Madrid mainland -ES +3553-00519 Africa/Ceuta Ceuta & Melilla +ES +4024-00341 Europe/Madrid Spain (mainland) +ES +3553-00519 Africa/Ceuta Ceuta, Melilla ES +2806-01524 Atlantic/Canary Canary Islands FI,AX +6010+02458 Europe/Helsinki FJ -1808+17825 Pacific/Fiji FK -5142-05751 Atlantic/Stanley -FM +0725+15147 Pacific/Chuuk Chuuk (Truk) and Yap -FM +0658+15813 Pacific/Pohnpei Pohnpei (Ponape) +FM +0725+15147 Pacific/Chuuk Chuuk/Truk, Yap +FM +0658+15813 Pacific/Pohnpei Pohnpei/Ponape FM +0519+16259 Pacific/Kosrae Kosrae FO +6201-00646 Atlantic/Faroe FR +4852+00220 Europe/Paris @@ -171,10 +171,10 @@ GE +4143+04449 Asia/Tbilisi GF +0456-05220 America/Cayenne GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Godthab Greenland - most locations +GL +6411-05144 America/Godthab Greenland (most locations) GL +7646-01840 America/Danmarkshavn National Park (east coast) -GL +7029-02158 America/Scoresbysund Scoresbysund / Ittoqqortoormiit -GL +7634-06847 America/Thule Thule / Pituffik +GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit +GL +7634-06847 America/Thule Thule/Pituffik GR +3758+02343 Europe/Athens GS -5416-03632 Atlantic/South_Georgia GT +1438-09031 America/Guatemala @@ -185,10 +185,10 @@ HK +2217+11409 Asia/Hong_Kong HN +1406-08713 America/Tegucigalpa HT +1832-07220 America/Port-au-Prince HU +4730+01905 Europe/Budapest -ID -0610+10648 Asia/Jakarta Java & Sumatra -ID -0002+10920 Asia/Pontianak west & central Borneo -ID -0507+11924 Asia/Makassar east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor -ID -0232+14042 Asia/Jayapura west New Guinea (Irian Jaya) & Malukus (Moluccas) +ID -0610+10648 Asia/Jakarta Java, Sumatra +ID -0002+10920 Asia/Pontianak Borneo (west, central) +ID -0507+11924 Asia/Makassar Borneo (east, south), Sulawesi (Celebes), Bali, Nusa Tengarra, Timor (west) +ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya), Maluku/Moluccas IE +5320-00615 Europe/Dublin IL +314650+0351326 Asia/Jerusalem IN +2232+08822 Asia/Kolkata @@ -207,10 +207,10 @@ KI -0308-17105 Pacific/Enderbury Phoenix Islands KI +0152-15720 Pacific/Kiritimati Line Islands KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul -KZ +4315+07657 Asia/Almaty Kazakhstan - most locations -KZ +4448+06528 Asia/Qyzylorda Qyzylorda (Kyzylorda, Kzyl-Orda) -KZ +5017+05710 Asia/Aqtobe Aqtobe (Aktobe) -KZ +4431+05016 Asia/Aqtau Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau) +KZ +4315+07657 Asia/Almaty Kazakhstan (most locations) +KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda +KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe +KZ +4431+05016 Asia/Aqtau Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau KZ +5113+05121 Asia/Oral West Kazakhstan LB +3353+03530 Asia/Beirut LK +0656+07951 Asia/Colombo @@ -222,10 +222,10 @@ LY +3254+01311 Africa/Tripoli MA +3339-00735 Africa/Casablanca MC +4342+00723 Europe/Monaco MD +4700+02850 Europe/Chisinau -MH +0709+17112 Pacific/Majuro Marshall Islands - most locations +MH +0709+17112 Pacific/Majuro Marshall Islands (most locations) MH +0905+16720 Pacific/Kwajalein Kwajalein MM +1647+09610 Asia/Rangoon -MN +4755+10653 Asia/Ulaanbaatar Mongolia - most locations +MN +4755+10653 Asia/Ulaanbaatar Mongolia (most locations) MN +4801+09139 Asia/Hovd Bayan-Ãlgii, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar MO +2214+11335 Asia/Macau @@ -233,38 +233,38 @@ MQ +1436-06105 America/Martinique MT +3554+01431 Europe/Malta MU -2010+05730 Indian/Mauritius MV +0410+07330 Indian/Maldives -MX +1924-09909 America/Mexico_City Mexican Central Time - most locations +MX +1924-09909 America/Mexico_City Central Time MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatán MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo León, Tamaulipas, (away from US border) MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo León, Tamaulipas, (near US border) MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa -MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border -MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border +MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (away from US border) +MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (near US border) MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora MX +3232-11701 America/Tijuana Pacific Time US - Baja California -MX +2048-10515 America/Bahia_Banderas Mexican Central Time - BahÃa de Banderas -MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia -MY +0133+11020 Asia/Kuching Sabah & Sarawak -MZ,BI,BW,CD,MW,RW,ZM,ZW -2558+03235 Africa/Maputo Central Africa Time (UTC+2) +MX +2048-10515 America/Bahia_Banderas Central Time - BahÃa de Banderas +MY +0310+10142 Asia/Kuala_Lumpur Malaysia (peninsula) +MY +0133+11020 Asia/Kuching Sabah, Sarawak +MZ,BI,BW,CD,MW,RW,ZM,ZW -2558+03235 Africa/Maputo UTC+2 - Central Africa Time NA -2234+01706 Africa/Windhoek NC -2216+16627 Pacific/Noumea NF -2903+16758 Pacific/Norfolk -NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE +0627+00324 Africa/Lagos West Africa Time (UTC+1) +NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE +0627+00324 Africa/Lagos UTC+1 - West Africa Time NI +1209-08617 America/Managua NL +5222+00454 Europe/Amsterdam NO,SJ +5955+01045 Europe/Oslo NP +2743+08519 Asia/Kathmandu NR -0031+16655 Pacific/Nauru NU -1901-16955 Pacific/Niue -NZ,AQ -3652+17446 Pacific/Auckland New Zealand time +NZ,AQ -3652+17446 Pacific/Auckland New Zealand Time NZ -4357-17633 Pacific/Chatham Chatham Islands PA,KY +0858-07932 America/Panama PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby Papua New Guinea - most locations +PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most locations) PG -0613+15534 Pacific/Bougainville Bougainville PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi @@ -274,36 +274,36 @@ PN -2504-13005 Pacific/Pitcairn PR +182806-0660622 America/Puerto_Rico PS +3130+03428 Asia/Gaza Gaza Strip PS +313200+0350542 Asia/Hebron West Bank -PT +3843-00908 Europe/Lisbon mainland +PT +3843-00908 Europe/Lisbon Portugal (mainland) PT +3238-01654 Atlantic/Madeira Madeira Islands PT +3744-02540 Atlantic/Azores Azores PW +0720+13429 Pacific/Palau PY -2516-05740 America/Asuncion QA,BH +2517+05132 Asia/Qatar -RE,TF -2052+05528 Indian/Reunion Réunion, Crozet Is, Scattered Is +RE,TF -2052+05528 Indian/Reunion Réunion Island, Crozet Islands, Scattered Islands RO +4426+02606 Europe/Bucharest RS,BA,HR,ME,MK,SI +4450+02030 Europe/Belgrade RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad -RU +554521+0373704 Europe/Moscow Moscow+00 - west Russia +RU +554521+0373704 Europe/Moscow Moscow+00 - Russia (west) RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea -RU +5312+05009 Europe/Samara Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia +RU +5312+05009 Europe/Samara Moscow+01 - Samara, Udmurtia RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals -RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia +RU +5500+07324 Asia/Omsk Moscow+03 - Siberia (west) RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk -RU +5345+08707 Asia/Novokuznetsk Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo +RU +5345+08707 Asia/Novokuznetsk Moscow+04 - Kemerovo RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal -RU +5203+11328 Asia/Chita Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky +RU +5203+11328 Asia/Chita Moscow+05 - Zabaykalsky RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky -RU +5934+15048 Asia/Magadan Moscow+08 (Moscow+07 after 2014-10-26) - Magadan -RU +6728+15343 Asia/Srednekolymsk Moscow+08 - E Sakha, N Kuril Is -RU +5301+15839 Asia/Kamchatka Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka -RU +6445+17729 Asia/Anadyr Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea +RU +5934+15048 Asia/Magadan Moscow+07 - Magadan +RU +6728+15343 Asia/Srednekolymsk Moscow+08 - Sakha (east), North Kuril Islands +RU +5301+15839 Asia/Kamchatka Moscow+09 - Kamchatka +RU +6445+17729 Asia/Anadyr Moscow+09 - Bering Sea SA,KW,YE +2438+04643 Asia/Riyadh SB -0932+16012 Pacific/Guadalcanal SC -0440+05528 Indian/Mahe @@ -315,8 +315,8 @@ SV +1342-08912 America/El_Salvador SY +3330+03618 Asia/Damascus TC +2128-07108 America/Grand_Turk TD +1207+01503 Africa/Ndjamena -TF -492110+0701303 Indian/Kerguelen Kerguelen, St Paul I, Amsterdam I -TH,KH,LA,VN +1345+10031 Asia/Bangkok Indochina - most locations +TF -492110+0701303 Indian/Kerguelen Kerguelen, St Paul Island, Amsterdam Island +TH,KH,LA,VN +1345+10031 Asia/Bangkok Indochina (most locations) TJ +3835+06848 Asia/Dushanbe TK -0922-17114 Pacific/Fakaofo TL -0833+12535 Asia/Dili @@ -327,44 +327,44 @@ TR +4101+02858 Europe/Istanbul TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI +1039-06131 America/Port_of_Spain TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei -UA +5026+03031 Europe/Kiev Ukraine - most locations +UA +5026+03031 Europe/Kiev Ukraine (most locations) UA +4837+02218 Europe/Uzhgorod Ruthenia -UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk +UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) UM +1917+16637 Pacific/Wake Wake Island US +404251-0740023 America/New_York Eastern Time -US +421953-0830245 America/Detroit Eastern Time - Michigan - most locations -US +381515-0854534 America/Kentucky/Louisville Eastern Time - Kentucky - Louisville area -US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County -US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana - most locations -US +384038-0873143 America/Indiana/Vincennes Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties -US +410305-0863611 America/Indiana/Winamac Eastern Time - Indiana - Pulaski County -US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana - Crawford County -US +382931-0871643 America/Indiana/Petersburg Eastern Time - Indiana - Pike County -US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana - Switzerland County +US +421953-0830245 America/Detroit Eastern Time - Michigan (most locations) +US +381515-0854534 America/Kentucky/Louisville Eastern Time - Kentucky (Louisville area) +US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky (Wayne) +US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana (most locations) +US +384038-0873143 America/Indiana/Vincennes Eastern Time - Indiana (Daviess, Dubois, Knox, Martin) +US +410305-0863611 America/Indiana/Winamac Eastern Time - Indiana (Pulaski) +US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana (Crawford) +US +382931-0871643 America/Indiana/Petersburg Eastern Time - Indiana (Pike) +US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana (Switzerland) US +415100-0873900 America/Chicago Central Time -US +375711-0864541 America/Indiana/Tell_City Central Time - Indiana - Perry County -US +411745-0863730 America/Indiana/Knox Central Time - Indiana - Starke County -US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties -US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County -US +465042-1012439 America/North_Dakota/New_Salem Central Time - North Dakota - Morton County (except Mandan area) -US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County +US +375711-0864541 America/Indiana/Tell_City Central Time - Indiana (Perry) +US +411745-0863730 America/Indiana/Knox Central Time - Indiana (Starke) +US +450628-0873651 America/Menominee Central Time - Michigan (Dickinson, Gogebic, Iron, Menominee) +US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota (Oliver) +US +465042-1012439 America/North_Dakota/New_Salem Central Time - North Dakota (Morton except Mandan area) +US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota (Mercer) US +394421-1045903 America/Denver Mountain Time -US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon +US +433649-1161209 America/Boise Mountain Time - Idaho (south), Oregon (east) US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo) US +340308-1181434 America/Los_Angeles Pacific Time US +611305-1495401 America/Anchorage Alaska Time -US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle -US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle +US +581807-1342511 America/Juneau Alaska Time - Alaska Panhandle +US +571035-1351807 America/Sitka Alaska Time - Alaska Panhandle (southeast) US +550737-1313435 America/Metlakatla Alaska Time - Annette Island -US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck -US +643004-1652423 America/Nome Alaska Time - west Alaska +US +593249-1394338 America/Yakutat Alaska Time - Alaska Panhandle (neck) +US +643004-1652423 America/Nome Alaska Time - Alaska (west) US +515248-1763929 America/Adak Aleutian Islands -US,UM +211825-1575130 Pacific/Honolulu Hawaii time +US,UM +211825-1575130 Pacific/Honolulu Hawaii Time UY -3453-05611 America/Montevideo -UZ +3940+06648 Asia/Samarkand west Uzbekistan -UZ +4120+06918 Asia/Tashkent east Uzbekistan +UZ +3940+06648 Asia/Samarkand Uzbekistan (west) +UZ +4120+06918 Asia/Tashkent Uzbekistan (east) VE +1030-06656 America/Caracas -VN +1045+10640 Asia/Ho_Chi_Minh south Vietnam +VN +1045+10640 Asia/Ho_Chi_Minh Vietnam (south) VU -1740+16825 Pacific/Efate WF -1318-17610 Pacific/Wallis WS -1350-17144 Pacific/Apia
This one will require a bit more thinking. The original design goal was to run 'tzselect' on a traditional 24x80 alphanumeric screen. It was important to keep the commentary short, so as to not overrun the columns. Switching to a more-consistent layout convention would probably make us go over the limit. In this way of selection, it's more important for the alternatives to be easy to understand, than for them to be consistent. Of course consistency and ease of understanding often go hand in hand, but not always. Perhaps you have a different selector in mind, and in that case we might need to consider having a portable scheme that will work with both kinds of selectors (albeit perhaps not as nicely as a scheme tailored for your particular selector). Am I right in my guess?
On 02/22/2016 01:05 AM, Paul Eggert wrote:
This one will require a bit more thinking.
The original design goal was to run 'tzselect' on a traditional 24x80 alphanumeric screen. It was important to keep the commentary short, so as to not overrun the columns. Switching to a more-consistent layout convention would probably make us go over the limit.
It doesn't, see below.
In this way of selection, it's more important for the alternatives to be easy to understand, than for them to be consistent. Of course consistency and ease of understanding often go hand in hand, but not always.
Perhaps you have a different selector in mind, and in that case we might need to consider having a portable scheme that will work with both kinds of selectors (albeit perhaps not as nicely as a scheme tailored for your particular selector). Am I right in my guess?
Hello Paul, You are correct that I have written a tzselect style application using a 'dialog' UI. However, my submission is not tailored to it. I need both versions to work well. Besides, I would not knowingly make a submission to benefit my needs at the detriment of a project. The reasons I stated, and the examples given, are the true motivation of the patch. Using the same format to represent different data types makes it impossible to reliably interpret the information. Throughout development I have been extensively testing and comparing both tzselect applications, which is how the bugs in the reference implementation were discovered. String length has been taken into consideration in defining the zone table comment standard format. The only part of the definition that has significant impact on length is: * Use full words in favor of abbreviations. It is intentionally worded to not exclude the use of abbreviations. As it turns out, no abbreviations were need to prevent (any further) breaking of 80 columns (the current comments are already broken). So lets evaluate the impact of the zone table comments on the shell 'select' function. First lets define the scope of the discussion as limited to the third round of tzselect input, choosing a local region, using the zone1970.tab file. There are only two countries with more than 24 local regions which could use a two column select menu: US and CA with 29 and 28 regions respectively. To insure two column capability the strings must be limited to 35 characters. For single column menus the string max is 76 characters. The current zone table comments for US and CA far exceed the ability to use a two column select menu. Using the standard format decreases the longest string for US and stays the same for CA: US: current longest comment 71 characters, patched 61 CA: current longest comment 75 characters, patched 75 The longest comment in the zone1970.tab file is for MX Durango: current 84 patched 79 The patch reduces MX Durango's length, but still exceeds the 76 character limit. This is the contents fault, not the format. Addressing the length issues is on my todo list, but that needs to be a separate submission. Summery: most of the comments require a limit of 76 character, the two exceptions, US and CA, far exceed the 35 character limit to facilitate two columns. In other words, unless there are drastic changes in the content of the US and CA comments, then all comment strings have a 76 character max. Both with and without this patch there is only one comment in violation, MX Durango. PATCH COMMENT LENGTH STATS 149 (74%) reduced or unchanged 41 (20%) less than 5 character increase 11 (05%) less than 18 character increase Attached is a head to head comparison of the current zone1979.tab comments and the patched versions.
J William Piggott wrote:
As it turns out, no abbreviations were need to prevent (any further) breaking of 80 columns (the current comments are already broken).
OK, but I'd rather fix the comments rather than leave them broken.
There are only two countries with more than 24 local regions which could use a two column select menu: US and CA with 29 and 28 regions respectively.
There's also Russia, which in the current draft has 24 regions; this is one more line than fits comfortably on a 24×80 screen with a prompt line.
The current zone table comments for US and CA far exceed the ability to use a two column select menu.... The patch reduces MX Durango's length, but still exceeds the 76 character limit. This is the contents fault, not the format.
I think these all used to fit, and we can reword them to fit now. I looked through that patch and installed a good many of the changes, and reformatted the result so that tzselect menus fit on 24×80 again, at least with 'bash'. Some of the notation I found confusing (e.g., the ", (" syntax) so I substituted for it. This version is not 100% consistent, as it uses abbreviations more often in menus when the menus would otherwise fail to fit. Please see the attached patch, which I've installed on the experimental github repository.
On 02/24/2016 04:07 AM, Paul Eggert wrote:
J William Piggott wrote:
As it turns out, no abbreviations were need to prevent (any further) breaking of 80 columns (the current comments are already broken).
OK, but I'd rather fix the comments rather than leave them broken.
I anticipated push back against such an extensive reduction in content, so I was going to submit them as a separate patch set. Establishing a standard format first seemed like the best sequence. I am glad that you made the changes. It is great for tzselect to have proper paging now, good job.
Some of the notation I found confusing (e.g., the ", (" syntax) ...
I wasn't completely satisfied with that either. I was looking for a terse solution to issues like below; does 'west' apply to Sulawesi/Celebes, Bali, Nusa Tengarra? Does 'E' apply to 'AB'? What if it did (as with Coahuila)? ... and so on. Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west) Mountain - AB, BC (E), SK (W) Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) Newfoundland, Labrador (southeast) Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (all far from US) I find the 'all' solution confusing. So I tried a different approach in my current submission with the subject line: [PATCH 09/10] Delimit sub-regions with semicolons To remove ambiguity always delimit any sub-region with a semicolon, whether it applies to a group of regions or a single region. The perfect solution to resolve the ambiguity is to add more words, but considering that the zone table comments have length restrictions, I think the above makes it reasonably clear without adding any additional characters.
This version is not 100% consistent, as it uses abbreviations more often in menus when the menus would otherwise fail to fit.
I don't see using abbreviations when necessary as being inconsistent. It just improves readability and aesthetics to favor full spellings whenever possible.
Please see the attached patch, which I've installed on the experimental github repository.
I think it mostly looks good, this patch set has a few additions.
* zone.tab, zone1970.tab Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 4 ++-- zone1970.tab | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zone.tab b/zone.tab index dac730a..6442c4e 100644 --- a/zone.tab +++ b/zone.tab @@ -111,8 +111,8 @@ CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most) CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) -CA +4339-07923 America/Toronto Eastern - ON & QC (most locations) -CA +4901-08816 America/Nipigon Eastern - ON & QC (no DST 1967-73) +CA +4339-07923 America/Toronto Eastern - ON, QC (most locations) +CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) CA +6344-06828 America/Iqaluit Eastern - NU (most east locations) CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) diff --git a/zone1970.tab b/zone1970.tab index 114f157..9559468 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -108,8 +108,8 @@ CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most) CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) -CA +4339-07923 America/Toronto Eastern - ON & QC (most locations) -CA +4901-08816 America/Nipigon Eastern - ON & QC (no DST 1967-73) +CA +4339-07923 America/Toronto Eastern - ON, QC (most locations) +CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) CA +6344-06828 America/Iqaluit Eastern - NU (most east locations) CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung)
* zone.tab, zone1970.tab: Implement this. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 2 +- zone1970.tab | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zone.tab b/zone.tab index 6442c4e..70ddb5c 100644 --- a/zone.tab +++ b/zone.tab @@ -116,7 +116,7 @@ CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) CA +6344-06828 America/Iqaluit Eastern - NU (most east locations) CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) -CA +484531-0913718 America/Atikokan EST - ON (Atikokan), etc. +CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) CA +4953-09709 America/Winnipeg Central - ON (west), Manitoba CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances) CA +744144-0944945 America/Resolute Central - NU (Resolute) diff --git a/zone1970.tab b/zone1970.tab index 9559468..dd4ead4 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -113,7 +113,7 @@ CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) CA +6344-06828 America/Iqaluit Eastern - NU (most east locations) CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) -CA +484531-0913718 America/Atikokan EST - ON (Atikokan), etc. +CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) CA +4953-09709 America/Winnipeg Central - ON (west), Manitoba CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances) CA +744144-0944945 America/Resolute Central - NU (Resolute)
Removing Labrador from America/St_Johns left 'Atlantic - Labrador (most)' dangling with no alternate. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 4 ++-- zone1970.tab | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zone.tab b/zone.tab index 70ddb5c..6652374 100644 --- a/zone.tab +++ b/zone.tab @@ -105,11 +105,11 @@ BT +2728+08939 Asia/Thimphu BW -2439+02555 Africa/Gaborone BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize -CA +4734-05243 America/St_Johns Newfoundland Time +CA +4734-05243 America/St_Johns Newfoundland, Labrador (southeast) CA +4439-06336 America/Halifax Atlantic - NS (most locations), PE CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick -CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most) +CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) CA +4339-07923 America/Toronto Eastern - ON, QC (most locations) CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) diff --git a/zone1970.tab b/zone1970.tab index dd4ead4..eb985c3 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -102,11 +102,11 @@ BS +2505-07721 America/Nassau BT +2728+08939 Asia/Thimphu BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize -CA +4734-05243 America/St_Johns Newfoundland Time +CA +4734-05243 America/St_Johns Newfoundland, Labrador (southeast) CA +4439-06336 America/Halifax Atlantic - NS (most locations), PE CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick -CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most) +CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) CA +4339-07923 America/Toronto Eastern - ON, QC (most locations) CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73)
This change also facilitates fixing: Michigan (most) and Labrador (most) * zone.tab, zone1970.tab: Zone table comments must be of limited length to accommodate paging; save characters by replacing 'locations' with 'areas'. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 50 +++++++++++++++++++++++++------------------------- zone1970.tab | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/zone.tab b/zone.tab index 6652374..2ffeb62 100644 --- a/zone.tab +++ b/zone.tab @@ -41,7 +41,7 @@ AQ -690022+0393524 Antarctica/Syowa Syowa AQ -720041+0023206 Antarctica/Troll Troll AQ -7824+10654 Antarctica/Vostok Vostok AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) -AR -3124-06411 America/Argentina/Cordoba Argentina (most locations: CB, CC, CN, ER, FM, MN, SE, SF) +AR -3124-06411 America/Argentina/Cordoba Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucuman (TM) @@ -56,16 +56,16 @@ AS -1416-17042 Pacific/Pago_Pago AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island AU -5430+15857 Antarctica/Macquarie Macquarie Island -AU -4253+14719 Australia/Hobart Tasmania (most locations) +AU -4253+14719 Australia/Hobart Tasmania (most areas) AU -3956+14352 Australia/Currie Tasmania (King Island) AU -3749+14458 Australia/Melbourne Victoria -AU -3352+15113 Australia/Sydney New South Wales (most locations) +AU -3352+15113 Australia/Sydney New South Wales (most areas) AU -3157+14127 Australia/Broken_Hill New South Wales (Yancowinna) -AU -2728+15302 Australia/Brisbane Queensland (most locations) +AU -2728+15302 Australia/Brisbane Queensland (most areas) AU -2016+14900 Australia/Lindeman Queensland (Whitsunday Islands) AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory -AU -3157+11551 Australia/Perth Western Australia (most locations) +AU -3157+11551 Australia/Perth Western Australia (most areas) AU -3143+12852 Australia/Eucla Western Australia (Eucla) AW +1230-06958 America/Aruba AX +6006+01957 Europe/Mariehamn @@ -106,22 +106,22 @@ BW -2439+02555 Africa/Gaborone BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize CA +4734-05243 America/St_Johns Newfoundland, Labrador (southeast) -CA +4439-06336 America/Halifax Atlantic - NS (most locations), PE +CA +4439-06336 America/Halifax Atlantic - NS (most areas), PE CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) -CA +4339-07923 America/Toronto Eastern - ON, QC (most locations) +CA +4339-07923 America/Toronto Eastern - ON, QC (most areas) CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) -CA +6344-06828 America/Iqaluit Eastern - NU (most east locations) +CA +6344-06828 America/Iqaluit Eastern - NU (most east areas) CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) CA +4953-09709 America/Winnipeg Central - ON (west), Manitoba CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances) CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) -CA +5024-10439 America/Regina CST - SK (most locations) +CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) CA +5333-11328 America/Edmonton Mountain - AB, BC (E), SK (W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) @@ -130,7 +130,7 @@ CA +682059-1334300 America/Inuvik Mountain - NT (west) CA +4906-11631 America/Creston MST - BC (Creston) CA +5946-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) CA +5848-12242 America/Fort_Nelson MST - BC (Ft Nelson) -CA +4916-12307 America/Vancouver Pacific - BC (most locations) +CA +4916-12307 America/Vancouver Pacific - BC (most areas) CA +6043-13503 America/Whitehorse Pacific - Yukon (south) CA +6404-13925 America/Dawson Pacific - Yukon (north) CC -1210+09655 Indian/Cocos @@ -141,7 +141,7 @@ CG -0416+01517 Africa/Brazzaville CH +4723+00832 Europe/Zurich CI +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago Chile (most locations) +CL -3327-07040 America/Santiago Chile (most areas) CL -2709-10926 Pacific/Easter Easter Island CM +0403+00942 Africa/Douala CN +3114+12128 Asia/Shanghai Beijing Time @@ -154,7 +154,7 @@ CW +1211-06900 America/Curacao CX -1025+10543 Indian/Christmas CY +3510+03322 Asia/Nicosia CZ +5005+01426 Europe/Prague -DE +5230+01322 Europe/Berlin Germany (most locations) +DE +5230+01322 Europe/Berlin Germany (most areas) DE +4742+00841 Europe/Busingen Busingen DJ +1136+04309 Africa/Djibouti DK +5540+01235 Europe/Copenhagen @@ -187,7 +187,7 @@ GF +0456-05220 America/Cayenne GG +4927-00232 Europe/Guernsey GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Godthab Greenland (most locations) +GL +6411-05144 America/Godthab Greenland (most areas) GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit GL +7634-06847 America/Thule Thule/Pituffik @@ -235,7 +235,7 @@ KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul KW +2920+04759 Asia/Kuwait KY +1918-08123 America/Cayman -KZ +4315+07657 Asia/Almaty Kazakhstan (most locations) +KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe KZ +4431+05016 Asia/Aqtau Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau @@ -257,12 +257,12 @@ MD +4700+02850 Europe/Chisinau ME +4226+01916 Europe/Podgorica MF +1804-06305 America/Marigot MG -1855+04731 Indian/Antananarivo -MH +0709+17112 Pacific/Majuro Marshall Islands (most locations) +MH +0709+17112 Pacific/Majuro Marshall Islands (most areas) MH +0905+16720 Pacific/Kwajalein Kwajalein MK +4159+02126 Europe/Skopje ML +1239-00800 Africa/Bamako MM +1647+09610 Asia/Rangoon -MN +4755+10653 Asia/Ulaanbaatar Mongolia (most locations) +MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar MO +2214+11335 Asia/Macau @@ -299,7 +299,7 @@ NO +5955+01045 Europe/Oslo NP +2743+08519 Asia/Kathmandu NR -0031+16655 Pacific/Nauru NU -1901-16955 Pacific/Niue -NZ -3652+17446 Pacific/Auckland New Zealand (most locations) +NZ -3652+17446 Pacific/Auckland New Zealand (most areas) NZ -4357-17633 Pacific/Chatham Chatham Islands OM +2336+05835 Asia/Muscat PA +0858-07932 America/Panama @@ -307,7 +307,7 @@ PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most locations) +PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas) PG -0613+15534 Pacific/Bougainville Bougainville PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi @@ -388,35 +388,35 @@ TT +1039-06131 America/Port_of_Spain TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei TZ -0648+03917 Africa/Dar_es_Salaam -UA +5026+03031 Europe/Kiev Ukraine (most locations) +UA +5026+03031 Europe/Kiev Ukraine (most areas) UA +4837+02218 Europe/Uzhgorod Ruthenia UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) UG +0019+03225 Africa/Kampala UM +1645-16931 Pacific/Johnston Johnston Atoll UM +2813-17722 Pacific/Midway Midway Islands UM +1917+16637 Pacific/Wake Wake Island -US +404251-0740023 America/New_York Eastern (most locations) -US +421953-0830245 America/Detroit Eastern - Michigan (most) +US +404251-0740023 America/New_York Eastern (most areas) +US +421953-0830245 America/Detroit Eastern - Michigan (most areas) US +381515-0854534 America/Kentucky/Louisville Eastern - KY (Louisville area) US +364947-0845057 America/Kentucky/Monticello Eastern - KY (Wayne) -US +394606-0860929 America/Indiana/Indianapolis Eastern - IN (most locations) +US +394606-0860929 America/Indiana/Indianapolis Eastern - IN (most areas) US +384038-0873143 America/Indiana/Vincennes Eastern - IN (Da, Du, K, Mn) US +410305-0863611 America/Indiana/Winamac Eastern - IN (Pulaski) US +382232-0862041 America/Indiana/Marengo Eastern - IN (Crawford) US +382931-0871643 America/Indiana/Petersburg Eastern - IN (Pike) US +384452-0850402 America/Indiana/Vevay Eastern - IN (Switzerland) -US +415100-0873900 America/Chicago Central (most locations) +US +415100-0873900 America/Chicago Central (most areas) US +375711-0864541 America/Indiana/Tell_City Central - IN (Perry) US +411745-0863730 America/Indiana/Knox Central - IN (Starke) US +450628-0873651 America/Menominee Central - MI (west) US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) -US +394421-1045903 America/Denver Mountain (most locations) +US +394421-1045903 America/Denver Mountain (most areas) US +433649-1161209 America/Boise Mountain - ID (S), OR (E) US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) US +340308-1181434 America/Los_Angeles Pacific -US +611305-1495401 America/Anchorage Alaska (most locations) +US +611305-1495401 America/Anchorage Alaska (most areas) US +581807-1342511 America/Juneau Alaska - Juneau area US +571035-1351807 America/Sitka Alaska - Sitka area US +550737-1313435 America/Metlakatla Alaska - Annette I diff --git a/zone1970.tab b/zone1970.tab index eb985c3..1300f0b 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -48,7 +48,7 @@ AQ -690022+0393524 Antarctica/Syowa Syowa AQ -720041+0023206 Antarctica/Troll Troll AQ -7824+10654 Antarctica/Vostok Vostok AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) -AR -3124-06411 America/Argentina/Cordoba Argentina (most locations: CB, CC, CN, ER, FM, MN, SE, SF) +AR -3124-06411 America/Argentina/Cordoba Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucumán (TM) @@ -63,16 +63,16 @@ AS,UM -1416-17042 Pacific/Pago_Pago Samoa, Midway AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island AU -5430+15857 Antarctica/Macquarie Macquarie Island -AU -4253+14719 Australia/Hobart Tasmania (most locations) +AU -4253+14719 Australia/Hobart Tasmania (most areas) AU -3956+14352 Australia/Currie Tasmania (King Island) AU -3749+14458 Australia/Melbourne Victoria -AU -3352+15113 Australia/Sydney New South Wales (most locations) +AU -3352+15113 Australia/Sydney New South Wales (most areas) AU -3157+14127 Australia/Broken_Hill New South Wales (Yancowinna) -AU -2728+15302 Australia/Brisbane Queensland (most locations) +AU -2728+15302 Australia/Brisbane Queensland (most areas) AU -2016+14900 Australia/Lindeman Queensland (Whitsunday Islands) AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory -AU -3157+11551 Australia/Perth Western Australia (most locations) +AU -3157+11551 Australia/Perth Western Australia (most areas) AU -3143+12852 Australia/Eucla Western Australia (Eucla) AZ +4023+04951 Asia/Baku BB +1306-05937 America/Barbados @@ -103,22 +103,22 @@ BT +2728+08939 Asia/Thimphu BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize CA +4734-05243 America/St_Johns Newfoundland, Labrador (southeast) -CA +4439-06336 America/Halifax Atlantic - NS (most locations), PE +CA +4439-06336 America/Halifax Atlantic - NS (most areas), PE CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) -CA +4339-07923 America/Toronto Eastern - ON, QC (most locations) +CA +4339-07923 America/Toronto Eastern - ON, QC (most areas) CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) -CA +6344-06828 America/Iqaluit Eastern - NU (most east locations) +CA +6344-06828 America/Iqaluit Eastern - NU (most east areas) CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) CA +4953-09709 America/Winnipeg Central - ON (west), Manitoba CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances) CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) -CA +5024-10439 America/Regina CST - SK (most locations) +CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) CA +5333-11328 America/Edmonton Mountain - AB, BC (E), SK (W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) @@ -127,14 +127,14 @@ CA +682059-1334300 America/Inuvik Mountain - NT (west) CA +4906-11631 America/Creston MST - BC (Creston) CA +5946-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) CA +5848-12242 America/Fort_Nelson MST - BC (Ft Nelson) -CA +4916-12307 America/Vancouver Pacific - BC (most locations) +CA +4916-12307 America/Vancouver Pacific - BC (most areas) CA +6043-13503 America/Whitehorse Pacific - Yukon (south) CA +6404-13925 America/Dawson Pacific - Yukon (north) CC -1210+09655 Indian/Cocos CH,DE,LI +4723+00832 Europe/Zurich Swiss time CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago Chile (most locations) +CL -3327-07040 America/Santiago Chile (most areas) CL -2709-10926 Pacific/Easter Easter Island CN +3114+12128 Asia/Shanghai Beijing Time CN +4348+08735 Asia/Urumqi Xinjiang Time @@ -146,7 +146,7 @@ CW,AW,BQ,SX +1211-06900 America/Curacao CX -1025+10543 Indian/Christmas CY +3510+03322 Asia/Nicosia CZ,SK +5005+01426 Europe/Prague -DE +5230+01322 Europe/Berlin Germany (most locations) +DE +5230+01322 Europe/Berlin Germany (most areas) DK +5540+01235 Europe/Copenhagen DO +1828-06954 America/Santo_Domingo DZ +3647+00303 Africa/Algiers @@ -171,7 +171,7 @@ GE +4143+04449 Asia/Tbilisi GF +0456-05220 America/Cayenne GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Godthab Greenland (most locations) +GL +6411-05144 America/Godthab Greenland (most areas) GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit GL +7634-06847 America/Thule Thule/Pituffik @@ -207,7 +207,7 @@ KI -0308-17105 Pacific/Enderbury Phoenix Islands KI +0152-15720 Pacific/Kiritimati Line Islands KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul -KZ +4315+07657 Asia/Almaty Kazakhstan (most locations) +KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe KZ +4431+05016 Asia/Aqtau Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau @@ -222,10 +222,10 @@ LY +3254+01311 Africa/Tripoli MA +3339-00735 Africa/Casablanca MC +4342+00723 Europe/Monaco MD +4700+02850 Europe/Chisinau -MH +0709+17112 Pacific/Majuro Marshall Islands (most locations) +MH +0709+17112 Pacific/Majuro Marshall Islands (most areas) MH +0905+16720 Pacific/Kwajalein Kwajalein MM +1647+09610 Asia/Rangoon -MN +4755+10653 Asia/Ulaanbaatar Mongolia (most locations) +MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) MN +4801+09139 Asia/Hovd Bayan-Ãlgii, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar MO +2214+11335 Asia/Macau @@ -264,7 +264,7 @@ PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most locations) +PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas) PG -0613+15534 Pacific/Bougainville Bougainville PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi @@ -319,7 +319,7 @@ SY +3330+03618 Asia/Damascus TC +2128-07108 America/Grand_Turk TD +1207+01503 Africa/Ndjamena TF -492110+0701303 Indian/Kerguelen Kerguelen, St Paul Island, Amsterdam Island -TH,KH,LA,VN +1345+10031 Asia/Bangkok Indochina (most locations) +TH,KH,LA,VN +1345+10031 Asia/Bangkok Indochina (most areas) TJ +3835+06848 Asia/Dushanbe TK -0922-17114 Pacific/Fakaofo TL -0833+12535 Asia/Dili @@ -330,32 +330,32 @@ TR +4101+02858 Europe/Istanbul TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI +1039-06131 America/Port_of_Spain TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei -UA +5026+03031 Europe/Kiev Ukraine (most locations) +UA +5026+03031 Europe/Kiev Ukraine (most areas) UA +4837+02218 Europe/Uzhgorod Ruthenia UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) UM +1917+16637 Pacific/Wake Wake Island -US +404251-0740023 America/New_York Eastern (most locations) -US +421953-0830245 America/Detroit Eastern - Michigan (most) +US +404251-0740023 America/New_York Eastern (most areas) +US +421953-0830245 America/Detroit Eastern - Michigan (most areas) US +381515-0854534 America/Kentucky/Louisville Eastern - KY (Louisville area) US +364947-0845057 America/Kentucky/Monticello Eastern - KY (Wayne) -US +394606-0860929 America/Indiana/Indianapolis Eastern - IN (most locations) +US +394606-0860929 America/Indiana/Indianapolis Eastern - IN (most areas) US +384038-0873143 America/Indiana/Vincennes Eastern - IN (Da, Du, K, Mn) US +410305-0863611 America/Indiana/Winamac Eastern - IN (Pulaski) US +382232-0862041 America/Indiana/Marengo Eastern - IN (Crawford) US +382931-0871643 America/Indiana/Petersburg Eastern - IN (Pike) US +384452-0850402 America/Indiana/Vevay Eastern - IN (Switzerland) -US +415100-0873900 America/Chicago Central (most locations) +US +415100-0873900 America/Chicago Central (most areas) US +375711-0864541 America/Indiana/Tell_City Central - IN (Perry) US +411745-0863730 America/Indiana/Knox Central - IN (Starke) US +450628-0873651 America/Menominee Central - MI (west) US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) -US +394421-1045903 America/Denver Mountain (most locations) +US +394421-1045903 America/Denver Mountain (most areas) US +433649-1161209 America/Boise Mountain - ID (S), OR (E) US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) US +340308-1181434 America/Los_Angeles Pacific -US +611305-1495401 America/Anchorage Alaska (most locations) +US +611305-1495401 America/Anchorage Alaska (most areas) US +581807-1342511 America/Juneau Alaska - Juneau area US +571035-1351807 America/Sitka Alaska - Sitka area US +550737-1313435 America/Metlakatla Alaska - Annette I
* zone.tab, zone1970.tab: Be consistent with use of 'MI'. 'MI (west)' was ambiguous. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 4 ++-- zone1970.tab | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zone.tab b/zone.tab index 2ffeb62..11594a2 100644 --- a/zone.tab +++ b/zone.tab @@ -396,7 +396,7 @@ UM +1645-16931 Pacific/Johnston Johnston Atoll UM +2813-17722 Pacific/Midway Midway Islands UM +1917+16637 Pacific/Wake Wake Island US +404251-0740023 America/New_York Eastern (most areas) -US +421953-0830245 America/Detroit Eastern - Michigan (most areas) +US +421953-0830245 America/Detroit Eastern - MI (most areas) US +381515-0854534 America/Kentucky/Louisville Eastern - KY (Louisville area) US +364947-0845057 America/Kentucky/Monticello Eastern - KY (Wayne) US +394606-0860929 America/Indiana/Indianapolis Eastern - IN (most areas) @@ -408,7 +408,7 @@ US +384452-0850402 America/Indiana/Vevay Eastern - IN (Switzerland) US +415100-0873900 America/Chicago Central (most areas) US +375711-0864541 America/Indiana/Tell_City Central - IN (Perry) US +411745-0863730 America/Indiana/Knox Central - IN (Starke) -US +450628-0873651 America/Menominee Central - MI (west) +US +450628-0873651 America/Menominee Central - MI (Wisconsin border) US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) diff --git a/zone1970.tab b/zone1970.tab index 1300f0b..86fba93 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -335,7 +335,7 @@ UA +4837+02218 Europe/Uzhgorod Ruthenia UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) UM +1917+16637 Pacific/Wake Wake Island US +404251-0740023 America/New_York Eastern (most areas) -US +421953-0830245 America/Detroit Eastern - Michigan (most areas) +US +421953-0830245 America/Detroit Eastern - MI (most areas) US +381515-0854534 America/Kentucky/Louisville Eastern - KY (Louisville area) US +364947-0845057 America/Kentucky/Monticello Eastern - KY (Wayne) US +394606-0860929 America/Indiana/Indianapolis Eastern - IN (most areas) @@ -347,7 +347,7 @@ US +384452-0850402 America/Indiana/Vevay Eastern - IN (Switzerland) US +415100-0873900 America/Chicago Central (most areas) US +375711-0864541 America/Indiana/Tell_City Central - IN (Perry) US +411745-0863730 America/Indiana/Knox Central - IN (Starke) -US +450628-0873651 America/Menominee Central - MI (west) +US +450628-0873651 America/Menominee Central - MI (Wisconsin border) US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer)
* zone.tab, zone1970.tab: Implement this. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 2 +- zone1970.tab | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zone.tab b/zone.tab index 11594a2..009c5cf 100644 --- a/zone.tab +++ b/zone.tab @@ -413,7 +413,7 @@ US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) -US +433649-1161209 America/Boise Mountain - ID (S), OR (E) +US +433649-1161209 America/Boise Mountain - ID (south), OR (east) US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) diff --git a/zone1970.tab b/zone1970.tab index 86fba93..b32297d 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -352,7 +352,7 @@ US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) -US +433649-1161209 America/Boise Mountain - ID (S), OR (E) +US +433649-1161209 America/Boise Mountain - ID (south), OR (east) US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas)
* zone.tab, zone1970.tab: Implement this. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 2 +- zone1970.tab | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zone.tab b/zone.tab index 009c5cf..367a68a 100644 --- a/zone.tab +++ b/zone.tab @@ -419,7 +419,7 @@ US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) US +581807-1342511 America/Juneau Alaska - Juneau area US +571035-1351807 America/Sitka Alaska - Sitka area -US +550737-1313435 America/Metlakatla Alaska - Annette I +US +550737-1313435 America/Metlakatla Alaska - Annette Island US +593249-1394338 America/Yakutat Alaska - Yakutat US +643004-1652423 America/Nome Alaska (west) US +515248-1763929 America/Adak Aleutian Islands diff --git a/zone1970.tab b/zone1970.tab index b32297d..31671d1 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -358,7 +358,7 @@ US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) US +581807-1342511 America/Juneau Alaska - Juneau area US +571035-1351807 America/Sitka Alaska - Sitka area -US +550737-1313435 America/Metlakatla Alaska - Annette I +US +550737-1313435 America/Metlakatla Alaska - Annette Island US +593249-1394338 America/Yakutat Alaska - Yakutat US +643004-1652423 America/Nome Alaska (west) US +515248-1763929 America/Adak Aleutian Islands
* zone.tab, zone1970.tab: Implement this. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 2 +- zone1970.tab | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zone.tab b/zone.tab index 367a68a..298e8f7 100644 --- a/zone.tab +++ b/zone.tab @@ -347,7 +347,7 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River RU +4658+14242 Asia/Sakhalin MSK+07 - Sakhalin Island RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+07 - Magadan -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E), N Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E), North Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea RW -0157+03004 Africa/Kigali diff --git a/zone1970.tab b/zone1970.tab index 31671d1..fc81bcb 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -304,7 +304,7 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River RU +4658+14242 Asia/Sakhalin MSK+07 - Sakhalin Island RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+07 - Magadan -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E), N Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E), North Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea SA,KW,YE +2438+04643 Asia/Riyadh
To remove ambiguity always delimit any sub-region with a semicolon, whether it applies to a group of regions or a single region. * zone.tab, zone1970.tab: Implement this. Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 22 +++++++++++----------- zone1970.tab | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/zone.tab b/zone.tab index 298e8f7..69a69c5 100644 --- a/zone.tab +++ b/zone.tab @@ -45,7 +45,7 @@ AR -3124-06411 America/Argentina/Cordoba Argentina (most areas: CB, CC, CN, ER, AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucuman (TM) -AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH) +AR -2828-06547 America/Argentina/Catamarca Catamarca (CT); Chubut (CH) AR -2926-06651 America/Argentina/La_Rioja La Rioja (LR) AR -3132-06831 America/Argentina/San_Juan San Juan (SJ) AR -3253-06849 America/Argentina/Mendoza Mendoza (MZ) @@ -85,7 +85,7 @@ BN +0456+11455 Asia/Brunei BO -1630-06809 America/La_Paz BQ +120903-0681636 America/Kralendijk BR -0351-03225 America/Noronha Atlantic islands -BR -0127-04829 America/Belem Para (east), Amapa +BR -0127-04829 America/Belem Para (east); Amapa BR -0343-03830 America/Fortaleza Brazil (northeast: MA, PI, CE, RN, PB) BR -0803-03454 America/Recife Pernambuco BR -0712-04812 America/Araguaina Tocantins @@ -105,8 +105,8 @@ BT +2728+08939 Asia/Thimphu BW -2439+02555 Africa/Gaborone BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize -CA +4734-05243 America/St_Johns Newfoundland, Labrador (southeast) -CA +4439-06336 America/Halifax Atlantic - NS (most areas), PE +CA +4734-05243 America/St_Johns Newfoundland; Labrador (southeast) +CA +4439-06336 America/Halifax Atlantic - NS (most areas); PE CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) @@ -117,13 +117,13 @@ CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) CA +6344-06828 America/Iqaluit Eastern - NU (most east areas) CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) -CA +4953-09709 America/Winnipeg Central - ON (west), Manitoba +CA +4953-09709 America/Winnipeg Central - ON (west); Manitoba CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances) CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) -CA +5333-11328 America/Edmonton Mountain - AB, BC (E), SK (W) +CA +5333-11328 America/Edmonton Mountain - AB; BC (E); SK (W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) CA +6227-11421 America/Yellowknife Mountain - NT (central) CA +682059-1334300 America/Inuvik Mountain - NT (west) @@ -208,8 +208,8 @@ HT +1832-07220 America/Port-au-Prince HU +4730+01905 Europe/Budapest ID -0610+10648 Asia/Jakarta Java, Sumatra ID -0002+10920 Asia/Pontianak Borneo (west, central) -ID -0507+11924 Asia/Makassar Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west) -ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya), Malukus/Moluccas +ID -0507+11924 Asia/Makassar Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west) +ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya); Malukus/Moluccas IE +5320-00615 Europe/Dublin IL +314650+0351326 Asia/Jerusalem IM +5409-00428 Europe/Isle_of_Man @@ -347,7 +347,7 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River RU +4658+14242 Asia/Sakhalin MSK+07 - Sakhalin Island RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+07 - Magadan -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E), North Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); North Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea RW -0157+03004 Africa/Kigali @@ -390,7 +390,7 @@ TW +2503+12130 Asia/Taipei TZ -0648+03917 Africa/Dar_es_Salaam UA +5026+03031 Europe/Kiev Ukraine (most areas) UA +4837+02218 Europe/Uzhgorod Ruthenia -UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) +UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east) UG +0019+03225 Africa/Kampala UM +1645-16931 Pacific/Johnston Johnston Atoll UM +2813-17722 Pacific/Midway Midway Islands @@ -413,7 +413,7 @@ US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) -US +433649-1161209 America/Boise Mountain - ID (south), OR (east) +US +433649-1161209 America/Boise Mountain - ID (south); OR (east) US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) diff --git a/zone1970.tab b/zone1970.tab index fc81bcb..a0ef883 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -52,7 +52,7 @@ AR -3124-06411 America/Argentina/Cordoba Argentina (most areas: CB, CC, CN, ER, AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucumán (TM) -AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH) +AR -2828-06547 America/Argentina/Catamarca Catamarca (CT); Chubut (CH) AR -2926-06651 America/Argentina/La_Rioja La Rioja (LR) AR -3132-06831 America/Argentina/San_Juan San Juan (SJ) AR -3253-06849 America/Argentina/Mendoza Mendoza (MZ) @@ -83,7 +83,7 @@ BM +3217-06446 Atlantic/Bermuda BN +0456+11455 Asia/Brunei BO -1630-06809 America/La_Paz BR -0351-03225 America/Noronha Atlantic islands -BR -0127-04829 America/Belem Pará (east), Amapá +BR -0127-04829 America/Belem Pará (east); Amapá BR -0343-03830 America/Fortaleza Brazil (northeast: MA, PI, CE, RN, PB) BR -0803-03454 America/Recife Pernambuco BR -0712-04812 America/Araguaina Tocantins @@ -102,8 +102,8 @@ BS +2505-07721 America/Nassau BT +2728+08939 Asia/Thimphu BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize -CA +4734-05243 America/St_Johns Newfoundland, Labrador (southeast) -CA +4439-06336 America/Halifax Atlantic - NS (most areas), PE +CA +4734-05243 America/St_Johns Newfoundland; Labrador (southeast) +CA +4439-06336 America/Halifax Atlantic - NS (most areas); PE CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) @@ -114,13 +114,13 @@ CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) CA +6344-06828 America/Iqaluit Eastern - NU (most east areas) CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) -CA +4953-09709 America/Winnipeg Central - ON (west), Manitoba +CA +4953-09709 America/Winnipeg Central - ON (west); Manitoba CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances) CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) -CA +5333-11328 America/Edmonton Mountain - AB, BC (E), SK (W) +CA +5333-11328 America/Edmonton Mountain - AB; BC (E); SK (W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) CA +6227-11421 America/Yellowknife Mountain - NT (central) CA +682059-1334300 America/Inuvik Mountain - NT (west) @@ -187,8 +187,8 @@ HT +1832-07220 America/Port-au-Prince HU +4730+01905 Europe/Budapest ID -0610+10648 Asia/Jakarta Java, Sumatra ID -0002+10920 Asia/Pontianak Borneo (west, central) -ID -0507+11924 Asia/Makassar Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west) -ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya), Malukus/Moluccas +ID -0507+11924 Asia/Makassar Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west) +ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya); Malukus/Moluccas IE +5320-00615 Europe/Dublin IL +314650+0351326 Asia/Jerusalem IN +2232+08822 Asia/Kolkata @@ -304,7 +304,7 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River RU +4658+14242 Asia/Sakhalin MSK+07 - Sakhalin Island RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+07 - Magadan -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E), North Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); North Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea SA,KW,YE +2438+04643 Asia/Riyadh @@ -332,7 +332,7 @@ TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei UA +5026+03031 Europe/Kiev Ukraine (most areas) UA +4837+02218 Europe/Uzhgorod Ruthenia -UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) +UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east) UM +1917+16637 Pacific/Wake Wake Island US +404251-0740023 America/New_York Eastern (most areas) US +421953-0830245 America/Detroit Eastern - MI (most areas) @@ -352,7 +352,7 @@ US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) -US +433649-1161209 America/Boise Mountain - ID (south), OR (east) +US +433649-1161209 America/Boise Mountain - ID (south); OR (east) US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas)
Use 'most locations' (now 'most areas') to be consistent with other zone table comments. * zone.tab, zone1970.tab: Signed-off-by: J William Piggott <elseifthen@gmx.com> --- zone.tab | 8 ++++---- zone1970.tab | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zone.tab b/zone.tab index 69a69c5..f7000f7 100644 --- a/zone.tab +++ b/zone.tab @@ -277,11 +277,11 @@ MW -1547+03500 Africa/Blantyre MX +1924-09909 America/Mexico_City Central Time MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatan -MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (all far from US) -MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo Leon, Tamaulipas (all near US) +MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas) +MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border) MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa -MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (far from US) -MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (near US) +MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (most areas) +MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (US border) MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora MX +3232-11701 America/Tijuana Pacific Time US - Baja California MX +2048-10515 America/Bahia_Banderas Central Time - Bahia de Banderas diff --git a/zone1970.tab b/zone1970.tab index a0ef883..657675f 100644 --- a/zone1970.tab +++ b/zone1970.tab @@ -236,11 +236,11 @@ MV +0410+07330 Indian/Maldives MX +1924-09909 America/Mexico_City Central Time MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatán -MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (all far from US) -MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo León, Tamaulipas (all near US) +MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas) +MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo León, Tamaulipas (US border) MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa -MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (far from US) -MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (near US) +MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (most areas) +MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (US border) MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora MX +3232-11701 America/Tijuana Pacific Time US - Baja California MX +2048-10515 America/Bahia_Banderas Central Time - BahÃa de Banderas
On 2016-02-29 18:15, J William Piggott wrote:
On 02/24/2016 04:07 AM, Paul Eggert wrote:
J William Piggott wrote:
As it turns out, no abbreviations were need to prevent (any further) breaking of 80 columns (the current comments are already broken).
OK, but I'd rather fix the comments rather than leave them broken.
I anticipated push back against such an extensive reduction in content, so I was going to submit them as a separate patch set.
Establishing a standard format first seemed like the best sequence.
I am glad that you made the changes. It is great for tzselect to have proper paging now, good job.
Some of the notation I found confusing (e.g., the ", (" syntax) ...
I wasn't completely satisfied with that either. I was looking for a terse solution to issues like below; does 'west' apply to Sulawesi/Celebes, Bali, Nusa Tengarra? Does 'E' apply to 'AB'? What if it did (as with Coahuila)? ... and so on.
Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west) Mountain - AB, BC (E), SK (W) Zaporozh'ye/Zaporizhia, Lugansk/Luhansk (east) Newfoundland, Labrador (southeast) Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (all far from US)
I think it mostly looks good, this patch set has a few additions.
Not clear in lines such as those below that Eastern, Central refer to time zone and not the geographical part of the region - either add the word Time or some other indication e.g. EST/EDT, CST/CDT to keep it short: -CA +4339-07923 America/Toronto Eastern - ON & QC (most locations) -CA +4901-08816 America/Nipigon Eastern - ON & QC (no DST 1967-73) +CA +4339-07923 America/Toronto Eastern - ON, QC (most locations) +CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) CA +6344-06828 America/Iqaluit Eastern - NU (most east locations) CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) -- Take care. Thanks, Brian Inglis, Calgary, Alberta, Canada
Brian Inglis wrote:
Not clear in lines such as those below that Eastern, Central refer to time zone and not the geographical part of the region - either add the word Time or some other indication e.g. EST/EDT, CST/CDT to keep it short:
In context it's not so bad (see below for the relevant screen, for Canada). Perhaps "EST+EDT" would be clearer than "Eastern" and similarly for "CST+CDT" and I suppose "MST+MDT" and "PST+PDT" but it's a close call. Please select one of the following time zone regions. 1) Newfoundland; Labrador (southeast) 15) Central - NU (Resolute) 2) Atlantic - NS (most areas); PE 16) Central - NU (central) 3) Atlantic - NS (Cape Breton) 17) CST - SK (most areas) 4) Atlantic - New Brunswick 18) CST - SK (midwest) 5) Atlantic - Labrador (most areas) 19) Mountain - AB; BC (E); SK (W) 6) AST - QC (Lower North Shore) 20) Mountain - NU (west) 7) Eastern - ON, QC (most areas) 21) Mountain - NT (central) 8) Eastern - ON, QC (no DST 1967-73) 22) Mountain - NT (west) 9) Eastern - ON (Thunder Bay) 23) MST - BC (Creston) 10) Eastern - NU (most east areas) 24) MST - BC (Dawson Cr, Ft St John) 11) Eastern - NU (Pangnirtung) 25) MST - BC (Ft Nelson) 12) EST - ON (Atikokan); NU (Coral H) 26) Pacific - BC (most areas) 13) Central - ON (west); Manitoba 27) Pacific - Yukon (south) 14) Central - ON (Rainy R, Ft Frances) 28) Pacific - Yukon (north) #?
On 03/01/2016 02:04 AM, Paul Eggert wrote:
Brian Inglis wrote:
Not clear in lines such as those below that Eastern, Central refer to time zone and not the geographical part of the region - either add the word Time or some other indication e.g. EST/EDT, CST/CDT to keep it short:
In context it's not so bad (see below for the relevant screen, for Canada). Perhaps "EST+EDT" would be clearer than "Eastern" and similarly for "CST+CDT" and I suppose "MST+MDT" and "PST+PDT" but it's a close call.
Please select one of the following time zone regions. 1) Newfoundland; Labrador (southeast) 15) Central - NU (Resolute) 2) Atlantic - NS (most areas); PE 16) Central - NU (central) 3) Atlantic - NS (Cape Breton) 17) CST - SK (most areas) 4) Atlantic - New Brunswick 18) CST - SK (midwest) 5) Atlantic - Labrador (most areas) 19) Mountain - AB; BC (E); SK (W) 6) AST - QC (Lower North Shore) 20) Mountain - NU (west) 7) Eastern - ON, QC (most areas) 21) Mountain - NT (central) 8) Eastern - ON, QC (no DST 1967-73) 22) Mountain - NT (west) 9) Eastern - ON (Thunder Bay) 23) MST - BC (Creston) 10) Eastern - NU (most east areas) 24) MST - BC (Dawson Cr, Ft St John) 11) Eastern - NU (Pangnirtung) 25) MST - BC (Ft Nelson) 12) EST - ON (Atikokan); NU (Coral H) 26) Pacific - BC (most areas) 13) Central - ON (west); Manitoba 27) Pacific - Yukon (south) 14) Central - ON (Rainy R, Ft Frances) 28) Pacific - Yukon (north) #?
When I was considering how to shorten US and CA enough so they would page correctly, the most obvious target was the common zone name prefix. In light of the recent discussion on the mailing list with regard to dropping alpha zone abbreviations in favor of offsets, I was going to try a patch to replace the existing comments' prefix with offsets. I thought this might be accepted, because it is already used for RU. I was going to take it a step further by applying a simple offset as done with "+02 - Central Africa Time" as a prefix to all of the zone table comments. Is DST information needed to choose a zone file? In the example list above it doesn't seem to be. On a related subject; I saw when you where shorting the zone table comments, Paul, that you also noticed the ordering was not so good and jockeyed that around as well. That is the reason I submitted a patch to sort the local regions' lists. If all of the comments were prefixed with an offset, then sorting the tzselect menus would create the geographical ordering to which you gave priority over a lexical sort. This would make maintaining the zone tables easier, because strict attention to order within the file would no longer matter. The fact that you just had to rearranged the file order illustrates how this collation creep can work its way in over time.
J William Piggott wrote:
Please select one of the following time zone regions.
1) Newfoundland; Labrador (southeast) 15) Central - NU (Resolute) 2) Atlantic - NS (most areas); PE 16) Central - NU (central) 3) Atlantic - NS (Cape Breton) 17) CST - SK (most areas) 4) Atlantic - New Brunswick 18) CST - SK (midwest) 5) Atlantic - Labrador (most areas) 19) Mountain - AB; BC (E); SK (W) 6) AST - QC (Lower North Shore) 20) Mountain - NU (west) 7) Eastern - ON, QC (most areas) 21) Mountain - NT (central) 8) Eastern - ON, QC (no DST 1967-73) 22) Mountain - NT (west) 9) Eastern - ON (Thunder Bay) 23) MST - BC (Creston) 10) Eastern - NU (most east areas) 24) MST - BC (Dawson Cr, Ft St John) 11) Eastern - NU (Pangnirtung) 25) MST - BC (Ft Nelson) 12) EST - ON (Atikokan); NU (Coral H) 26) Pacific - BC (most areas) 13) Central - ON (west); Manitoba 27) Pacific - Yukon (south) 14) Central - ON (Rainy R, Ft Frances) 28) Pacific - Yukon (north) #? ... Is DST information needed to choose a zone file? In the example list above it doesn't seem to be.
In the above list (whose formatting has been trashed by the various email software we're using) the name "Eastern" is short for Eastern time with daylight saving, whereas "EST" is short for Eastern Standard Time only, and similarly for other names. Presumably someone who knows or infers this can exploit their knowledge when selecting.
On 03/06/2016 03:56 PM, Paul Eggert wrote:
J William Piggott wrote:
Please select one of the following time zone regions.
1) Newfoundland; Labrador (southeast) 15) Central - NU (Resolute) 2) Atlantic - NS (most areas); PE 16) Central - NU (central) 3) Atlantic - NS (Cape Breton) 17) CST - SK (most areas) 4) Atlantic - New Brunswick 18) CST - SK (midwest) 5) Atlantic - Labrador (most areas) 19) Mountain - AB; BC (E); SK (W) 6) AST - QC (Lower North Shore) 20) Mountain - NU (west) 7) Eastern - ON, QC (most areas) 21) Mountain - NT (central) 8) Eastern - ON, QC (no DST 1967-73) 22) Mountain - NT (west) 9) Eastern - ON (Thunder Bay) 23) MST - BC (Creston) 10) Eastern - NU (most east areas) 24) MST - BC (Dawson Cr, Ft St John) 11) Eastern - NU (Pangnirtung) 25) MST - BC (Ft Nelson) 12) EST - ON (Atikokan); NU (Coral H) 26) Pacific - BC (most areas) 13) Central - ON (west); Manitoba 27) Pacific - Yukon (south) 14) Central - ON (Rainy R, Ft Frances) 28) Pacific - Yukon (north) #? ... Is DST information needed to choose a zone file? In the example list above it doesn't seem to be.
In the above list (whose formatting has been trashed by the various email software we're using) the name "Eastern" is short for Eastern time with daylight saving, whereas "EST" is short for Eastern Standard Time only, and similarly for other names. Presumably someone who knows or infers this can exploit their knowledge when selecting.
I wasn't denying the existence or legibility of the DST information. Nor was I critiquing the changes you made. I was trying to express an alternate concept that I thought had some merit for you as the maintainer, myself and others as contributors, and end users: Please select one of the following time zone regions. 1) -0350 - NL; Labrador (southeast) 15) -06 - NU (Resolute) 2) -04 - NS (most areas); PE 16) -06 - NU (central) 3) -04 - NS (Cape Breton) 17) -06 - SK (most areas) 4) -04 - New Brunswick 18) -06 - SK (midwest) 5) -04 - Labrador (most areas) 19) -07 - AB; BC (E); SK (W) 6) -04 - QC (Lower North Shore) 20) -07 - NU (west) 7) -05 - ON, QC (most areas) 21) -07 - NT (central) 8) -05 - ON, QC (no DST 1967-73) 22) -07 - NT (west) 9) -05 - ON (Thunder Bay) 23) -07 - BC (Creston) 10) -05 - NU (most east areas) 24) -07 - BC (Dawson Cr, Ft St John) 11) -05 - NU (Pangnirtung) 25) -07 - BC (Ft Nelson) 12) -05 - ON (Atikokan); NU (Coral H) 26) -08 - BC (most areas) 13) -06 - ON (west); Manitoba 27) -08 - Yukon (south) 14) -06 - ON (Rainy R, Ft Frances) 28) -08 - Yukon (north) Then simply sorting the local region menus would yield geographic order and save you the effort of keeping the zone table files ordered. Perhaps slightly improved when sorted, as second levels are also grouped and alphabetical: 1) -0350 - NL; Labrador (southeast) 15) -06 - ON (Rainy R, Ft Frances) 2) -04 - Labrador (most areas) 16) -06 - ON (west); Manitoba 3) -04 - NS (Cape Breton) 17) -06 - SK (midwest) 4) -04 - NS (most areas); PE 18) -06 - SK (most areas) 5) -04 - New Brunswick 19) -07 - AB; BC (E); SK (W) 6) -04 - QC (Lower North Shore) 20) -07 - BC (Creston) 7) -05 - NU (Pangnirtung) 21) -07 - BC (Dawson Cr, Ft St John) 8) -05 - NU (most east areas) 22) -07 - BC (Ft Nelson) 9) -05 - ON (Atikokan); NU (Coral H) 23) -07 - NT (central) 10) -05 - ON (Thunder Bay) 24) -07 - NT (west) 11) -05 - ON, QC (most areas) 25) -07 - NU (west) 12) -05 - ON, QC (no DST 1967-73) 26) -08 - BC (most areas) 13) -06 - NU (Resolute) 27) -08 - Yukon (north) 14) -06 - NU (central) 28) -08 - Yukon (south)
On 03/07/2016 02:13 PM, J William Piggott wrote:
1) -0350 - NL; Labrador (southeast) 15) -06 - ON (Rainy R, Ft Frances) 2) -04 - Labrador (most areas) 16) -06 - ON (west); Manitoba 3) -04 - NS (Cape Breton) 17) -06 - SK (midwest) 4) -04 - NS (most areas); PE 18) -06 - SK (most areas) 5) -04 - New Brunswick 19) -07 - AB; BC (E); SK (W) 6) -04 - QC (Lower North Shore) 20) -07 - BC (Creston) 7) -05 - NU (Pangnirtung) 21) -07 - BC (Dawson Cr, Ft St John) 8) -05 - NU (most east areas) 22) -07 - BC (Ft Nelson) 9) -05 - ON (Atikokan); NU (Coral H) 23) -07 - NT (central) 10) -05 - ON (Thunder Bay) 24) -07 - NT (west) 11) -05 - ON, QC (most areas) 25) -07 - NU (west) 12) -05 - ON, QC (no DST 1967-73) 26) -08 - BC (most areas) 13) -06 - NU (Resolute) 27) -08 - Yukon (north) 14) -06 - NU (central) 28) -08 - Yukon (south)
I don't know, I find this list to be confusing. If I see an entry "3) -04 NS ..." I won't know offhand whether to type "3" or "4" or "04". I think I'd feel more comfortable with "AST+ADT" instead of "-04".
On 03/07/2016 05:37 PM, Paul Eggert wrote:
On 03/07/2016 02:13 PM, J William Piggott wrote:
1) -0350 - NL; Labrador (southeast) 15) -06 - ON (Rainy R, Ft Frances) 2) -04 - Labrador (most areas) 16) -06 - ON (west); Manitoba 3) -04 - NS (Cape Breton) 17) -06 - SK (midwest) 4) -04 - NS (most areas); PE 18) -06 - SK (most areas) 5) -04 - New Brunswick 19) -07 - AB; BC (E); SK (W) 6) -04 - QC (Lower North Shore) 20) -07 - BC (Creston) 7) -05 - NU (Pangnirtung) 21) -07 - BC (Dawson Cr, Ft St John) 8) -05 - NU (most east areas) 22) -07 - BC (Ft Nelson) 9) -05 - ON (Atikokan); NU (Coral H) 23) -07 - NT (central) 10) -05 - ON (Thunder Bay) 24) -07 - NT (west) 11) -05 - ON, QC (most areas) 25) -07 - NU (west) 12) -05 - ON, QC (no DST 1967-73) 26) -08 - BC (most areas) 13) -06 - NU (Resolute) 27) -08 - Yukon (north) 14) -06 - NU (central) 28) -08 - Yukon (south)
I don't know, I find this list to be confusing. If I see an entry "3) -04 NS ..." I won't know offhand whether to type "3" or "4" or "04". I think I'd feel more comfortable with "AST+ADT" instead of "-04".
Currently tzselect > Africa > Congo (Dem. Rep.) is formatted this way. I don't think it is difficult to discern the select token. This format improves readability in another way , by aligning the local region names in a column. It uses the least number of characters (which is important for zone table comments). It goes along with your push to use offsets instead of alpha zone abbreviations. As already mentioned, facilitates the elimination of manually sorting the zone tables. Having said that, to fully evaluate this concept, a demo zone table should be created; then it's tzselect output can be compared directly against the current tzselect output. I'll try to make time to do that. Unless you're firmly against this format concept?
On 03/09/2016 02:11 PM, J William Piggott wrote:
Currently tzselect > Africa > Congo (Dem. Rep.) is formatted this way. I don't think it is difficult to discern the select token. Ouch, you're right. I didn't notice that:
Please select one of the following time zone regions. 1) +02 - Central Africa Time 2) +01 - West Africa Time #? It's confusing that '1' means 2 and '2' means 1 here. Although it's no problem for users who know tzselect well, it's likely for other users to get confused. So let's drop those confusing prefixes. Something like the attached patch, which I've installed in the experimental version.
On 2016-03-07 15:13, J William Piggott wrote:
1) -0350 - NL; Labrador (southeast) 15) -06 - ON (Rainy R, Ft Frances) -0330 hours and minutes not decimal hours please Newfoundland and Labrador would not go so far as choosing a 03:50 offset. -- Take care. Thanks, Brian Inglis, Calgary, Alberta, Canada
On 03/07/2016 11:46 PM, Brian Inglis wrote:
On 2016-03-07 15:13, J William Piggott wrote:
1) -0350 - NL; Labrador (southeast) 15) -06 - ON (Rainy R, Ft Frances) -0330 hours and minutes not decimal hours please Newfoundland and Labrador would not go so far as choosing a 03:50 offset.
True, my mistake. Thankfully, it was just to illustrate format.
Thanks, I installed those into the experimental version.
In reviewing this patch I had problems with the way it was encoded. I received email with lines like this in the header: Content-Type: text/plain; charset=utf-8 ... Content-Transfer-Encoding: quoted-printable and text like the following in the body: Ad=C3=83=C2=A9lie Land This must be some sort of mistake in encoding the file, as those four bytes, when decoded as UTF-8, specify the two characters U+00C3 (LATIN CAPITAL LETTER A WITH TILDE) and U+00A9 (COPYRIGHT SIGN), i.e., “é”, so the text looks like “Adélie Land” when I view it with my email client (Thunderbird 38.6.0), or when I visit the copy of that email archived via Mailman at <http://mm.icann.org/pipermail/tz/2016-February/023255.html>. It appears that the email was double-encoded: if the body text had been this: Ad=C3=A9lie Land it would have decoded to the intended “Adélie Land”. I have double-decoded the message and that seems to work for me. What procedure did you use to send the email to the tz mailing list? Is there some way to make things easier in the future?
On 02/23/2016 09:17 PM, Paul Eggert wrote:
In reviewing this patch I had problems with the way it was encoded.
So, I forced my MUA to send the latest patch set with iso_8859-1 encoding, for which it sets this header: Content-Type: text/plain; charset=windows-1252 But I see that [PATCH 04/10] was change to: Content-Type: text/plain; charset=UTF-8 It was sent the same way as the rest of the set, I do not know where in the chain it was clobbered.
On 01/03/16 02:09, J William Piggott wrote:
On 02/23/2016 09:17 PM, Paul Eggert wrote:
In reviewing this patch I had problems with the way it was encoded.
So, I forced my MUA to send the latest patch set with iso_8859-1 encoding, for which it sets this header:
Content-Type: text/plain; charset=windows-1252
But I see that [PATCH 04/10] was change to:
Content-Type: text/plain; charset=UTF-8
It was sent the same way as the rest of the set, I do not know where in the chain it was clobbered.
Some of those patches look a little odd when viewed in an MUA anyway (Thunderbird or Icedove in my case), as the MIME charset is declared as windows-1252, but the actual text is UTF-8. (That's most prevalent in the changes to zone1970.tab by PATCH 10/10.) At least your MUA doesn't seem to screw up inline patches completely like most do! I generally use git send-email to send inline patches. -- -=( Ian Abbott @ MEV Ltd. E-mail: <abbotti@mev.co.uk> )=- -=( Web: http://www.mev.co.uk/ )=-
On 03/01/2016 02:37 AM, Ian Abbott wrote:
Some of those patches look a little odd when viewed in an MUA anyway (Thunderbird or Icedove in my case), as the MIME charset is declared as windows-1252, but the actual text is UTF-8. (That's most prevalent in the changes to zone1970.tab by PATCH 10/10.)
Unfortunately some of the patches were still messed up, at least as received here. Patch 04 was double-encoded: it said "Content-Type: text/plain; charset=UTF-8" and "Content-Transfer-Encoding: quoted-printable" and the body contained strings like "Tucum=C3=83=C2=A1n", which decode to "Tucumán" instead of to the correct "Tucumán". As Ian notes, patch 10 was double-encoded in a different way: it said "Content-Type: text/plain; charset=windows-1252" and "Content-Transfer-Encoding: quoted-printable" and contained strings like "Le=C3=B3n", which decode to "León" instead of to the correct "León". I hope I fixed the decoding errors correctly before installing this stuff into the experimental version on GitHub.
I generally use git send-email to send inline patches.
Me too. And when attaching non-ASCII patches, I try to remember to rename the patch from FOO.patch to FOO.txt so that Thunderbird doesn't mess up the encoding.
On 03/01/2016 11:57 AM, Paul Eggert wrote:
On 03/01/2016 02:37 AM, Ian Abbott wrote:
Some of those patches look a little odd when viewed in an MUA anyway (Thunderbird or Icedove in my case), as the MIME charset is declared as windows-1252, but the actual text is UTF-8. (That's most prevalent in the changes to zone1970.tab by PATCH 10/10.)
Unfortunately some of the patches were still messed up, at least as received here. Patch 04 was double-encoded: it said "Content-Type: text/plain; charset=UTF-8" and "Content-Transfer-Encoding: quoted-printable" and the body contained strings like "Tucum=C3=83=C2=A1n", which decode to "Tucumán" instead of to the correct "Tucumán". As Ian notes, patch 10 was double-encoded in a different way: it said "Content-Type: text/plain; charset=windows-1252" and "Content-Transfer-Encoding: quoted-printable" and contained strings like "Le=C3=B3n", which decode to "León" instead of to the correct "León".
I am sorry Paul, for the extra work I caused you. My system is deeply configured (down to kernel level) to not use multi byte characters. This is the first project I've contributed to that it mattered. I expect that I will bite the bullet and switch to utf8 on my next complete OS upgrade.
I hope I fixed the decoding errors correctly before installing this stuff into the experimental version on GitHub.
If it is any indication, after iconv-ing them they display correctly on my system.
On 20 February 2016 at 17:01, J William Piggott <elseifthen@gmx.com> wrote:
These ambiguities make it impossible to interpret the comments without having prior knowledge of the area.
It's not clear to me that resolving this is actually a necessity or a priority. Presumably those selecting a zone are familiar with the geography of the region(s) they are interested in. Standardizing the comments somewhat might be helpful, but I would be hesitant to enforce a strict structure on these comments, as there always seem to be exceptions that arise. -- Tim Parenti
On 02/21/2016 03:26 PM, Tim Parenti wrote:
On 20 February 2016 at 17:01, J William Piggott <elseifthen@gmx.com> wrote:
These ambiguities make it impossible to interpret the comments without having prior knowledge of the area.
It's not clear to me that resolving this is actually a necessity or a priority.
The work is done. Accepting the changes need not be necessity nor priority, just an improvement.
Presumably those selecting a zone are familiar with the geography of the region(s) they are interested in.
Why should that be presumed? Even making that assumption, it is still ambiguous to write the same information in many different formats. As I mentioned, it facilitates other improvements as well. For example, having time zone select applications' menus all begin in uppercase (as opposed to mixed case as they are now).
Standardizing the comments somewhat might be helpful, but I would be hesitant to enforce a strict structure on these comments, as there always seem to be exceptions that arise.
The standard format applied fine to over 200 existing zone table comments. The information supplied in these comments is consistent.
-- Tim Parenti
On 2016-02-21 15:25, J William Piggott wrote:
On 02/21/2016 03:26 PM, Tim Parenti wrote:
On 20 February 2016 at 17:01, J William Piggott <elseifthen@gmx.com> wrote:
These ambiguities make it impossible to interpret the comments without having prior knowledge of the area.
It's not clear to me that resolving this is actually a necessity or a priority.
The work is done. Accepting the changes need not be necessity nor priority, just an improvement.
Presumably those selecting a zone are familiar with the geography of the region(s) they are interested in.
Why should that be presumed? Even making that assumption, it is still ambiguous to write the same information in many different formats. As I mentioned, it facilitates other improvements as well. For example, having time zone select applications' menus all begin in uppercase (as opposed to mixed case as they are now).
Some scenarios I could imagine being frequent use cases are: - setting up local reservation caching servers or POS servers at (or at some outsourcing vendor location on behalf of) some corp HQ or regional office for shipment to local hotels in faraway places; - VARs setting up turnkey astrology systems for shipment to individuals' offices at popular travel destinations; - users assembling small systems to run popular freeware to perform a limited range of tasks; all without much relevant background in time zones. Depending on the time zone history in their region (cough! Indiana) it may be a non-trivial guessing game to pick the reference location relevant to a zone. A bit more structure and clarity will certainly help those support staff or end users unfamiliar with the geography or zones. I do think that it may be okay to keep abbreviations like N/S/E/W/... and PEI rather than Prince Edward Island in the descriptions without loss of clarity or specificity. [Set up a Houston flight recently in the Lightning calendar addon for Thunderbird (using their user *UN*friendly pick list of all ~400 time zone paths - tzselect is rocket science by comparison!) and it took me a couple of picks before I remembered Chicago was the CT reference location for the US. The GUI helpfully renders the zone picked in light blue over a credit card sized world map of the land mass outlines. Until after I had dug around a bit more, I also found that I did not know that Winnipeg was the CT reference location for Canada. This provides at least some anecdotal indication that if you have not previously had to pick a location to select a particular time zone, lack of: a good interface, specific data, and practice, are all impediments.] -- Take care. Thanks, Brian Inglis, Calgary, Alberta, Canada
participants (8)
-
Brian Inglis -
Clive D.W. Feather -
Gilmore Davidson -
Ian Abbott -
J William Piggott -
Paul Eggert -
Robert Elz -
Tim Parenti