Skip to content
Snippets Groups Projects
Commit cc3080d6 authored by Daniel Goerz's avatar Daniel Goerz Committed by Andreas Fernandez
Browse files

[BUGFIX] Respect default label in TranslateViewHelper again

Resolves: #81862
Related: #81168
Releases: master, 8.7
Change-Id: Iee90dd123da8f445544e06ce9b61a83be2ff662b
Reviewed-on: https://review.typo3.org/53467


Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: default avatarJoerg Boesche <typo3@joergboesche.de>
Reviewed-by: default avatarFrans Saris <franssaris@gmail.com>
Reviewed-by: default avatarMarkus Klein <markus.klein@typo3.org>
Tested-by: default avatarMarkus Klein <markus.klein@typo3.org>
Reviewed-by: default avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: default avatarAndreas Fernandez <typo3@scripting-base.de>
Tested-by: default avatarAndreas Fernandez <typo3@scripting-base.de>
parent b4675b5b
Branches
Tags
No related merge requests found
......@@ -124,7 +124,11 @@ class TranslateViewHelper extends AbstractViewHelper
$request = $renderingContext->getControllerContext()->getRequest();
$extensionName = $extensionName === null ? $request->getControllerExtensionName() : $extensionName;
$value = static::translate($id, $extensionName, $arguments);
try {
$value = static::translate($id, $extensionName, $arguments);
} catch (\InvalidArgumentException $e) {
$value = null;
}
if ($value === null) {
$value = $default !== null ? $default : $renderChildrenClosure();
if (!empty($arguments)) {
......
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