Commit 4143a9b4 authored by Alexander Stehlik's avatar Alexander Stehlik Committed by Andreas Fernandez
Browse files

[BUGFIX] Improve l10n_mode config for sys_file_reference

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.

Change-Id: I09dfd6d971357ceaeaa08f60057323b3c7e33aa1
Releases: master
Resolves: #59972
Reviewed-on: http://review.typo3.org/32758


Reviewed-by: Frank Nägler's avatarFrank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler's avatarFrank Nägler <frank.naegler@typo3.org>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez's avatarAndreas Fernandez <typo3@scripting-base.de>
parent 7582ab14
......@@ -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(
......
......@@ -4,8 +4,8 @@ sys_file_reference
,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,1,sys_file,,,,,
,131,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,2,sys_file,,,,,
,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
,131,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
tt_content
,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
......
......@@ -4,10 +4,10 @@ sys_file_reference
,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
,130,89,48,0,1,128,1,1,0,0,0,21,332,tt_content,image,1,sys_file,,,,,
,131,-1,48,0,1,128,1,-1,0,130,0,21,332,tt_content,image,10,sys_file,,,,,
,132,89,24,0,1,129,1,1,0,0,0,1,332,tt_content,image,2,sys_file,,,,,
,133,-1,24,0,1,129,1,-1,0,132,0,1,332,tt_content,image,10,sys_file,,,,,
,130,89,48,0,1,128,1,1,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
,131,-1,48,0,1,128,1,-1,0,130,0,21,332,tt_content,image,10,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
,132,89,24,0,1,129,1,1,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
,133,-1,24,0,1,129,1,-1,0,132,0,1,332,tt_content,image,10,sys_file,"[Translate to Dansk:] This is Kasper",,,,
tt_content
,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
......
......@@ -4,8 +4,8 @@ sys_file_reference
,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,10,sys_file,,,,,
,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,10,sys_file,,,,,
,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,10,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,10,sys_file,"[Translate to Dansk:] This is Kasper",,,,
tt_content
,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
......
......@@ -4,8 +4,8 @@ sys_file_reference
,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,10,sys_file,,,,,
,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,10,sys_file,,,,,
,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,10,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,10,sys_file,"[Translate to Dansk:] This is Kasper",,,,
tt_content
,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
......
Supports Markdown
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