From 11b58768383db8060b9d5c8f56176a667d1265b8 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Tue, 5 May 2020 22:18:18 +0200
Subject: [PATCH] [BUGFIX] Show correct language title for inconsistent content
Show the correct language title in the new fluid page module if an
inconsistent content state has been detected. The title of the
problematic language must be shown instead of the default language
title.
Furthermore a not needed sprintf call is removed as the message itself
doesn't contain any placeholder which needs to be replaced.
Resolves: #91313
Releases: master
Change-Id: Ie1082bee58cb04068e2cea3b4f18c2b6f2b516f1
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64416
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Josef Glatz <josefglatz@gmail.com>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
---
.../backend/Classes/View/BackendLayout/ContentFetcher.php | 5 +++--
typo3/sysext/backend/Classes/View/PageLayoutView.php | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/ContentFetcher.php b/typo3/sysext/backend/Classes/View/BackendLayout/ContentFetcher.php
index 3ae9786ecc0e..2aa7b483090b 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/ContentFetcher.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/ContentFetcher.php
@@ -179,10 +179,11 @@ class ContentFetcher
&& $languageTranslationInfo['hasTranslations']
) {
$languageTranslationInfo['mode'] = 'mixed';
- $siteLanguage = $this->context->getSiteLanguage();
+ $siteLanguage = $this->context->getSiteLanguage($language);
+
$message = GeneralUtility::makeInstance(
FlashMessage::class,
- sprintf($this->getLanguageService()->getLL('staleTranslationWarning'), $siteLanguage->getTitle()),
+ $this->getLanguageService()->getLL('staleTranslationWarning'),
sprintf($this->getLanguageService()->getLL('staleTranslationWarningTitle'), $siteLanguage->getTitle()),
FlashMessage::WARNING
);
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index d8c6143140f6..f82bde02f2b9 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -1822,7 +1822,7 @@ class PageLayoutView implements LoggerAwareInterface
$siteLanguage = $this->siteLanguages[$language];
$message = GeneralUtility::makeInstance(
FlashMessage::class,
- sprintf($this->getLanguageService()->getLL('staleTranslationWarning'), $siteLanguage->getTitle()),
+ $this->getLanguageService()->getLL('staleTranslationWarning'),
sprintf($this->getLanguageService()->getLL('staleTranslationWarningTitle'), $siteLanguage->getTitle()),
FlashMessage::WARNING
);
--
GitLab