Merge pull request #47995 from nextcloud/backport/47928/stable30

[stable30] fix(a11y): Update OpenDyslexic from 0.920 to 2.001

.reuse/dep5

@@ -15,7 +15,7 @@ Files: .tx/config
 Copyright: 2011-2012 ownCloud, Inc., 2017-2023 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-only
 
-Files: .htaccess 
+Files: .htaccess
 Copyright: 2011-2016 ownCloud, Inc., 2016-2024 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-only
 
@@ -204,7 +204,7 @@ Copyright: 2016-2024 Collabora Ltd.
 License: LicenseRef-CollaboraTrademarks
 
 Files: core/img/twitter.svg core/img/actions/twitter.svg apps/federatedfilesharing/img/social-twitter.svg
-Copyright: X Corp. 
+Copyright: X Corp.
 License: LicenseRef-XTrademarks
 
 Files: core/img/facebook.svg apps/federatedfilesharing/img/social-facebook.svg
@@ -327,6 +327,6 @@ Files: apps/settings/tests/UserMigration/assets/account.png
 Copyright: 2019 Fabian Wiktor <https://www.pexels.com/photo/green-and-brown-island-on-blue-sea-under-blue-sky-4011450/>
 License: CC0-1.0
 
-Files: apps/theming/fonts/OpenDyslexic-Bold.otf apps/theming/fonts/OpenDyslexic-Bold.ttf apps/theming/fonts/OpenDyslexic-Bold.woff apps/theming/fonts/OpenDyslexic-Regular.otf apps/theming/fonts/OpenDyslexic-Regular.ttf apps/theming/fonts/OpenDyslexic-Regular.woff
-Copyright: 2012-2019 Abbie Gonzalez <https://abbiecod.es|[email protected]<, with Reserved Font Name OpenDyslexic.
+Files: apps/theming/fonts/OpenDyslexic-Bold.otf apps/theming/fonts/OpenDyslexic-Regular.otf
+Copyright: 2012-2019 Abbie Gonzalez <https://abbiecod.es|[email protected]>, with Reserved Font Name OpenDyslexic.
 License: OFL-1.1-RFN

apps/theming/lib/Themes/DyslexiaFont.php

@@ -43,30 +43,22 @@ public function getCSSVariables(): array {
 	}
 
 	public function getCustomCss(): string {
-		$fontPathWoff = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.woff');
 		$fontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.otf');
-		$fontPathTtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.ttf');
-		$boldFontPathWoff = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.woff');
 		$boldFontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.otf');
-		$boldFontPathTtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.ttf');
 
 		return "
 			@font-face {
 				font-family: 'OpenDyslexic';
 				font-style: normal;
 				font-weight: 400;
-				src: url('$fontPathWoff') format('woff'),
-					 url('$fontPathOtf') format('opentype'),
-					 url('$fontPathTtf') format('truetype');
+				src: url('$fontPathOtf') format('opentype');
 			}
-			
+
 			@font-face {
 				font-family: 'OpenDyslexic';
 				font-style: normal;
 				font-weight: 700;
-				src: url('$boldFontPathWoff') format('woff'),
-					 url('$boldFontPathOtf') format('opentype'),
-					 url('$boldFontPathTtf') format('truetype');
+				src: url('$boldFontPathOtf') format('opentype');
 			}
 		";
 	}

apps/theming/tests/Themes/DyslexiaFontTest.php

@@ -163,7 +163,7 @@ public function testGetCustomCss($webRoot, $prettyUrlsEnabled) {
 			->with('htaccess.IgnoreFrontController', false)
 			->willReturn($prettyUrlsEnabled);
 
-		$this->assertStringContainsString("'$webRoot/apps/theming/fonts/OpenDyslexic-Regular.woff'", $this->dyslexiaFont->getCustomCss());
+		$this->assertStringContainsString("'$webRoot/apps/theming/fonts/OpenDyslexic-Regular.otf'", $this->dyslexiaFont->getCustomCss());
 		$this->assertStringNotContainsString('index.php', $this->dyslexiaFont->getCustomCss());
 	}
 }