Skip to content

Commit

Permalink
chore: update expected results for CLDR 42
Browse files Browse the repository at this point in the history
Punic 3.8.0 / CLDR 42 added a narrow no-break space unicode character for the time formats and a new default pattern for datetime.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
  • Loading branch information
kesselb committed Jul 24, 2023
1 parent c79c8df commit bbe5f17
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions tests/lib/DateTimeFormatterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ public function testFormatDate($timestamp, $expected) {

public function formatDateTimeData() {
return [
[1350129205, null, 'October 13, 2012 at 11:53:25 AM GMT+0'],
[1350129205, new \DateTimeZone('Europe/Berlin'), 'October 13, 2012 at 1:53:25 PM GMT+2'],
[1350129205, null, "October 13, 2012, 11:53:25\xE2\x80\xAFAM UTC"],
[1350129205, new \DateTimeZone('Europe/Berlin'), "October 13, 2012, 1:53:25\xE2\x80\xAFPM GMT+2"],
];
}

Expand All @@ -175,7 +175,7 @@ public function testFormatDateTime($timestamp, $timeZone, $expected) {
$this->assertEquals($expected, (string) $this->formatter->formatDateTime($timestamp, 'long', 'long', $timeZone));
}


public function testFormatDateWithInvalidTZ() {
$this->expectException(\Exception::class);

Expand Down
22 changes: 11 additions & 11 deletions tests/lib/L10N/L10nTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,34 +118,34 @@ public function testPlaceholders($string, $expected): void {
public function localizationData() {
return [
// timestamp as string
['February 13, 2009 at 11:31:30 PM UTC', 'en', 'en_US', 'datetime', '1234567890'],
['13. Februar 2009 um 23:31:30 UTC', 'de', 'de_DE', 'datetime', '1234567890'],
["February 13, 2009, 11:31:30\xE2\x80\xAFPM UTC", 'en', 'en_US', 'datetime', '1234567890'],
['13. Februar 2009, 23:31:30 UTC', 'de', 'de_DE', 'datetime', '1234567890'],
['February 13, 2009', 'en', 'en_US', 'date', '1234567890'],
['13. Februar 2009', 'de', 'de_DE', 'date', '1234567890'],
['11:31:30 PM UTC', 'en', 'en_US', 'time', '1234567890'],
["11:31:30\xE2\x80\xAFPM UTC", 'en', 'en_US', 'time', '1234567890'],
['23:31:30 UTC', 'de', 'de_DE', 'time', '1234567890'],

// timestamp as int
['February 13, 2009 at 11:31:30 PM UTC', 'en', 'en_US', 'datetime', 1234567890],
['13. Februar 2009 um 23:31:30 UTC', 'de', 'de_DE', 'datetime', 1234567890],
["February 13, 2009, 11:31:30\xE2\x80\xAFPM UTC", 'en', 'en_US', 'datetime', 1234567890],
['13. Februar 2009, 23:31:30 UTC', 'de', 'de_DE', 'datetime', 1234567890],
['February 13, 2009', 'en', 'en_US', 'date', 1234567890],
['13. Februar 2009', 'de', 'de_DE', 'date', 1234567890],
['11:31:30 PM UTC', 'en', 'en_US', 'time', 1234567890],
["11:31:30\xE2\x80\xAFPM UTC", 'en', 'en_US', 'time', 1234567890],
['23:31:30 UTC', 'de', 'de_DE', 'time', 1234567890],

// DateTime object
['February 13, 2009 at 11:31:30 PM GMT+0', 'en', 'en_US', 'datetime', new DateTime('@1234567890')],
['13. Februar 2009 um 23:31:30 GMT+0', 'de', 'de_DE', 'datetime', new DateTime('@1234567890')],
["February 13, 2009, 11:31:30\xE2\x80\xAFPM GMT+0", 'en', 'en_US', 'datetime', new DateTime('@1234567890')],
['13. Februar 2009, 23:31:30 GMT+0', 'de', 'de_DE', 'datetime', new DateTime('@1234567890')],
['February 13, 2009', 'en', 'en_US', 'date', new DateTime('@1234567890')],
['13. Februar 2009', 'de', 'de_DE', 'date', new DateTime('@1234567890')],
['11:31:30 PM GMT+0', 'en', 'en_US', 'time', new DateTime('@1234567890')],
["11:31:30\xE2\x80\xAFPM GMT+0", 'en', 'en_US', 'time', new DateTime('@1234567890')],
['23:31:30 GMT+0', 'de', 'de_DE', 'time', new DateTime('@1234567890')],

// en_GB
['13 February 2009 at 23:31:30 GMT+0', 'en_GB', 'en_GB', 'datetime', new DateTime('@1234567890')],
['13 February 2009, 23:31:30 GMT+0', 'en_GB', 'en_GB', 'datetime', new DateTime('@1234567890')],
['13 February 2009', 'en_GB', 'en_GB', 'date', new DateTime('@1234567890')],
['23:31:30 GMT+0', 'en_GB', 'en_GB', 'time', new DateTime('@1234567890')],
['13 February 2009 at 23:31:30 GMT+0', 'en-GB', 'en_GB', 'datetime', new DateTime('@1234567890')],
['13 February 2009, 23:31:30 GMT+0', 'en-GB', 'en_GB', 'datetime', new DateTime('@1234567890')],
['13 February 2009', 'en-GB', 'en_GB', 'date', new DateTime('@1234567890')],
['23:31:30 GMT+0', 'en-GB', 'en_GB', 'time', new DateTime('@1234567890')],
];
Expand Down

0 comments on commit bbe5f17

Please sign in to comment.