Commit 9f87b2c7 authored by Andreas Fernandez's avatar Andreas Fernandez
Browse files

[BUGFIX] Inform about extended support in reports module correctly

The Core Updater and Reports module were modified to render correct
information about non-community supported TYPO3 releases (aka ELTS) with
while no ELTS was released yet, in contrast to the Core Updater.

The missing case is added with this patch.

Resolves: #94827
Related: #94745
Releases: master, 10.4, 9.5
Change-Id: Ib4d8791478b89ad7e9b92930d882a98c76b809a3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/70422


Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
parent c81483f4
......@@ -233,6 +233,9 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
$message = $languageService->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_versionOutdated');
$status = Status::ERROR;
} else {
$message = '';
$status = Status::OK;
// There is an update available
$availableReleases = [];
$latestRelease = $coreVersionService->getYoungestPatchRelease();
......@@ -248,14 +251,21 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
if ($coreVersionService->isPatchReleaseSuitableForUpdate($latestCommunityDrivenRelease)) {
$availableReleases[] = $latestCommunityDrivenRelease;
}
} elseif (!$isCurrentVersionElts) {
// Inform user about ELTS being available soon if:
// - regular support ran out
// - the current installed version is no ELTS
// - no ELTS update was released, yet
$message = sprintf(
$languageService->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_elts_information'),
TYPO3_version,
'<a href="https://typo3.com/elts" target="_blank" rel="noopener">https://typo3.com/elts</a>'
);
$status = Status::WARNING;
}
}
if ($availableReleases === []) {
// Everything is fine, working with the latest version
$message = '';
$status = Status::OK;
} else {
if ($availableReleases !== []) {
$messages = [];
$status = Status::WARNING;
foreach ($availableReleases as $availableRelease) {
......
......@@ -75,6 +75,9 @@
<trans-unit id="status_newVersion" resname="status_newVersion">
<source>There is a new version of TYPO3 available. You can update to version %s.</source>
</trans-unit>
<trans-unit id="status_elts_information" resname="status_elts_information">
<source>The currently installed TYPO3 version %s doesn't receive any community-driven updates anymore, consider subscribing to Extended Long Term Support (ELTS) releases. Get more information at %s.</source>
</trans-unit>
<trans-unit id="status_elts_download" resname="status_elts_download">
<source>Please visit %s to download the release in your ELTS area.</source>
</trans-unit>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment