Merge pull request #39486 from nextcloud/3rdparty-bump-punic

chore(3rdparty): update punic to 3.8.1
nextcloud · Jul 27, 2023 · 767c42f · 767c42f
2 parents fbe5d06 + 68eecca
commit 767c42f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/3rdparty b/3rdparty
diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php
@@ -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"],
 		];
 	}
 
@@ -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);
 

diff --git a/tests/lib/L10N/L10nTest.php b/tests/lib/L10N/L10nTest.php
@@ -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 GMT+0', 'en', 'en_US', 'datetime', '1234567890'],
-			['13. Februar 2009 um 23:31:30 GMT+0', '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 GMT+0', 'en', 'en_US', 'time', '1234567890'],
-			['23:31:30 GMT+0', 'de', 'de_DE', '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 GMT+0', 'en', 'en_US', 'datetime', 1234567890],
-			['13. Februar 2009 um 23:31:30 GMT+0', '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 GMT+0', 'en', 'en_US', 'time', 1234567890],
-			['23:31:30 GMT+0', 'de', 'de_DE', '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')],
 		];