Skip to content

Commit

Permalink
Merge pull request #7730 from Sesquipedalian/tzdb_updates
Browse files Browse the repository at this point in the history
Adds label and fallback code for new America/Ciudad_Juarez time zone
  • Loading branch information
Sesquipedalian authored Aug 4, 2023
2 parents 32a5884 + d24d017 commit a9fe8f5
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
21 changes: 19 additions & 2 deletions Sources/Subs-Timezones.php
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,7 @@ function get_sorted_tzids_for_country($country_code, $when = 'now')
'America/Mexico_City',
'America/Tijuana',
'America/Monterrey',
'America/Ciudad_Juarez',
'America/Chihuahua',
'America/Merida',
'America/Hermosillo',
Expand Down Expand Up @@ -1883,7 +1884,7 @@ function get_tzid_fallbacks($tzids, $when = 'now')
'tzid' => 'Asia/Novokuznetsk',
),
array(
'ts' => strtotime('1995-05-27T17:00:00+0000'),
'ts' => strtotime('1995-05-27T16:00:00+0000'),
'tzid' => 'Asia/Novosibirsk',
),
array(
Expand All @@ -1907,7 +1908,7 @@ function get_tzid_fallbacks($tzids, $when = 'now')
'tzid' => 'Asia/Novokuznetsk',
),
array(
'ts' => strtotime('2002-04-30T20:00:00+0000'),
'ts' => strtotime('2002-04-30T19:00:00+0000'),
'tzid' => 'Asia/Novosibirsk',
),
array(
Expand Down Expand Up @@ -2049,6 +2050,22 @@ function get_tzid_fallbacks($tzids, $when = 'now')
'tzid' => 'Asia/Almaty',
),
),

// Diverged from America/Ojinaga in version 2022g.
'America/Ciudad_Juarez' => array(
array(
'ts' => PHP_INT_MIN,
'tzid' => '',
),
array(
'ts' => strtotime('1922-01-01T07:00:00+0000'),
'tzid' => 'America/Ojinaga',
),
array(
'ts' => strtotime('2022-11-30T06:00:00+0000'),
'tzid' => 'America/Denver',
),
),
);

$missing = array_diff($tzids, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC));
Expand Down
1 change: 1 addition & 0 deletions Themes/default/languages/Timezones.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@
$txt['America/Cayman'] = 'George Town';
$txt['America/Chicago'] = 'Chicago';
$txt['America/Chihuahua'] = 'Chihuahua';
$txt['America/Ciudad_Juarez'] = 'Ciudad Juárez';
$txt['America/Costa_Rica'] = 'San José';
$txt['America/Creston'] = 'Creston';
$txt['America/Cuiaba'] = 'Cuiabá';
Expand Down

0 comments on commit a9fe8f5

Please sign in to comment.