[TASK] Reformat TYPO3 login warranty and license information

Resolves: #108306
Releases: main, 13.4, 12.4
Change-Id: I5a671b56569b186089e0f264e086ca8825430904
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/91876
Tested-by: Oli Bartsch <[email protected]>
Reviewed-by: Oli Bartsch <[email protected]>
Tested-by: Benni Mack <[email protected]>
Tested-by: core-ci <[email protected]>
Reviewed-by: Benni Mack <[email protected]>
(cherry picked from commit f761142)
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/91879
Reviewed-by: Garvin Hicking <[email protected]>
Tested-by: Garvin Hicking <[email protected]>

Author: garvinhicking

typo3/sysext/backend/Resources/Private/Language/locallang_login.xlf

@@ -48,11 +48,11 @@
 			<trans-unit id="error.furtherInformation" resname="error.furtherInformation">
 				<source>For more information or further help click here</source>
 			</trans-unit>
-			<trans-unit id="warranty.by" resname="warranty.by">
-				<source>Warranty is supplied by %s; %sdetails about licences.%s</source>
+			<trans-unit id="warranty.by" resname="warranty.by" x-unused-since="12.4">
+				<source>Warranty is supplied by %s; %sdetails about licenses.%s</source>
 			</trans-unit>
-			<trans-unit id="no.warranty" resname="no.warranty">
-				<source>TYPO3 CMS comes with ABSOLUTELY NO WARRANTY; %sdetails about licences.%s</source>
+			<trans-unit id="no.warranty" resname="no.warranty" x-unused-since="12.4">
+				<source>TYPO3 CMS comes with ABSOLUTELY NO WARRANTY; %sdetails about licenses.%s</source>
 			</trans-unit>
 			<trans-unit id="typo3.cms" resname="typo3.cms">
 				<source>TYPO3 CMS</source>
@@ -72,12 +72,18 @@
 			<trans-unit id="extension.trademark">
 				<source>TYPO3 is a registered %strademark%s.</source>
 			</trans-unit>
-			<trans-unit id="details.link" resname="details.link">
+			<trans-unit id="details.link" resname="details.link" x-unused-since="12.4">
 				<source>Go to %s for details.</source>
 			</trans-unit>
 			<trans-unit id="free.software" resname="free.software">
 				<source>This is free software, and you are welcome to redistribute it under certain conditions; %sdetails about licences.%s</source>
 			</trans-unit>
+			<trans-unit id="free_software_and_warranty" resname="free_software_and_warranty">
+				<source>TYPO3 CMS comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions, see %sdetails about licenses.%s</source>
+			</trans-unit>
+			<trans-unit id="free_software_and_custom_warranty" resname="free_software_and_custom_warranty">
+				<source>Warranty is supplied by %s. This is free software, and you are welcome to redistribute it under certain conditions, see %sdetails about licenses.%s</source>
+			</trans-unit>
 			<trans-unit id="keep.notice" resname="keep.notice">
 				<source>Obstructing the appearance of this notice is prohibited by law.</source>
 			</trans-unit>

typo3/sysext/core/Classes/Information/Typo3Information.php

@@ -89,16 +89,16 @@ public function getCopyrightNotice(): string
 
         if (strlen($loginCopyrightWarrantyProvider) >= 2 && strlen($loginCopyrightWarrantyURL) >= 10) {
             $warrantyNote = sprintf(
-                $this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:warranty.by'),
+                $this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:free_software_and_custom_warranty'),
                 htmlspecialchars($loginCopyrightWarrantyProvider),
                 '<a href="' . htmlspecialchars($loginCopyrightWarrantyURL) . '" target="_blank" rel="noreferrer">',
                 '</a>'
             );
         } else {
             $warrantyNote = sprintf(
-                $this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:no.warranty'),
+                $this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:free_software_and_warranty'),
                 '<a href="' . htmlspecialchars(static::URL_LICENSE) . '" target="_blank" rel="noreferrer">',
-                '</a>'
+                '</a> '
             );
         }
         return '<a href="' . htmlspecialchars(static::URL_COMMUNITY) . '" target="_blank" rel="noreferrer">' .
@@ -111,16 +111,7 @@ public function getCopyrightNotice(): string
                 '<a href="' . htmlspecialchars(static::URL_TRADEMARK) . '" target="_blank" rel="noreferrer">',
                 '</a>'
             ) . ' ' .
-            sprintf(
-                $this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:details.link'),
-                '<a href="' . htmlspecialchars(static::URL_COMMUNITY) . '" target="_blank" rel="noreferrer">' . htmlspecialchars(static::URL_COMMUNITY) . '</a>'
-            ) . ' ' .
-            strip_tags($warrantyNote, '<a>') . ' ' .
-            sprintf(
-                $this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:free.software'),
-                '<a href="' . htmlspecialchars(static::URL_LICENSE) . '" target="_blank" rel="noreferrer">',
-                '</a> '
-            )
+            $warrantyNote
             . $this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:keep.notice');
     }
 }