[BUGFIX] Improve l10n_mode config for sys_file_reference 56/32756/2
authorAlexander Stehlik <alexander.stehlik@gmail.com>
Tue, 1 Jul 2014 14:02:19 +0000 (16:02 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sun, 14 Sep 2014 11:53:24 +0000 (13:53 +0200)
Since the rendering in the Frontend does not merge the values
the mergeIfNotBlank setting is replaced with prefixLangTitle for
the alternative, description and title field.

For the link field the mergeIfNotBlank setting is removed because
a prefix does not make sense there.

Releases: 6.3, 6.2
Resolves: #59972
Change-Id: I242b687a7ce851270022b86561f13eacea4d3949
Reviewed-on: http://review.typo3.org/32756
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/core/Configuration/TCA/sys_file_reference.php

index 0374783..e8928c9 100644 (file)
@@ -152,7 +152,7 @@ return array(
                        )
                ),
                'title' => array(
-                       'l10n_mode' => 'mergeIfNotBlank',
+                       'l10n_mode' => 'prefixLangTitle',
                        'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.title',
                        'config' => array(
@@ -165,7 +165,6 @@ return array(
                        )
                ),
                'link' => array(
-                       'l10n_mode' => 'mergeIfNotBlank',
                        'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.link',
                        'config' => array(
@@ -191,7 +190,7 @@ return array(
                ),
                'description' => array(
                        // This is used for captions in the frontend
-                       'l10n_mode' => 'mergeIfNotBlank',
+                       'l10n_mode' => 'prefixLangTitle',
                        'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.description',
                        'config' => array(
@@ -205,7 +204,7 @@ return array(
                        )
                ),
                'alternative' => array(
-                       'l10n_mode' => 'mergeIfNotBlank',
+                       'l10n_mode' => 'prefixLangTitle',
                        'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.alternative',
                        'config' => array(