Skip to content

Commit

Permalink
Merge pull request #259 from Shopify/dominiqueflaaa.remove_rails_supp…
Browse files Browse the repository at this point in the history
…orted_timezone_keys

Update iana_to_rails mappings for rails supported timezones
  • Loading branch information
DominiqueFlaaa authored Jul 25, 2024
2 parents 7c9e4d8 + 7c9825c commit 278b3c4
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 607 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Security in case of vulnerabilities.

## [Unreleased]
- Update iana_to_rails_time_zone mappings for 11 tz's, add time zone data consistency tests[#259](https://github.com/Shopify/worldwide/pull/259)
- Add consistency test for default and optional field labels [#258](https://github.com/Shopify/worldwide/pull/258)

---
Expand Down
36 changes: 18 additions & 18 deletions db/data/iana_to_rails_time_zone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ America/Barbados: America/Puerto_Rico
America/Belem: America/Sao_Paulo
America/Belize: America/Mexico_City
America/Blanc-Sablon: America/Puerto_Rico
America/Boa_Vista: America/Caracas
America/Boa_Vista: America/Caracas
America/Bogota: America/Bogota
America/Boise: America/Denver
America/Buenos_Aires: America/Argentina/Buenos_Aires
Expand All @@ -101,10 +101,10 @@ America/Ciudad_Juarez: America/Denver
America/Coral_Harbour: America/Bogota
America/Cordoba: America/Argentina/Buenos_Aires
America/Costa_Rica: America/Mexico_City
America/Creston: America/Phoenix
America/Creston: America/Phoenix
America/Cuiaba: America/Caracas
America/Curacao: America/Puerto_Rico
America/Danmarkshavn: Etc/Utc
America/Danmarkshavn: Etc/UTC
America/Dawson: America/Phoenix
America/Dawson_Creek: America/Phoenix
America/Denver: America/Denver
Expand All @@ -123,9 +123,9 @@ America/Goose_Bay: America/Halifax
America/Grand_Turk: America/New_York
America/Grenada: America/Puerto_Rico
America/Guadeloupe: America/Puerto_Rico
America/Guatemala: America/Mexico_City
America/Guatemala: America/Guatemala
America/Guayaquil: America/Bogota
America/Guyana: America/Caracas
America/Guyana: America/Guyana
America/Halifax: America/Halifax
America/Havana: America/New_York
America/Hermosillo: America/Phoenix
Expand Down Expand Up @@ -167,7 +167,7 @@ America/Mexico_City: America/Mexico_City
# America/Miquelon inexact match
America/Miquelon: Atlantic/South_Georgia
America/Moncton: America/Halifax
America/Monterrey: America/Mexico_City
America/Monterrey: America/Monterrey
America/Montevideo: America/Montevideo
America/Montreal: America/New_York
America/Montserrat: America/Puerto_Rico
Expand Down Expand Up @@ -289,15 +289,15 @@ Asia/Katmandu: Asia/Kathmandu
Asia/Khandyga: Asia/Yakutsk
Asia/Kolkata: Asia/Kolkata
Asia/Krasnoyarsk: Asia/Krasnoyarsk
Asia/Kuala_Lumpur: Asia/Kuala_Lumpur
Asia/Kuala_Lumpur: Asia/Kuala_Lumpur
Asia/Kuching: Asia/Kuala_Lumpur
Asia/Kuwait: Asia/Riyadh
Asia/Kuwait: Asia/Kuwait
Asia/Macao: Asia/Shanghai
Asia/Macau: Asia/Shanghai
Asia/Magadan: Asia/Magadan
Asia/Makassar: Asia/Kuala_Lumpur
Asia/Manila: Asia/Kuala_Lumpur
Asia/Muscat: Asia/Yerevan
Asia/Muscat: Asia/Muscat
Asia/Nicosia: Europe/Athens
Asia/Novokuznetsk: Asia/Novosibirsk
Asia/Novosibirsk: Asia/Novosibirsk
Expand Down Expand Up @@ -364,8 +364,8 @@ Australia/Hobart: Australia/Hobart
Australia/LHI: Pacific/Noumea
Australia/Lindeman: Australia/Brisbane
# Australia/Lord_Howe inexact match
Australia/Lord_Howe: Pacific/Noumea
Australia/Melbourne: Australia/Melbourne
Australia/Lord_Howe: Pacific/Noumea
Australia/Melbourne: Australia/Melbourne
Australia/North: Australia/Darwin
Australia/NSW: Australia/Sydney
Australia/Perth: Australia/Perth
Expand Down Expand Up @@ -436,7 +436,7 @@ Etc/UCT: Etc/UTC
Etc/Universal: Etc/UTC
Etc/UTC: Etc/UTC
Etc/Zulu: Etc/UTC
Europe/Amsterdam: Europe/Brussels
Europe/Amsterdam: Europe/Amsterdam
Europe/Andorra: Europe/Brussels
Europe/Astrakhan: Asia/Yerevan
Europe/Athens: Europe/Athens
Expand All @@ -462,7 +462,7 @@ Europe/Kiev: Europe/Kiev
Europe/Kirov: Europe/Moscow
Europe/Kyiv: Europe/Kiev
Europe/Lisbon: Europe/Lisbon
Europe/Ljubljana: Europe/Belgrade
Europe/Ljubljana: Europe/Ljubljana
Europe/London: Europe/London
Europe/Luxembourg: Europe/Brussels
Europe/Madrid: Europe/Madrid
Expand All @@ -480,11 +480,11 @@ Europe/Riga: Europe/Riga
Europe/Rome: Europe/Rome
Europe/Samara: Europe/Samara
Europe/San_Marino: Europe/Rome
Europe/Sarajevo: Europe/Belgrade
Europe/Sarajevo: Europe/Sarajevo
Europe/Saratov: Asia/Yerevan
Europe/Simferopol: Europe/Moscow
Europe/Skopje: Europe/Belgrade
Europe/Sofia: Europe/Sofia
Europe/Skopje: Europe/Skopje
Europe/Sofia: Europe/Sofia
Europe/Stockholm: Europe/Stockholm
Europe/Tallinn: Europe/Tallinn
Europe/Tirane: Europe/Belgrade
Expand All @@ -497,7 +497,7 @@ Europe/Vienna: Europe/Vienna
Europe/Vilnius: Europe/Vilnius
Europe/Volgograd: Europe/Volgograd
Europe/Warsaw: Europe/Warsaw
Europe/Zagreb: Europe/Belgrade
Europe/Zagreb: Europe/Zagreb
Europe/Zaporozhye: Europe/Kiev
Europe/Zurich: Europe/Zurich
Factory: Etc/UTC
Expand Down Expand Up @@ -551,7 +551,7 @@ Pacific/Funafuti: Pacific/Majuro
Pacific/Galapagos: America/Mexico_City
# Pacific/Gambier inexact match
Pacific/Gambier: Pacific/Honolulu
Pacific/Guadalcanal: Pacific/Noumea
Pacific/Guadalcanal: Pacific/Guadalcanal
Pacific/Guam: Pacific/Guam
Pacific/Honolulu: Pacific/Honolulu
Pacific/Johnston: Pacific/Honolulu
Expand Down
1 change: 1 addition & 0 deletions lib/worldwide/paths.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ module Paths
GENERATED_LOCALE_ROOT = File.join(OTHER_DATA_ROOT, "generated")
DB_DATA_ROOT = File.join(GEM_ROOT, "db/data")
REGIONS_ROOT = File.join(DB_DATA_ROOT, "regions")
TIME_ZONE_ROOT = File.join(OTHER_DATA_ROOT, "timezones")
end
end
1 change: 1 addition & 0 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
require "minitest/reporters"
require "minitest/focus" unless ENV["CI"]
require "mocha/minitest"
require "pry-byebug"

# All the locales used in the tests
I18n.available_locales = Worldwide::Locales.known
Expand Down
Loading

0 comments on commit 278b3c4

Please sign in to comment.