From 9a41dfefc55bf9e83a1c430dcdece115d6b9a97a Mon Sep 17 00:00:00 2001 From: John Mettraux Date: Tue, 22 May 2018 21:52:01 +0900 Subject: [PATCH] Turn "Coordinated Universal Time" into "UTC" gh-12 --- lib/et-orbi/zone_aliases.rb | 152 ++++++++++++++++++------------------ spec/module_spec.rb | 1 + 2 files changed, 78 insertions(+), 75 deletions(-) diff --git a/lib/et-orbi/zone_aliases.rb b/lib/et-orbi/zone_aliases.rb index 0eba24b..0c5eb3f 100644 --- a/lib/et-orbi/zone_aliases.rb +++ b/lib/et-orbi/zone_aliases.rb @@ -1,79 +1,81 @@ module EtOrbi - ZONE_ALIASES = -{"Afghanistan Standard Time" => 'Asia/Kabul', -"FLE Standard Time" => 'Europe/Helsinki', -"Central Europe Standard Time" => 'Europe/Prague', -"UTC-11" => 'Etc/GMT+11', -"W. Europe Standard Time" => 'Europe/Rome', -"W. Central Africa Standard Time" => 'Africa/Lagos', -"SA Western Standard Time" => 'America/La_Paz', -"Pacific SA Standard Time" => 'America/Santiago', -"Argentina Standard Time" => 'America/Argentina/Buenos_Aires', -"Caucasus Standard Time" => 'Asia/Yerevan', -"AUS Eastern Standard Time" => 'Australia/Sydney', -"Azerbaijan Standard Time" => 'Asia/Baku', -"Eastern Standard Time" => 'America/New_York', -"Arab Standard Time" => 'Asia/Riyadh', -"Bangladesh Standard Time" => 'Asia/Dhaka', -"Belarus Standard Time" => 'Europe/Minsk', -"Romance Standard Time" => 'Europe/Paris', -"Central America Standard Time" => 'America/Belize', -"Atlantic Standard Time" => 'Atlantic/Bermuda', -"Venezuela Standard Time" => 'America/Caracas', -"Central European Standard Time" => 'Europe/Warsaw', -"South Africa Standard Time" => 'Africa/Johannesburg', -#"UTC" => 'Etc/UTC', # "UTC" is good as is -"E. South America Standard Time" => 'America/Sao_Paulo', -"Central Asia Standard Time" => 'Asia/Almaty', -"Singapore Standard Time" => 'Asia/Singapore', -"Greenwich Standard Time" => 'Africa/Monrovia', -"Cape Verde Standard Time" => 'Atlantic/Cape_Verde', -"SE Asia Standard Time" => 'Asia/Bangkok', -"SA Pacific Standard Time" => 'America/Bogota', -"China Standard Time" => 'Asia/Shanghai', -"Myanmar Standard Time" => 'Asia/Yangon', -"E. Africa Standard Time" => 'Africa/Nairobi', -"Hawaiian Standard Time" => 'Pacific/Honololu', -"E. Europe Standard Time" => 'Europe/Nicosia', -"Tokyo Standard Time" => 'Asia/Tokyo', -"Egypt Standard Time" => 'Africa/Cairo', -"SA Eastern Standard Time" => 'America/Cayenne', -"GMT Standard Time" => 'Europe/London', -"Fiji Standard Time" => 'Pacific/Fiji', -"West Asia Standard Time" => 'Asia/Tashkent', -"Georgian Standard Time" => 'Asia/Tbilisi', -"GTB Standard Time" => 'Europe/Athens', -"Greenland Standard Time" => 'America/Godthab', -"West Pacific Standard Time" => 'Pacific/Guam', -"Mauritius Standard Time" => 'Indian/Mauritius', -"India Standard Time" => 'Asia/Kolkata', -"Iran Standard Time" => 'Asia/Tehran', -"Arabic Standard Time" => 'Asia/Baghdad', -"Israel Standard Time" => 'Asia/Jerusalem', -"Jordan Standard Time" => 'Asia/Amman', -"UTC+12" => 'Etc/GMT-12', -"Korea Standard Time" => 'Asia/Seoul', -"Middle East Standard Time" => 'Asia/Beirut', -"Central Standard Time (Mexico)" => 'America/Mexico_City', -"Ulaanbaatar Standard Time" => 'Asia/Ulaanbaatar', -"Morocco Standard Time" => 'Africa/Casablanca', -"Namibia Standard Time" => 'Africa/Windhoek', -"Nepal Standard Time" => 'Asia/Kathmandu', -"Central Pacific Standard Time" => 'Etc/GMT-11', -"New Zealand Standard Time" => 'Pacific/Auckland', -"Arabian Standard Time" => 'Asia/Dubai', -"Pakistan Standard Time" => 'Asia/Karachi', -"Paraguay Standard Time" => 'America/Asuncion', -"Pacific Standard Time" => 'America/Los_Angeles', -"Russian Standard Time" => 'Europe/Moscow', -"Samoa Standard Time" => 'Pacific/Pago_Pago', -"UTC-02" => 'Etc/GMT+2', -"Sri Lanka Standard Time" => 'Asia/Kolkata', -"Syria Standard Time" => 'Asia/Damascus', -"Taipei Standard Time" => 'Asia/Taipei', -"Tonga Standard Time" => 'Pacific/Tongatapu', -"Turkey Standard Time" => 'Asia/Istanbul', -"Montevideo Standard Time" => 'America/Montevideo'} + + ZONE_ALIASES = { + 'Coordinated Universal Time' => 'UTC', + 'Afghanistan Standard Time' => 'Asia/Kabul', + 'FLE Standard Time' => 'Europe/Helsinki', + 'Central Europe Standard Time' => 'Europe/Prague', + 'UTC-11' => 'Etc/GMT+11', + 'W. Europe Standard Time' => 'Europe/Rome', + 'W. Central Africa Standard Time' => 'Africa/Lagos', + 'SA Western Standard Time' => 'America/La_Paz', + 'Pacific SA Standard Time' => 'America/Santiago', + 'Argentina Standard Time' => 'America/Argentina/Buenos_Aires', + 'Caucasus Standard Time' => 'Asia/Yerevan', + 'AUS Eastern Standard Time' => 'Australia/Sydney', + 'Azerbaijan Standard Time' => 'Asia/Baku', + 'Eastern Standard Time' => 'America/New_York', + 'Arab Standard Time' => 'Asia/Riyadh', + 'Bangladesh Standard Time' => 'Asia/Dhaka', + 'Belarus Standard Time' => 'Europe/Minsk', + 'Romance Standard Time' => 'Europe/Paris', + 'Central America Standard Time' => 'America/Belize', + 'Atlantic Standard Time' => 'Atlantic/Bermuda', + 'Venezuela Standard Time' => 'America/Caracas', + 'Central European Standard Time' => 'Europe/Warsaw', + 'South Africa Standard Time' => 'Africa/Johannesburg', + #'UTC' => 'Etc/UTC', # 'UTC' is good as is + 'E. South America Standard Time' => 'America/Sao_Paulo', + 'Central Asia Standard Time' => 'Asia/Almaty', + 'Singapore Standard Time' => 'Asia/Singapore', + 'Greenwich Standard Time' => 'Africa/Monrovia', + 'Cape Verde Standard Time' => 'Atlantic/Cape_Verde', + 'SE Asia Standard Time' => 'Asia/Bangkok', + 'SA Pacific Standard Time' => 'America/Bogota', + 'China Standard Time' => 'Asia/Shanghai', + 'Myanmar Standard Time' => 'Asia/Yangon', + 'E. Africa Standard Time' => 'Africa/Nairobi', + 'Hawaiian Standard Time' => 'Pacific/Honololu', + 'E. Europe Standard Time' => 'Europe/Nicosia', + 'Tokyo Standard Time' => 'Asia/Tokyo', + 'Egypt Standard Time' => 'Africa/Cairo', + 'SA Eastern Standard Time' => 'America/Cayenne', + 'GMT Standard Time' => 'Europe/London', + 'Fiji Standard Time' => 'Pacific/Fiji', + 'West Asia Standard Time' => 'Asia/Tashkent', + 'Georgian Standard Time' => 'Asia/Tbilisi', + 'GTB Standard Time' => 'Europe/Athens', + 'Greenland Standard Time' => 'America/Godthab', + 'West Pacific Standard Time' => 'Pacific/Guam', + 'Mauritius Standard Time' => 'Indian/Mauritius', + 'India Standard Time' => 'Asia/Kolkata', + 'Iran Standard Time' => 'Asia/Tehran', + 'Arabic Standard Time' => 'Asia/Baghdad', + 'Israel Standard Time' => 'Asia/Jerusalem', + 'Jordan Standard Time' => 'Asia/Amman', + 'UTC+12' => 'Etc/GMT-12', + 'Korea Standard Time' => 'Asia/Seoul', + 'Middle East Standard Time' => 'Asia/Beirut', + 'Central Standard Time (Mexico)' => 'America/Mexico_City', + 'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar', + 'Morocco Standard Time' => 'Africa/Casablanca', + 'Namibia Standard Time' => 'Africa/Windhoek', + 'Nepal Standard Time' => 'Asia/Kathmandu', + 'Central Pacific Standard Time' => 'Etc/GMT-11', + 'New Zealand Standard Time' => 'Pacific/Auckland', + 'Arabian Standard Time' => 'Asia/Dubai', + 'Pakistan Standard Time' => 'Asia/Karachi', + 'Paraguay Standard Time' => 'America/Asuncion', + 'Pacific Standard Time' => 'America/Los_Angeles', + 'Russian Standard Time' => 'Europe/Moscow', + 'Samoa Standard Time' => 'Pacific/Pago_Pago', + 'UTC-02' => 'Etc/GMT+2', + 'Sri Lanka Standard Time' => 'Asia/Kolkata', + 'Syria Standard Time' => 'Asia/Damascus', + 'Taipei Standard Time' => 'Asia/Taipei', + 'Tonga Standard Time' => 'Pacific/Tongatapu', + 'Turkey Standard Time' => 'Asia/Istanbul', + 'Montevideo Standard Time' => 'America/Montevideo' } end diff --git a/spec/module_spec.rb b/spec/module_spec.rb index 8233786..ae26d25 100644 --- a/spec/module_spec.rb +++ b/spec/module_spec.rb @@ -186,6 +186,7 @@ def loz(s); EtOrbi.list_olson_zones(s); end 3600 => '+01:00', 'Tokyo Standard Time' => 'Asia/Tokyo', + 'Coordinated Universal Time' => 'UTC', }.each do |a, b|