Skip to content

Commit 21da85f

Browse files
garvinhickingsbuerk
authored andcommitted
[TASK] Add information about TYPO3 trademark to about+login
Resolves: #108274 Releases: main, 13.4, 12.4 Change-Id: I84b6cccd9b54141fbd18ca4d76afe854df78f627 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/91836 Tested-by: Sven Liebert <mail@sven-liebert.de> Tested-by: core-ci <typo3@b13.com> Tested-by: Oliver Hader <oliver.hader@typo3.org> Reviewed-by: Oliver Hader <oliver.hader@typo3.org> Reviewed-by: Sven Liebert <mail@sven-liebert.de> Reviewed-by: Stefan Bürk <stefan@buerk.tech> Tested-by: Stefan Bürk <stefan@buerk.tech>
1 parent 50f4fa8 commit 21da85f

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

typo3/sysext/backend/Classes/Controller/AboutController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public function handleRequest(ServerRequestInterface $request): ResponseInterfac
5858
'typo3Info' => $this->typo3Information,
5959
'typo3Version' => $this->version,
6060
'donationUrl' => $this->typo3Information::URL_DONATE,
61+
'trademarkUrl' => $this->typo3Information::URL_TRADEMARK,
6162
'loadedExtensions' => $this->getLoadedExtensions(),
6263
'messages' => $event->getMessages(),
6364
'modules' => $this->moduleProvider->getModules($this->getBackendUser()),

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
<trans-unit id="extension.copyright">
7070
<source>Extensions are copyright of their respective owners.</source>
7171
</trans-unit>
72+
<trans-unit id="extension.trademark">
73+
<source>TYPO3 is a registered %strademark%s.</source>
74+
</trans-unit>
7275
<trans-unit id="details.link">
7376
<source>Go to %s for details.</source>
7477
</trans-unit>

typo3/sysext/backend/Resources/Private/Partials/About/About.fluid.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/Modules/about.xlf:cms_description',
33
arguments: '{
44
0: "&copy; {typo3Info.copyrightYear}",
5-
1: "Kasper Sk&aring;rh&oslash;j"
5+
1: "Kasper Sk&aring;rh&oslash;j."
6+
}') -> f:format.raw()}
7+
</p>
8+
<p>
9+
{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:extension.trademark',
10+
arguments: '{
11+
0: "<a href=\"{trademarkUrl}\" target=\"_blank\" rel=\"noreferrer\">",
12+
1: "</a>"
613
}') -> f:format.raw()}
714
</p>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class Typo3Information
3030
public const URL_LICENSE = 'https://typo3.org/project/licenses/';
3131
public const URL_EXCEPTION = 'https://typo3.org/go/exception/CMS/';
3232
public const URL_DONATE = 'https://typo3.org/community/contribute/donate/';
33+
public const URL_TRADEMARK = 'https://typo3.org/trademark';
3334
private const URL_DOCS = 'https://docs.typo3.org/permalink/%s@%s';
3435

3536
protected LanguageService $languageService;
@@ -105,6 +106,11 @@ public function getCopyrightNotice(): string
105106
$this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:copyright') . ' &copy; '
106107
. htmlspecialchars($this->getCopyrightYear()) . ' Kasper Sk&aring;rh&oslash;j. ' .
107108
$this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:extension.copyright') . ' ' .
109+
sprintf(
110+
$this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:extension.trademark'),
111+
'<a href="' . htmlspecialchars(static::URL_TRADEMARK) . '" target="_blank" rel="noreferrer">',
112+
'</a>'
113+
) . ' ' .
108114
sprintf(
109115
$this->languageService->sL('LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:details.link'),
110116
'<a href="' . htmlspecialchars(static::URL_COMMUNITY) . '" target="_blank" rel="noreferrer">' . htmlspecialchars(static::URL_COMMUNITY) . '</a>'

0 commit comments

Comments
 (0)