[TASK] Remove l10n_cat leftover 86/52086/3
authorChristian Kuhn <lolli@schwarzbu.ch>
Fri, 17 Mar 2017 16:02:23 +0000 (17:02 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 20 Mar 2017 10:22:33 +0000 (11:22 +0100)
TCA property l10n_cat has been there since ever and nobody understood it.
The docs about it never said what it really does and the according arguments
from EditDocumentController were never used.
The patch removes l10n_cat and some left over handling in
EditDocumentController.
Do not confuse this l10n_cat related localizationMode text/media with the
localizationMode select/keep from inline: The inline part is not touched
by the patch.

Change-Id: Ia7b54bddabffcad3e38df76731d7fe9f6b8ff40f
Resolves: #80331
Releases: master
Reviewed-on: https://review.typo3.org/52086
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/backend/Classes/Controller/EditDocumentController.php
typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php
typo3/sysext/frontend/Configuration/TCA/tt_content.php

index 60de056..883b81a 100644 (file)
@@ -209,6 +209,7 @@ class EditDocumentController extends AbstractModule
 
     /**
      * @var string
+     * @deprecated since TYPO3 v8, will be removed in TYPO3 v9
      */
     public $localizationMode;
 
@@ -456,7 +457,6 @@ class EditDocumentController extends AbstractModule
         $this->closeDoc = (int)GeneralUtility::_GP('closeDoc');
         $this->doSave = GeneralUtility::_GP('doSave');
         $this->returnEditConf = GeneralUtility::_GP('returnEditConf');
-        $this->localizationMode = GeneralUtility::_GP('localizationMode');
         $this->workspace = GeneralUtility::_GP('workspace');
         $this->uc = GeneralUtility::_GP('uc');
         // Setting override values as default if defVals does not exist.
index 51cadac..29c4e8f 100644 (file)
@@ -79,9 +79,6 @@ class SingleFieldContainer extends AbstractContainer
             || $parameterArray['fieldConf']['config']['type'] === 'passthrough'
             // Return if field should not be rendered in translated records
             || $isOverlay && empty($parameterArray['fieldConf']['l10n_display']) && $parameterArray['fieldConf']['l10n_mode'] === 'exclude'
-            // @todo: localizationMode still needs handling!
-            // @deprecated: IRRE 'localizationMode' is deprecated and will be removed in TYPO3 CMS 9
-            || $isOverlay && $this->data['localizationMode'] && $this->data['localizationMode'] !== $parameterArray['fieldConf']['l10n_cat']
             || $this->inlineFieldShouldBeSkipped()
         ) {
             return $resultArray;
index 89cf3f6..7fd8665 100644 (file)
@@ -70,7 +70,6 @@ return [
         'title' => [
             'l10n_mode' => 'prefixLangTitle',
             'label' => $GLOBALS['TCA']['pages']['columns']['title']['label'],
-            'l10n_cat' => 'text',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -80,7 +79,6 @@ return [
         ],
         'subtitle' => [
             'exclude' => true,
-            'l10n_cat' => 'text',
             'label' => $GLOBALS['TCA']['pages']['columns']['subtitle']['label'],
             'config' => [
                 'type' => 'input',
@@ -91,7 +89,6 @@ return [
         ],
         'nav_title' => [
             'exclude' => true,
-            'l10n_cat' => 'text',
             'label' => $GLOBALS['TCA']['pages']['columns']['nav_title']['label'],
             'config' => [
                 'type' => 'input',
index cb7d2f8..d10fd44 100644 (file)
@@ -460,7 +460,6 @@ return [
         ],
         'header' => [
             'l10n_mode' => 'prefixLangTitle',
-            'l10n_cat' => 'text',
             'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header',
             'config' => [
                 'type' => 'input',
@@ -574,7 +573,6 @@ return [
         ],
         'bodytext' => [
             'l10n_mode' => 'prefixLangTitle',
-            'l10n_cat' => 'text',
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.text',
             'config' => [
                 'type' => 'text',