[BUGFIX] Correctly render language fields of sys_file_metadata 60/57760/2
authorHelmut Hummel <typo3@helhum.io>
Wed, 1 Aug 2018 18:04:16 +0000 (20:04 +0200)
committerNicole Cordes <typo3@cordes.co>
Wed, 1 Aug 2018 18:51:48 +0000 (20:51 +0200)
This reverts commit 1a74c8c9d302958dd17b6a35c03e185f13811c4b
("[BUGFIX] Correctly reference sys_file_metadata.language in TCA"),
that replaced the rendering of sys_language_uid and l10n_parent
with the file language field, which was since then rendered twice.

We now correctly render the hidden language palette in the general tab
and remove the language tab, which was empty after the palette has been
hidden.

Resolves: #85711
Related: #84200
Related: #75040
Releases: master, 8.7
Change-Id: I18ab907bc48f81b257d3af42c4278d6688166b2f
Reviewed-on: https://review.typo3.org/57760
Reviewed-by: Moritz Ngo <moritz.ngo@p2media.de>
Tested-by: Moritz Ngo <moritz.ngo@p2media.de>
Reviewed-by: Dennis Oezet <dennisoezet@gmx.net>
Tested-by: Dennis Oezet <dennisoezet@gmx.net>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Markus Volkmer <typo3@markusvolkmer.de>
Tested-by: Markus Volkmer <typo3@markusvolkmer.de>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
typo3/sysext/filemetadata/Configuration/TCA/Overrides/sys_file_metadata.php

index 4628b05..3781a95 100644 (file)
@@ -10,12 +10,10 @@ $tca = [
             'showitem' => '
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
                     fileinfo, title, description, ranking, keywords,
-                    --palette--;;25,
+                    --palette--;;25, --palette--;;language,
                 --div--;LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:tabs.metadata,
                     creator, creator_tool, publisher, source, copyright,
                     --palette--;;40,
-                --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
-                    language,
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                     --palette--;;10,
                     fe_groups,
@@ -28,12 +26,10 @@ $tca = [
             'showitem' => '
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
                     fileinfo, title, description, ranking, keywords,
-                    --palette--;;25,
+                    --palette--;;25, --palette--;;language,
                 --div--;LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:tabs.metadata,
                     creator, creator_tool, publisher, source, copyright, language,
                     --palette--;;40,
-                --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
-                    language,
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                     --palette--;;10,
                     fe_groups,
@@ -46,7 +42,7 @@ $tca = [
             'showitem' => '
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
                     fileinfo, title, description, ranking, keywords,
-                    --palette--;;20,
+                    --palette--;;20, --palette--;;language,
                 --div--;LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:tabs.metadata,
                     creator, creator_tool, publisher, source, copyright, language,
                     --palette--;;40,
@@ -55,8 +51,6 @@ $tca = [
                 --div--;LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:tabs.camera,
                     color_space,
                     --palette--;;50,
-                --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
-                    language,
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                     --palette--;;10,
                     fe_groups,
@@ -69,14 +63,12 @@ $tca = [
             'showitem' => '
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
                     fileinfo, title, description, ranking, keywords,
-                    --palette--;;25,
+                    --palette--;;25, --palette--;;language,
                 --div--;LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:tabs.metadata,
                     creator, creator_tool, publisher, source, copyright, language,
                     --palette--;;60,
                 --div--;LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:tabs.audio,
                     duration,
-                --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
-                    language,
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                     --palette--;;10,
                     fe_groups,
@@ -89,14 +81,12 @@ $tca = [
             'showitem' => '
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
                     fileinfo, title, description, ranking, keywords,
-                    --palette--;;25,
+                    --palette--;;25, --palette--;;language,
                 --div--;LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:tabs.metadata,
                     creator, creator_tool, publisher, source, copyright, language,
                     --palette--;;60,
                 --div--;LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:tabs.video,
                     duration,
-                --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
-                    language,
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                     --palette--;;10,
                     fe_groups,
@@ -109,15 +99,13 @@ $tca = [
             'showitem' => '
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
                     fileinfo, title, description, ranking, keywords,
-                    --palette--;;25,
+                    --palette--;;25, --palette--;;language,
                 --div--;LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:tabs.metadata,
                     creator, creator_tool, publisher, source, copyright, language,
                     --palette--;;40,
                     pages,
                     --palette--;;50,
                     --palette--;;60,
-                --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
-                    language,
                 --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
                     --palette--;;10,
                     fe_groups,