keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12641 from MrPetovan/bug/warnings

Browse source 
Add yet another case to DateTimeFormat::fix
This commit is contained in:
Michael Vogel 2023-01-09 18:20:58 +01:00 committed by GitHub
commit 69a9c2c618
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Util/DateTimeFormat.php
View file

@ -182,8 +182,8 @@ class DateTimeFormat
*/
public static function fix(string $dateString): string
{
$search = ['Mär', 'März', 'Mai', 'Juni', 'Juli', 'Okt', 'Dez', 'ET' , 'ZZ', ' - ', '+', ' (Coordinated Universal Time)'];
$replace = ['Mar', 'Mar' , 'May', 'Jun' , 'Jul' , 'Oct', 'Dec', 'EST', 'Z' , ', ' , '+' , ''];
$search = ['Mär', 'März', 'Mai', 'Juni', 'Juli', 'Okt', 'Dez', 'ET' , 'ZZ', ' - ', '+', '+', ' (Coordinated Universal Time)'];
$replace = ['Mar', 'Mar' , 'May', 'Jun' , 'Jul' , 'Oct', 'Dec', 'EST', 'Z' , ', ' , '+' , '+' , ''];
$dateString = str_replace($search, $replace, $dateString);

4
tests/src/Util/DateTimeFormatTest.php
View file

@ -130,6 +130,10 @@ class DateTimeFormatTest extends MockedTest
'(Coordinated Universal Time)' => [
'expectedDate' => '2022-12-30T14:29:10+00:00',
'dateString' => 'Fri Dec 30 2022 14:29:10 GMT+0000 (Coordinated Universal Time)',
],
'Double HTML encode' => [
'expectedDate' => '2015-05-22T08:48:00+12:00',
'dateString' => '2015-05-22T08:48:00+12:00'
]
];
}