mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 09:00:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-78151-401' of https://github.com/paulholden/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Andrew Nicols 2023-05-18 11:48:39 +08:00
commit 30e9810589
No known key found for this signature in database
GPG Key ID: 6D1E3157C8CFBF14
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/classes/date.php
View File

@ -608,6 +608,7 @@ class core_date {
'America/Cordoba' => 'America/Argentina/Cordoba',
'America/Ensenada' => 'America/Tijuana',
'America/Fort_Wayne' => 'America/Indiana/Indianapolis',
'America/Godthab' => 'America/Nuuk',
'America/Indianapolis' => 'America/Indiana/Indianapolis',
'America/Jujuy' => 'America/Argentina/Jujuy',
'America/Knox_IN' => 'America/Indiana/Knox',
@ -641,8 +642,10 @@ class core_date {
'Australia/Canberra' => 'Australia/Sydney',
'Australia/Yancowinna' => 'Australia/Broken_Hill',
'Europe/Belfast' => 'Europe/London',
'Europe/Kiev' => 'Europe/Kyiv',
'Europe/Nicosia' => 'Asia/Nicosia',
'Europe/Tiraspol' => 'Europe/Chisinau',
'Pacific/Enderbury' => 'Pacific/Kanton',
'Pacific/Johnston' => 'Pacific/Honolulu',
'Pacific/Ponape' => 'Pacific/Pohnpei',
'Pacific/Samoa' => 'Pacific/Pago_Pago',
@ -744,7 +747,23 @@ class core_date {
];
$intl_formatter = function (DateTimeInterface $timestamp, string $format) use ($intl_formats, $locale) {
// Map IANA timezone DB names (used by PHP) to those used internally by the "intl" extension. The extension uses its
// own data based on ICU timezones, which may not necessarily be in-sync with IANA depending on the version installed
// on the local system. See: https://unicode-org.github.io/icu/userguide/datetime/timezone/#updating-the-time-zone-data
$tz = $timestamp->getTimezone();
$intltz = IntlTimeZone::fromDateTimeZone($tz);
if ($intltz === null) {
// Where intl doesn't know about a recent timezone, map it to an equivalent existing zone.
$intltzname = strtr($tz->getName(), [
'America/Ciudad_Juarez' => 'America/Denver',
'America/Nuuk' => 'America/Godthab',
'Europe/Kyiv' => 'Europe/Kiev',
'Pacific/Kanton' => 'Pacific/Enderbury',
]);
$intltz = IntlTimeZone::createTimeZone($intltzname);
}
$date_type = IntlDateFormatter::FULL;
$time_type = IntlDateFormatter::FULL;
$pattern = '';
@ -782,10 +801,10 @@ class core_date {
// This leads to the same instants in time, as expressed in Unix time, having different representations
// in formatted strings.
// To adjust for this, a custom calendar can be supplied with a cutover date arbitrarily far in the past.
$calendar = IntlGregorianCalendar::createInstance();
$calendar = IntlGregorianCalendar::createInstance($intltz);
$calendar->setGregorianChange(PHP_INT_MIN);
return (new IntlDateFormatter($locale, $date_type, $time_type, $tz, $calendar, $pattern))->format($timestamp);
return (new IntlDateFormatter($locale, $date_type, $time_type, $intltz, $calendar, $pattern))->format($timestamp);
};
// Same order as https://www.php.net/manual/en/function.strftime.php