From 8c4f621f5855404628fae35cbd7745a0ee93dd90 Mon Sep 17 00:00:00 2001 From: Xavier Perseguers Date: Mon, 25 Jul 2011 08:20:27 +0200 Subject: [PATCH] [BUGFIX] CSH labels are always in English The CSH labels are always rendered in English because the source language (English) is used instead of its translation (target). Only fall back to source if the corresponding label was not translated. Change-Id: Icaaa17734b46b49ba48c2949cd7e48ee1c251750 Fixes: #28439 Reviewed-on: http://review.typo3.org/3711 Reviewed-by: Dominique Feyer Tested-by: Dominique Feyer Reviewed-by: Xavier Perseguers Tested-by: Xavier Perseguers --- typo3/sysext/lang/lang.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/typo3/sysext/lang/lang.php b/typo3/sysext/lang/lang.php index 214f1e608067..8f5f8c6b4e16 100755 --- a/typo3/sysext/lang/lang.php +++ b/typo3/sysext/lang/lang.php @@ -449,11 +449,12 @@ class language { } // Append label + $label = $lVal[0]['target'] ?: $lVal[0]['source']; if ($specialInstruction) { - $GLOBALS['TCA_DESCR'][$table]['columns'][$fieldName][$type] .= LF . $lVal[0]['source']; + $GLOBALS['TCA_DESCR'][$table]['columns'][$fieldName][$type] .= LF . $label; } else { // Substitute label - $GLOBALS['TCA_DESCR'][$table]['columns'][$fieldName][$type] = $lVal[0]['source']; + $GLOBALS['TCA_DESCR'][$table]['columns'][$fieldName][$type] = $label; } } } -- 2.20.1