Skip to content

Commit 8c9959c

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/+/91862 Tested-by: core-ci <[email protected]> Tested-by: Stefan Bürk <[email protected]> Reviewed-by: Stefan Bürk <[email protected]>
1 parent 05d1c48 commit 8c9959c

File tree

4 files changed

+17
-0
lines changed

4 files changed

+17
-0
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" resname="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" resname="details.link">
7376
<source>Go to %s for details.</source>
7477
</trans-unit>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,10 @@
66
2: "Kasper Sk&aring;rh&oslash;j"
77
}') -> f:format.raw()}
88
</p>
9+
<p>
10+
{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_login.xlf:extension.trademark',
11+
arguments: '{
12+
0: "<a href=\"{trademarkUrl}\" target=\"_blank\" rel=\"noreferrer\">",
13+
1: "</a>"
14+
}') -> f:format.raw()}
15+
</p>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class Typo3Information
3131
public const URL_EXCEPTION = 'https://typo3.org/go/exception/CMS/';
3232
public const URL_DONATE = 'https://typo3.org/community/contribute/donate/';
3333
public const URL_OPCACHE = 'https://docs.typo3.org/m/typo3/tutorial-getting-started/main/en-us/Troubleshooting/PHP.html#opcode-cache-messages';
34+
public const URL_TRADEMARK = 'https://typo3.org/trademark';
3435

3536
protected LanguageService $languageService;
3637

@@ -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)