diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_reference.php b/typo3/sysext/core/Configuration/TCA/sys_file_reference.php index 3677e1d9b4110f09cc73e981bf521642e9413b3c..20b3d07a62ae373b0a3ddf521523197a9bb2d245 100644 --- a/typo3/sysext/core/Configuration/TCA/sys_file_reference.php +++ b/typo3/sysext/core/Configuration/TCA/sys_file_reference.php @@ -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( diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv index d443aacc87b44f1b51a5e7ea7b548d57281f1dd9..d225e109a2513c30763fb1d5bb9a6a1ddfd9b4c6 100644 --- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv +++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv @@ -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 diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv index 1a4efc67665f89f473f280861440117b1c67c7f8..e1d48066f4dc4a4b56f7d151dc391bb679f3c880 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv @@ -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 diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv index 605c00c1de68a273f1d9ba055b2579465e31cdef..ae5efcef97ab14e3c7222562d50c461a4fb37b39 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv @@ -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 diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv index 605c00c1de68a273f1d9ba055b2579465e31cdef..ae5efcef97ab14e3c7222562d50c461a4fb37b39 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv @@ -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