From e6f470ebd2ddac7f0c864fd7c18c3d12a9009c30 Mon Sep 17 00:00:00 2001
From: Mathias Brodala <mbrodala@pagemachine.de>
Date: Fri, 2 Mar 2018 09:21:42 +0100
Subject: [PATCH] [TASK] Improve TranslateViewHelper compiling
Simplify string interpolation with positional arguments.
Resolves: #82454
Releases: master
Change-Id: If2bb56be5bba183ff5decbbb4a8f61eb01c61792
Reviewed-on: https://review.typo3.org/55983
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
---
.../fluid/Classes/ViewHelpers/TranslateViewHelper.php | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
index 0f569117bdee..c12c5849db7b 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
@@ -107,15 +107,9 @@ class TranslateViewHelper extends AbstractViewHelper
public function compile($argumentsName, $closureName, &$initializationPhpCode, ViewHelperNode $node, TemplateCompiler $compiler)
{
return sprintf(
- '\\%s::translate(%s[\'key\'] ?? %s[\'id\'], %s[\'extensionName\'] ?? $renderingContext->getControllerContext()->getRequest()->getControllerExtensionName(), %s[\'arguments\'], %s[\'languageKey\'], %s[\'alternativeLanguageKeys\']) ?? %s[\'default\'] ?? %s()',
+ '\\%1$s::translate(%2$s[\'key\'] ?? %2$s[\'id\'], %2$s[\'extensionName\'] ?? $renderingContext->getControllerContext()->getRequest()->getControllerExtensionName(), %2$s[\'arguments\'], %2$s[\'languageKey\'], %2$s[\'alternativeLanguageKeys\']) ?? %2$s[\'default\'] ?? %3$s()',
LocalizationUtility::class,
$argumentsName,
- $argumentsName,
- $argumentsName,
- $argumentsName,
- $argumentsName,
- $argumentsName,
- $argumentsName,
$closureName
);
}
--
GitLab