From 954a3f08c15fb1b711c273b112f57b36ae6ab678 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Sun, 17 Mar 2019 15:03:16 +0100
Subject: [PATCH] [FEATURE] Introduce TCA type "language"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
A new TCA type "language" is added, in order to make life easier
to set up new TCA. The main issue (as can be seen in core already)
is that each TCA adds different implementations on how to deal with
"-1". Now "-1" is added for any record except "pages", where the
"-1 / All Languages" concept is not implemented.
In addition, this decouples the select type from sys_language,
effectively reducing the logic where a direct access is necessary
to the "sys_language" table.
This effectively also removes the now mis-use of `foreign_table`
from the TCA "languageField" field by properly handling languages
internally. This furthermore makes any relation handling superfluous,
reducing quite an amount of code and complexity in the DataHandler.
Instead, all columns, defined as "[ctrl][languageField]", are now
automatically migrated to the new "type=language", with no specific
configuration, as TYPO3 is managing this field, taking care of the
user specific configuration.
Furthermore, are all columns, using the “special=languages†option,
migrated to the new TCA type. This allows to get rid of this special
case as well, reducing complexity in FormEngine and DataHandler.
The new TCA type also properly handles the field for records on
root level, or on a page outside of a site context. The only
exception is the `allowed_languages` field in be_users and
be_groups, where a new itemsProcFunc is used.
Resolves: #57082
Releases: master
Change-Id: Ic4878326c0cdc6ce1f233fa29f07419bf6b572a4
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60293
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../FormDataProvider/AbstractItemProvider.php | 48 --
.../Form/FormDataProvider/TcaLanguage.php | 185 +++++
.../backend/Classes/Form/NodeFactory.php | 1 +
.../FormInlineAjaxControllerTest.php | 21 +-
.../Form/FormDataProvider/TcaLanguageTest.php | 638 ++++++++++++++++++
.../FormDataProvider/TcaSelectItemsTest.php | 55 --
.../core/Classes/DataHandling/DataHandler.php | 44 +-
.../Localization/DataMapProcessor.php | 23 +-
.../Classes/DataHandling/TableColumnType.php | 1 +
.../core/Classes/Database/RelationHandler.php | 7 +-
.../TcaSystemLanguageCollector.php | 61 ++
.../core/Classes/Migrations/TcaMigration.php | 81 ++-
.../Configuration/DefaultConfiguration.php | 7 +
.../core/Configuration/TCA/be_groups.php | 2 +-
.../core/Configuration/TCA/be_users.php | 2 +-
typo3/sysext/core/Configuration/TCA/pages.php | 11 +-
.../core/Configuration/TCA/sys_category.php | 12 +-
.../Configuration/TCA/sys_file_collection.php | 14 +-
.../Configuration/TCA/sys_file_metadata.php | 14 +-
.../Configuration/TCA/sys_file_reference.php | 14 +-
.../Feature-57082-NewTCATypeLanguage.rst | 101 +++
.../Private/Language/locallang_general.xlf | 6 +
.../DataHandler/SpecialLanguagesTest.php | 69 --
.../Modify/DataSet/copyContentToLanguage.csv | 3 -
.../FAL/Modify/DataSet/localizeContent.csv | 3 -
.../copyContentToLanguageOfRelation.csv | 1 -
.../copyElementToLanguageOfRelation.csv | 1 -
.../DataSet/localizeElementOfRelation.csv | 2 -
...ParentContentToLanguageWithAllChildren.csv | 4 -
...alizeParentContentNHotelNOfferChildren.csv | 3 -
.../localizeNCopyPageWSynchronization.csv | 4 -
...lotHotelChildNCopyPageWSynchronization.csv | 2 -
.../localizePageNAddHotelChildWExclude.csv | 3 -
...lizePageNAddHotelChildWSynchronization.csv | 3 -
...NAddMonoglotHotelChildWSynchronization.csv | 1 -
.../DataSet/localizePageTwiceWExclude.csv | 4 -
.../Modify/DataSet/localizePageWExclude.csv | 2 -
.../DataSet/localizePageWSynchronization.csv | 2 -
...SynchronizationAndCustomLocalizedHotel.csv | 3 -
...zeParentContentLanguageSynchronization.csv | 5 -
.../localizeParentContentWAllChildren.csv | 4 -
...opyParentContentToLanguageWAllChildren.csv | 4 -
...alizeParentContentNHotelNOfferChildren.csv | 3 -
...entContentNHotelNOfferChildrenWOSortBy.csv | 3 -
.../localizeNCopyPageWSynchronization.csv | 4 -
...lotHotelChildNCopyPageWSynchronization.csv | 2 -
.../localizePageNAddHotelChildWExclude.csv | 3 -
...lizePageNAddHotelChildWSynchronization.csv | 3 -
...NAddMonoglotHotelChildWSynchronization.csv | 1 -
.../DataSet/localizePageTwiceWExclude.csv | 4 -
.../Modify/DataSet/localizePageWExclude.csv | 2 -
.../DataSet/localizePageWSynchronization.csv | 2 -
...SynchronizationAndCustomLocalizedHotel.csv | 3 -
...tentChainLanguageSynchronizationSource.csv | 10 -
...NestedChildrenWLanguageSynchronization.csv | 7 -
.../localizeParentContentSynchronization.csv | 4 -
.../localizeParentContentWAllChildren.csv | 4 -
.../DataSet/localizeCategoryOfRelation.csv | 1 -
.../Modify/DataSet/copyContentToLanguage.csv | 1 -
...ontentToLanguageFromNonDefaultLanguage.csv | 2 -
.../DataSet/copyContentToLanguageWExclude.csv | 1 -
.../copyContentToLanguageWSynchronization.csv | 1 -
.../DataSet/createContentForLanguageAll.csv | 2 -
.../Modify/DataSet/createLocalizedContent.csv | 1 -
.../createLocalizedContentWExclude.csv | 1 -
...createLocalizedContentWSynchronization.csv | 1 -
.../deleteLocalizedContentNDeleteContent.csv | 1 -
.../Modify/DataSet/localizeContent.csv | 1 -
.../localizeContentFromNonDefaultLanguage.csv | 2 -
...DefaultLanguageWSynchronizationDefault.csv | 2 -
...nDefaultLanguageWSynchronizationSource.csv | 2 -
.../localizeContentWSynchronization.csv | 1 -
.../localizeContentWSynchronizationHNull.csv | 1 -
...izeContentWithEmptyTcaIntegrityColumns.csv | 1 -
.../Modify/DataSet/localizeNCopyPage.csv | 2 -
.../localizeNCopyPageWSynchronization.csv | 2 -
.../localizeNestedPagesAndContents.csv | 2 -
.../Regular/Modify/DataSet/localizePage.csv | 1 -
.../DataSet/localizePageWSynchronization.csv | 1 -
.../DataSet/modifyTranslatedContent.csv | 1 -
.../movePageLocalizedToDifferentPageTwice.csv | 1 -
.../copyElementToLanguageOfRelation.csv | 1 -
.../DataSet/localizeElementOfRelation.csv | 2 -
.../TCA/tx_irretutorial_1ncsv_hotel.php | 9 +-
.../TCA/tx_irretutorial_1ncsv_offer.php | 9 +-
.../TCA/tx_irretutorial_1ncsv_price.php | 9 +-
.../TCA/tx_irretutorial_1nff_hotel.php | 9 +-
.../TCA/tx_irretutorial_1nff_offer.php | 9 +-
.../TCA/tx_irretutorial_1nff_price.php | 9 +-
.../TCA/tx_irretutorial_mnasym_hotel.php | 9 +-
...tx_irretutorial_mnasym_hotel_offer_rel.php | 9 +-
.../TCA/tx_irretutorial_mnasym_offer.php | 9 +-
.../TCA/tx_irretutorial_mnasym_price.php | 9 +-
.../TCA/tx_irretutorial_mnattr_hotel.php | 9 +-
...tx_irretutorial_mnattr_hotel_offer_rel.php | 9 +-
.../TCA/tx_irretutorial_mnattr_offer.php | 9 +-
.../TCA/tx_irretutorial_mnmmasym_hotel.php | 9 +-
.../TCA/tx_irretutorial_mnmmasym_offer.php | 9 +-
.../TCA/tx_irretutorial_mnmmasym_price.php | 9 +-
.../TCA/tx_irretutorial_mnsym_hotel.php | 9 +-
.../TCA/tx_irretutorial_mnsym_hotel_rel.php | 9 +-
.../TCA/tx_testdatahandler_element.php | 9 +-
.../TcaSystemLanguageCollectorTest.php | 137 ++++
.../Unit/Migrations/TcaMigrationTest.php | 149 +++-
.../TCA/tx_blogexample_domain_model_blog.php | 12 +-
.../TCA/tx_blogexample_domain_model_info.php | 12 +-
.../tx_blogexample_domain_model_person.php | 12 +-
.../TCA/tx_blogexample_domain_model_post.php | 12 +-
.../TCA/tx_blogexample_domain_model_tag.php | 12 +-
.../Generic/Mapper/DataMapFactoryTest.php | 1 +
.../frontend/Configuration/TCA/tt_content.php | 12 +-
.../Rendering/DataSet/LiveDefaultElements.csv | 6 -
...latedTtContentWithImagesButNotIncluded.csv | 2 +-
...outStorageOnCaseInsensitiveFilesystems.csv | 2 +-
...thoutStorageOnCaseSensitiveFilesystems.csv | 2 +-
...WithImagesOnCaseInsensitiveFilesystems.csv | 2 +-
...ntWithImagesOnCaseSensitiveFilesystems.csv | 2 +-
...pages-and-ttcontent-with-corrupt-image.xml | 13 -
...-ttcontent-with-image-but-not-included.xml | 13 -
.../pages-and-ttcontent-with-image.xml | 13 -
...-ttcontent-with-image-but-not-included.xml | 13 -
...d-ttcontent-with-image-without-storage.xml | 13 -
.../pages-and-ttcontent-with-image.xml | 13 -
.../FAL/Discard/DataSet/localizeContent.csv | 1 -
.../FAL/Modify/DataSet/localizeContent.csv | 3 -
.../FAL/Publish/DataSet/localizeContent.csv | 3 -
.../PublishAll/DataSet/localizeContent.csv | 3 -
.../DataSet/localizeElementOfRelation.csv | 1 -
.../DataSet/localizeElementOfRelation.csv | 2 -
.../DataSet/localizeElementOfRelation.csv | 2 -
.../DataSet/localizeElementOfRelation.csv | 2 -
...alizeParentContentNHotelNOfferChildren.csv | 1 -
.../localizeParentContentWAllChildren.csv | 1 -
...alizeParentContentNHotelNOfferChildren.csv | 3 -
.../localizeParentContentWAllChildren.csv | 4 -
...alizeParentContentNHotelNOfferChildren.csv | 3 -
.../localizeParentContentWAllChildren.csv | 4 -
...alizeParentContentNHotelNOfferChildren.csv | 3 -
.../localizeParentContentWAllChildren.csv | 4 -
...alizeParentContentNHotelNOfferChildren.csv | 1 -
.../localizeParentContentWAllChildren.csv | 1 -
...alizeParentContentNHotelNOfferChildren.csv | 3 -
...entContentNHotelNOfferChildrenWOSortBy.csv | 3 -
.../localizeParentContentWAllChildren.csv | 4 -
...alizeParentContentNHotelNOfferChildren.csv | 3 -
.../localizeParentContentWAllChildren.csv | 4 -
...alizeParentContentNHotelNOfferChildren.csv | 3 -
.../localizeParentContentWAllChildren.csv | 4 -
.../DataSet/localizeCategoryOfRelation.csv | 1 -
.../DataSet/localizeCategoryOfRelation.csv | 1 -
.../DataSet/localizeCategoryOfRelation.csv | 1 -
.../DataSet/localizeCategoryOfRelation.csv | 1 -
.../Discard/DataSet/copyContentToLanguage.csv | 1 -
...ontentToLanguageFromNonDefaultLanguage.csv | 2 -
.../DataSet/createContentAndLocalize.csv | 1 -
.../deleteLocalizedContentNDeleteContent.csv | 1 -
.../Discard/DataSet/localizeContent.csv | 1 -
.../localizeContentFromNonDefaultLanguage.csv | 2 -
.../localizeNestedPagesAndContents.csv | 1 -
...ageLocalizedInLiveToDifferentPageTwice.csv | 1 -
...veWorkspaceChangedToDifferentPageTwice.csv | 2 -
...veWorkspaceDeletedToDifferentPageTwice.csv | 2 -
.../movePageLocalizedToDifferentPageTwice.csv | 1 -
.../Modify/DataSet/copyContentToLanguage.csv | 1 -
...ontentToLanguageFromNonDefaultLanguage.csv | 2 -
.../DataSet/createContentAndLocalize.csv | 1 -
...dNotHiddenWorkspaceContentHiddenInLive.csv | 1 -
.../deleteLocalizedContentNDeleteContent.csv | 1 -
.../Modify/DataSet/localizeContent.csv | 1 -
.../localizeContentFromNonDefaultLanguage.csv | 2 -
.../DataSet/localizeContentWHideAtCopy.csv | 1 -
...izeContentWithEmptyTcaIntegrityColumns.csv | 1 -
.../localizeNestedPagesAndContents.csv | 2 -
.../Regular/Modify/DataSet/localizePage.csv | 1 -
...ageLocalizedInLiveToDifferentPageTwice.csv | 2 -
...veWorkspaceChangedToDifferentPageTwice.csv | 2 -
...veWorkspaceDeletedToDifferentPageTwice.csv | 2 -
.../movePageLocalizedToDifferentPageTwice.csv | 1 -
.../Publish/DataSet/copyContentToLanguage.csv | 1 -
...ontentToLanguageFromNonDefaultLanguage.csv | 1 -
.../DataSet/createContentAndLocalize.csv | 1 -
.../Publish/DataSet/localizeContent.csv | 1 -
.../localizeContentFromNonDefaultLanguage.csv | 1 -
.../localizeNestedPagesAndContents.csv | 2 -
.../Regular/Publish/DataSet/localizePage.csv | 1 -
...ageLocalizedInLiveToDifferentPageTwice.csv | 2 -
...veWorkspaceChangedToDifferentPageTwice.csv | 2 -
...veWorkspaceDeletedToDifferentPageTwice.csv | 2 -
.../movePageLocalizedToDifferentPageTwice.csv | 1 -
.../DataSet/copyContentToLanguage.csv | 1 -
...ontentToLanguageFromNonDefaultLanguage.csv | 1 -
.../DataSet/createContentAndLocalize.csv | 1 -
.../deleteLocalizedContentNDeleteContent.csv | 1 -
.../PublishAll/DataSet/localizeContent.csv | 1 -
.../localizeContentFromNonDefaultLanguage.csv | 1 -
.../localizeNestedPagesAndContents.csv | 2 -
.../PublishAll/DataSet/localizePage.csv | 1 -
...ageLocalizedInLiveToDifferentPageTwice.csv | 1 -
...veWorkspaceChangedToDifferentPageTwice.csv | 1 -
.../movePageLocalizedToDifferentPageTwice.csv | 1 -
.../DataSet/localizeElementOfRelation.csv | 1 -
.../DataSet/localizeElementOfRelation.csv | 2 -
.../DataSet/localizeElementOfRelation.csv | 2 -
.../DataSet/localizeElementOfRelation.csv | 2 -
204 files changed, 1455 insertions(+), 870 deletions(-)
create mode 100644 typo3/sysext/backend/Classes/Form/FormDataProvider/TcaLanguage.php
create mode 100644 typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaLanguageTest.php
create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Feature-57082-NewTCATypeLanguage.rst
delete mode 100644 typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/SpecialLanguagesTest.php
create mode 100644 typo3/sysext/core/Tests/Unit/Localization/TcaSystemLanguageCollectorTest.php
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
index dd0fe4689c0b..0cb8cdaaeca0 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
@@ -34,7 +34,6 @@ use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
use TYPO3\CMS\Core\Messaging\FlashMessageService;
use TYPO3\CMS\Core\Resource\FileRepository;
use TYPO3\CMS\Core\Resource\ResourceStorage;
-use TYPO3\CMS\Core\Site\SiteFinder;
use TYPO3\CMS\Core\Type\Bitmask\Permission;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -276,48 +275,6 @@ abstract class AbstractItemProvider
}
}
}
- break;
- case $special === 'languages':
- $allLanguages = [];
- if (($result['effectivePid'] ?? 0) === 0) {
- // This provides a list of all languages available for ALL sites
- // Due to the nature of the "sys_language_uid" field having no meaning currently,
- // We preserve the language ID and make a list of all languages
- $sites = $this->getAllSites();
- foreach ($sites as $site) {
- foreach ($site->getAllLanguages() as $language) {
- $languageId = $language->getLanguageId();
- if (isset($allLanguages[$languageId])) {
- // Language already provided by another site, just add the label separately
- $allLanguages[$languageId][0] .= ', ' . $language->getTitle() . ' [Site: ' . $site->getIdentifier() . ']';
- } else {
- $allLanguages[$languageId] = [
- 0 => $language->getTitle() . ' [Site: ' . $site->getIdentifier() . ']',
- 1 => $languageId,
- 2 => $language->getFlagIdentifier()
- ];
- }
- }
- }
- ksort($allLanguages);
- }
- if (!empty($allLanguages)) {
- foreach ($allLanguages as $item) {
- $items[] = $item;
- }
- } else {
- // Happens for non-pid=0 records (e.g. "tt_content"), or when no site was configured
- foreach ($result['systemLanguageRows'] as $language) {
- if ($language['uid'] !== -1) {
- $items[] = [
- 0 => $language['title'],
- 1 => $language['uid'],
- 2 => $language['flagIconIdentifier']
- ];
- }
- }
- }
-
break;
case $special === 'custom':
$customOptions = $GLOBALS['TYPO3_CONF_VARS']['BE']['customPermOptions'];
@@ -1407,11 +1364,6 @@ abstract class AbstractItemProvider
return $uid;
}
- protected function getAllSites(): array
- {
- return GeneralUtility::makeInstance(SiteFinder::class)->getAllSites();
- }
-
/**
* @return LanguageService
*/
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaLanguage.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaLanguage.php
new file mode 100644
index 000000000000..7a67c80095a0
--- /dev/null
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaLanguage.php
@@ -0,0 +1,185 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TYPO3\CMS\Backend\Form\FormDataProvider;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
+use TYPO3\CMS\Core\Site\Entity\Site;
+use TYPO3\CMS\Core\Site\SiteFinder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+/**
+ * Resolve select items for the type="language" and set processed item list in processedTca
+ */
+class TcaLanguage extends AbstractItemProvider implements FormDataProviderInterface
+{
+ /**
+ * Fetch languages to add them as select item
+ *
+ * @param array $result
+ * @return array
+ * @throws \UnexpectedValueException
+ */
+ public function addData(array $result): array
+ {
+ $table = $result['tableName'];
+
+ foreach ($result['processedTca']['columns'] as $fieldName => $fieldConfig) {
+ if (!isset($fieldConfig['config']['type']) || $fieldConfig['config']['type'] !== 'language') {
+ continue;
+ }
+
+ // Save user defined items and reset the field config items array afterwards
+ $userDefinedItems = $this->sanitizeItemArray($fieldConfig['config']['items'] ?? [], $table, $fieldName);
+ $fieldConfig['config']['items'] = [];
+
+ // Initialize site languages to be fetched
+ $siteLanguages = [];
+
+ if (($result['effectivePid'] ?? 0) === 0 || !($result['site'] ?? null) instanceof Site) {
+ // In case we deal with a pid=0 record or a record on a page outside
+ // of a site config, all languages from all sites should be added.
+ $sites = $this->getAllSites();
+ foreach ($sites as $site) {
+ // Add ALL languages from ALL sites
+ foreach ($site->getAllLanguages() as $languageId => $language) {
+ if (isset($siteLanguages[$languageId])) {
+ // Language already provided by another site, just add the label separately
+ $siteLanguages[$languageId]['title'] .= ', ' . $language->getTitle() . ' [Site: ' . $site->getIdentifier() . ']';
+ } else {
+ $siteLanguages[$languageId] = [
+ 'title' => $language->getTitle() . ' [Site: ' . $site->getIdentifier() . ']',
+ 'flagIconIdentifier' => $language->getFlagIdentifier()
+ ];
+ }
+ }
+ }
+ ksort($siteLanguages);
+ } elseif (($result['systemLanguageRows'] ?? []) !== []) {
+ // Add system languages available for the current site
+ foreach ($result['systemLanguageRows'] as $languageId => $language) {
+ if ($languageId !== -1) {
+ $siteLanguages[$languageId] = [
+ 'title' => $language['title'],
+ 'flagIconIdentifier' => $language['flagIconIdentifier'],
+ ];
+ }
+ }
+ }
+
+ if ($siteLanguages !== []) {
+ // In case siteLanguages are available, add the "site languages" group
+ $fieldConfig['config']['items'] = [
+ [
+ 0 => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages',
+ 1 => '--div--'
+ ]
+ ];
+ // Add the fetched site languages to the field config items array
+ foreach ($siteLanguages as $languageId => $language) {
+ $fieldConfig['config']['items'][] = [
+ 0 => $language['title'],
+ 1 => $languageId,
+ 2 => $language['flagIconIdentifier'],
+ ];
+ }
+ }
+
+ // Add the "special" group for "ALL" and / or user defined items
+ if (($table !== 'pages' && isset($result['systemLanguageRows'][-1])) || $userDefinedItems !== []) {
+ $fieldConfig['config']['items'][] = [
+ 0 => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.specialLanguages',
+ 1 => '--div--'
+ ];
+ }
+ // Add "-1" for all TCA records except pages in case the user is allowed to.
+ // The item is added to the "special" group, in order to not provide it as default by accident.
+ if ($table !== 'pages' && isset($result['systemLanguageRows'][-1])) {
+ $fieldConfig['config']['items'][] = [
+ 0 => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
+ 1 => -1,
+ 2 => 'flags-multiple'
+ ];
+ }
+
+ // Add user defined items again so they are in the "special" group
+ $fieldConfig['config']['items'] = array_merge($fieldConfig['config']['items'], $userDefinedItems);
+
+ // Respect TSconfig options
+ $fieldConfig['config']['items'] = $this->removeItemsByKeepItemsPageTsConfig($result, $fieldName, $fieldConfig['config']['items']);
+ $fieldConfig['config']['items'] = $this->addItemsFromPageTsConfig($result, $fieldName, $fieldConfig['config']['items']);
+ $fieldConfig['config']['items'] = $this->removeItemsByRemoveItemsPageTsConfig($result, $fieldName, $fieldConfig['config']['items']);
+
+ // In case no items are set at this point, we can write this back and continue with the next column
+ if ($fieldConfig['config']['items'] === []) {
+ $result['processedTca']['columns'][$fieldName] = $fieldConfig;
+ continue;
+ }
+
+ // Check current database value
+ $currentDatabaseValue = (int)($result['databaseRow'][$fieldName] ?? 0);
+ if (!in_array($currentDatabaseValue, array_map('intval', array_column($fieldConfig['config']['items'], 1)), true)) {
+ // Current value is invalid, so add it with a proper message at the top
+ $fieldConfig['config']['items'] = $this->addInvalidItem($result, $table, $fieldName, $currentDatabaseValue, $fieldConfig['config']['items']);
+ }
+
+ // Reinitialize array keys
+ $fieldConfig['config']['items'] = array_values($fieldConfig['config']['items']);
+
+ // In case the last element is a divider, remove it
+ if ((string)($fieldConfig['config']['items'][array_key_last($fieldConfig['config']['items'])][1] ?? '') === '--div--') {
+ array_pop($fieldConfig['config']['items']);
+ }
+
+ // Translate labels
+ $fieldConfig['config']['items'] = $this->translateLabels($result, $fieldConfig['config']['items'], $table, $fieldName);
+
+ $result['processedTca']['columns'][$fieldName] = $fieldConfig;
+ }
+
+ return $result;
+ }
+
+ protected function addInvalidItem(
+ array $result,
+ string $table,
+ string $fieldName,
+ int $invalidValue,
+ array $items
+ ): array {
+ // Early return if there are no items or invalid values should not be displayed
+ if (($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['disableNoMatchingValueElement'] ?? false)
+ || ($result['processedTca']['columns'][$fieldName]['config']['disableNoMatchingValueElement'] ?? false)
+ ) {
+ return $items;
+ }
+
+ $noMatchingLabel = isset($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['noMatchingValue_label'])
+ ? $this->getLanguageService()->sL(trim($result['pageTsConfig']['TCEFORM.'][$table . '.'][$fieldName . '.']['noMatchingValue_label']))
+ : '[ ' . $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue') . ' ]';
+
+ // Add the invalid value at the top
+ array_unshift($items, [@sprintf($noMatchingLabel, $invalidValue), $invalidValue, null]);
+
+ return $items;
+ }
+
+ protected function getAllSites(): array
+ {
+ return GeneralUtility::makeInstance(SiteFinder::class)->getAllSites();
+ }
+}
diff --git a/typo3/sysext/backend/Classes/Form/NodeFactory.php b/typo3/sysext/backend/Classes/Form/NodeFactory.php
index 4ca65ab47f60..bcf291b345fc 100644
--- a/typo3/sysext/backend/Classes/Form/NodeFactory.php
+++ b/typo3/sysext/backend/Classes/Form/NodeFactory.php
@@ -95,6 +95,7 @@ class NodeFactory
'fileInfo' => Element\FileInfoElement::class,
'mfaInfo' => Element\MfaInfoElement::class,
'slug' => Element\InputSlugElement::class,
+ 'language' => Element\SelectSingleElement::class,
'passthrough' => Element\PassThroughElement::class,
// Default classes to enrich single elements
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/FormInlineAjaxControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/FormInlineAjaxControllerTest.php
index 5c8144517256..e87413963ec9 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/FormInlineAjaxControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/FormInlineAjaxControllerTest.php
@@ -19,6 +19,7 @@ use TYPO3\CMS\Backend\Controller\FormInlineAjaxController;
use TYPO3\CMS\Core\Core\Bootstrap;
use TYPO3\CMS\Core\Http\Response;
use TYPO3\CMS\Core\Http\ServerRequest;
+use TYPO3\CMS\Core\Tests\Functional\SiteHandling\SiteBasedTestTrait;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -27,6 +28,8 @@ use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
*/
class FormInlineAjaxControllerTest extends FunctionalTestCase
{
+ use SiteBasedTestTrait;
+
/**
* @var FormInlineAjaxController
*/
@@ -39,6 +42,14 @@ class FormInlineAjaxControllerTest extends FunctionalTestCase
'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
];
+ /**
+ * @var array
+ */
+ protected const LANGUAGE_PRESETS = [
+ 'EN' => ['id' => 0, 'title' => 'English', 'locale' => 'en_US.UTF8'],
+ 'DK' => ['id' => 1, 'title' => 'Dansk', 'locale' => 'dk_DA.UTF8'],
+ ];
+
/**
* Sets up this test case.
*/
@@ -47,12 +58,20 @@ class FormInlineAjaxControllerTest extends FunctionalTestCase
parent::setUp();
$this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/pages.xml');
- $this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/sys_language.xml');
$this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/backend/Tests/Functional/Fixtures/tx_irretutorial_1ncsv_hotel.xml');
$this->setUpBackendUserFromFixture(1);
Bootstrap::initializeLanguageObject();
+ $this->writeSiteConfiguration(
+ 'website-local',
+ $this->buildSiteConfiguration(1, 'http://localhost/'),
+ [
+ $this->buildDefaultLanguageConfiguration('EN', '/en/'),
+ $this->buildLanguageConfiguration('DK', '/dk/'),
+ ]
+ );
+
$this->subject = new FormInlineAjaxController();
}
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaLanguageTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaLanguageTest.php
new file mode 100644
index 000000000000..b13594e6a56c
--- /dev/null
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaLanguageTest.php
@@ -0,0 +1,638 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
+
+use Prophecy\Argument;
+use TYPO3\CMS\Backend\Form\FormDataProvider\TcaLanguage;
+use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Site\Entity\NullSite;
+use TYPO3\CMS\Core\Site\Entity\Site;
+use TYPO3\CMS\Core\Site\SiteFinder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+/**
+ * Test case
+ */
+class TcaLanguageTest extends UnitTestCase
+{
+ /**
+ * Set up
+ */
+ protected function setUp(): void
+ {
+ parent::setUp();
+ // Default LANG prophecy just returns incoming value as label if calling ->sL()
+ $languageServiceProphecy = $this->prophesize(LanguageService::class);
+ $languageServiceProphecy->loadSingleTableDescription(Argument::cetera())->willReturn(null);
+ $languageServiceProphecy->sL(Argument::cetera())->willReturnArgument(0);
+ $GLOBALS['LANG'] = $languageServiceProphecy->reveal();
+ }
+
+ /**
+ * Tear down
+ */
+ protected function tearDown(): void
+ {
+ GeneralUtility::purgeInstances();
+ parent::tearDown();
+ }
+
+ /**
+ * @test
+ */
+ public function addDataIgnoresEmptyOrWrongTcaType(): void
+ {
+ $input = $this->getDefaultResultArray(['config' => ['type' => 'none']]);
+ self::assertEquals($input, (new TcaLanguage())->addData($input));
+ }
+
+ /**
+ * @test
+ */
+ public function addDataRespectsCustomRenderType(): void
+ {
+ $input = $this->getDefaultResultArray(['config' => ['renderType' => 'customRenderType']]);
+
+ self::assertEquals(
+ 'customRenderType',
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['renderType']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataThrowsExceptionIfAnItemIsNotAnArray(): void
+ {
+ $input = $this->getDefaultResultArray(['config' => ['items' => ['foo']]]);
+
+ $this->expectException(\UnexpectedValueException::class);
+ $this->expectExceptionCode(1439288036);
+
+ (new TcaLanguage())->addData($input);
+ }
+
+ /**
+ * @test
+ */
+ public function addDataAddsAllSiteLanguages(): void
+ {
+ $input = $this->getDefaultResultArray([], $this->getDefaultSystemLanguages());
+
+ $expected = [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages', '--div--', null, null, null],
+ ['English', 0, 'flags-us', null, null],
+ ['Danish', 13, 'flags-dk', null, null],
+ ['German', 14, 'flags-de', null, null],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.specialLanguages', '--div--', null, null, null],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1, 'flags-multiple', null, null]
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataOmitsLanguageAllForPages(): void
+ {
+ $input = $this->getDefaultResultArray([], $this->getDefaultSystemLanguages(), [], ['tableName' => 'pages']);
+
+ $expected = [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages', '--div--', null, null, null],
+ ['English', 0, 'flags-us', null, null],
+ ['Danish', 13, 'flags-dk', null, null],
+ ['German', 14, 'flags-de', null, null],
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataOmitsLanguageAllIfNotAllowed(): void
+ {
+ $systemLanguages = $this->getDefaultSystemLanguages();
+ // ALL is not allowed
+ unset($systemLanguages[-1]);
+
+ $input = $this->getDefaultResultArray([], $systemLanguages);
+
+ $expected = [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages', '--div--', null, null, null],
+ ['English', 0, 'flags-us', null, null],
+ ['Danish', 13, 'flags-dk', null, null],
+ ['German', 14, 'flags-de', null, null],
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataAddsUserDefinedItems(): void
+ {
+ $input = $this->getDefaultResultArray(
+ [
+ 'config' => [
+ 'items' => [
+ 8 => [
+ 'User defined', 8, 'some-icon'
+ ]
+ ]
+ ]
+ ],
+ $this->getDefaultSystemLanguages(),
+ [],
+ ['tableName' => 'pages']
+ );
+
+ $expected = [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages', '--div--', null, null, null],
+ ['English', 0, 'flags-us', null, null],
+ ['Danish', 13, 'flags-dk', null, null],
+ ['German', 14, 'flags-de', null, null],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.specialLanguages', '--div--', null, null, null],
+ ['User defined', 8, 'some-icon', null, null],
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataAddsUserDefinedItemsOnEmptySystemLanguages(): void
+ {
+ $input = $this->getDefaultResultArray(
+ [
+ 'config' => [
+ 'items' => [
+ 8 => [
+ 'User defined', 8, 'some-icon'
+ ]
+ ],
+ 'disableNoMatchingValueElement' => true
+ ]
+ ]
+ );
+
+ $expected = [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.specialLanguages', '--div--', null, null, null],
+ ['User defined', 8, 'some-icon', null, null],
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataRemovesAllItemsByEmptyKeepItems(): void
+ {
+ $input = $this->getDefaultResultArray(
+ [],
+ $this->getDefaultSystemLanguages(),
+ [],
+ [
+ 'pageTsConfig' => [
+ 'TCEFORM.' => [
+ 'aTable.' => [
+ 'aField.' => [
+ 'keepItems' => ''
+ ],
+ ],
+ ],
+ ],
+ ]
+ );
+
+ self::assertEmpty((new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']);
+ }
+
+ /**
+ * @test
+ */
+ public function addDataRespectsKeepItems(): void
+ {
+ $input = $this->getDefaultResultArray(
+ [],
+ $this->getDefaultSystemLanguages(),
+ [],
+ [
+ 'pageTsConfig' => [
+ 'TCEFORM.' => [
+ 'aTable.' => [
+ 'aField.' => [
+ 'keepItems' => '0,13'
+ ],
+ ],
+ ],
+ ],
+ ]
+ );
+
+ $expected = [
+ ['English', 0, 'flags-us', null, null],
+ ['Danish', 13, 'flags-dk', null, null],
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataRespectsAddItems(): void
+ {
+ $input = $this->getDefaultResultArray(
+ [],
+ [],
+ ['aField' => 5],
+ [
+ 'pageTsConfig' => [
+ 'TCEFORM.' => [
+ 'aTable.' => [
+ 'aField.' => [
+ 'addItems.' => [
+ '8' => 'User defined',
+ '8.' => [
+ 'icon' => 'some-icon'
+ ]
+ ]
+ ],
+ ],
+ ],
+ ],
+ ]
+ );
+
+ $expected = [
+ ['[ LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue ]', 5, null, null, null],
+ ['User defined', 8, 'some-icon', null, null],
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataRespectsRemoveItems(): void
+ {
+ $input = $this->getDefaultResultArray(
+ [],
+ $this->getDefaultSystemLanguages(),
+ [],
+ [
+ 'pageTsConfig' => [
+ 'TCEFORM.' => [
+ 'aTable.' => [
+ 'aField.' => [
+ 'removeItems' => '-1,13,14'
+ ],
+ ],
+ ],
+ ],
+ ]
+ );
+
+ $expected = [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages', '--div--', null, null, null],
+ ['English', 0, 'flags-us', null, null]
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataAddsInvalidDatabaseValue(): void
+ {
+ $input = $this->getDefaultResultArray([], $this->getDefaultSystemLanguages(), ['aField' => 5], ['tableName' => 'pages']);
+
+ $expected = [
+ ['[ LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.noMatchingValue ]', 5, null, null, null],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages', '--div--', null, null, null],
+ ['English', 0, 'flags-us', null, null],
+ ['Danish', 13, 'flags-dk', null, null],
+ ['German', 14, 'flags-de', null, null],
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+ /**
+ * @test
+ */
+ public function addDataRepsetcsConfigurationOnAddingInvalidDatabaseValue(): void
+ {
+ $input = $this->getDefaultResultArray(
+ [],
+ [],
+ ['aField' => 5],
+ [
+ 'pageTsConfig' => [
+ 'TCEFORM.' => [
+ 'aTable.' => [
+ 'aField.' => [
+ 'disableNoMatchingValueElement' => '1'
+ ],
+ ],
+ ],
+ ],
+ ]
+ );
+
+ // Adding invalid value is disabled in TSconfig
+ self::assertEmpty((new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']);
+
+ $input = $this->getDefaultResultArray(['config' => ['disableNoMatchingValueElement' => true]], [], ['aField' => 5]);
+
+ // Adding invalid value is disabled in columns config
+ self::assertEmpty((new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']);
+
+ $input = $this->getDefaultResultArray(
+ [
+ 'config' => [
+ 'items' => [
+ 8 => [
+ 'User defined', 8, 'some-icon'
+ ]
+ ]
+ ]
+ ],
+ [],
+ ['aField' => 5],
+ [
+ 'pageTsConfig' => [
+ 'TCEFORM.' => [
+ 'aTable.' => [
+ 'aField.' => [
+ 'noMatchingValue_label' => 'Custom label'
+ ],
+ ],
+ ],
+ ],
+ ]
+ );
+
+ $expected = [
+ ['Custom label', 5, null, null, null],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.specialLanguages', '--div--', null, null, null],
+ ['User defined', 8, 'some-icon', null, null],
+ ];
+
+ // Custom label is respected
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataRespectsAltLabels(): void
+ {
+ $input = $this->getDefaultResultArray(
+ [],
+ $this->getDefaultSystemLanguages(),
+ [],
+ [
+ 'pageTsConfig' => [
+ 'TCEFORM.' => [
+ 'aTable.' => [
+ 'aField.' => [
+ 'altLabels.' => [
+ '0' => 'Default Language',
+ '14' => 'Deutsch'
+ ],
+ ],
+ ],
+ ],
+ ],
+ ]
+ );
+
+ $expected = [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages', '--div--', null, null, null],
+ ['Default Language', 0, 'flags-us', null, null],
+ ['Danish', 13, 'flags-dk', null, null],
+ ['Deutsch', 14, 'flags-de', null, null],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.specialLanguages', '--div--', null, null, null],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1, 'flags-multiple', null, null]
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ */
+ public function addDataRemovesLastItemIfDivider(): void
+ {
+ $input = $this->getDefaultResultArray(
+ [],
+ $this->getDefaultSystemLanguages(),
+ [],
+ [
+ 'pageTsConfig' => [
+ 'TCEFORM.' => [
+ 'aTable.' => [
+ 'aField.' => [
+ 'removeItems' => '-1'
+ ],
+ ],
+ ],
+ ],
+ ],
+ );
+
+ $expected = [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages', '--div--', null, null, null],
+ ['English', 0, 'flags-us', null, null],
+ ['Danish', 13, 'flags-dk', null, null],
+ ['German', 14, 'flags-de', null, null]
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ /**
+ * @test
+ * @dataProvider addDataAddsAllSiteLanguagesDataProvider
+ *
+ * @param array $config
+ */
+ public function addDataAddsAllSiteLanguagesFromAllSites(array $config): void
+ {
+ $siteFinder = $this->prophesize(SiteFinder::class);
+ $siteFinder->getAllSites()->willReturn([
+ new Site('site-1', 1, [
+ 'base' => '/',
+ 'languages' => [
+ [
+ 'title' => 'English',
+ 'languageId' => 0,
+ 'base' => '/',
+ 'locale' => 'en_US',
+ 'flag' => 'us'
+ ],
+ [
+ 'title' => 'German',
+ 'languageId' => 2,
+ 'base' => '/de/',
+ 'locale' => 'de_DE',
+ 'flag' => 'de'
+ ]
+ ]
+ ]),
+ new Site('site-2', 2, [
+ 'base' => '/',
+ 'languages' => [
+ [
+ 'title' => 'German',
+ 'languageId' => 0,
+ 'base' => '/',
+ 'locale' => 'de_DE',
+ 'flag' => 'de'
+ ],
+ ]
+ ])
+ ]);
+ GeneralUtility::addInstance(SiteFinder::class, $siteFinder->reveal());
+
+ $input = $this->getDefaultResultArray([], [], [], $config);
+
+ $expected = [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.siteLanguages', '--div--', null, null, null],
+ ['English [Site: site-1], German [Site: site-2]', 0, 'flags-us', null, null],
+ ['German [Site: site-1]', 2, 'flags-de', null, null]
+ ];
+
+ self::assertEquals(
+ $expected,
+ (new TcaLanguage())->addData($input)['processedTca']['columns']['aField']['config']['items']
+ );
+ }
+
+ public function addDataAddsAllSiteLanguagesDataProvider(): \Generator
+ {
+ yield 'On root level pid=0' => [
+ [
+ 'effectivePid' => 0
+ ]
+ ];
+ yield 'Without site configuration' => [
+ [
+ 'site' => new NullSite()
+ ]
+ ];
+ }
+
+ protected function getDefaultResultArray(
+ array $fieldConfig = [],
+ array $systemLanguages = [],
+ array $databaseRow = [],
+ array $additionalConfiguration = []
+ ): array {
+ return array_replace_recursive([
+ 'tableName' => 'aTable',
+ 'systemLanguageRows' => array_replace_recursive([], $systemLanguages),
+ 'effectivePid' => 1,
+ 'site' => new Site('some-site', 1, []),
+ 'databaseRow' => array_replace_recursive([], $databaseRow),
+ 'processedTca' => [
+ 'columns' => [
+ 'aField' => array_replace_recursive([
+ 'config' => [
+ 'type' => 'language',
+ ],
+ ], $fieldConfig),
+ ],
+ ],
+ ], $additionalConfiguration);
+ }
+
+ protected function getDefaultSystemLanguages(array $additionalLanguages = []): array
+ {
+ return array_replace_recursive([
+ -1 => [
+ 'uid' => -1,
+ 'title' => 'All Languages',
+ 'iso' => 'DEF',
+ 'flagIconIdentifier' => 'flags-multiple'
+ ],
+ 0 => [
+ 'uid' => 0,
+ 'title' => 'English',
+ 'iso' => 'DEF',
+ 'flagIconIdentifier' => 'flags-us'
+ ],
+ 13 => [
+ 'uid' => 13,
+ 'title' => 'Danish',
+ 'iso' => 'da',
+ 'flagIconIdentifier' => 'flags-dk'
+ ],
+ 14 => [
+ 'uid' => 14,
+ 'title' => 'German',
+ 'iso' => 'de',
+ 'flagIconIdentifier' => 'flags-de'
+ ],
+ ], $additionalLanguages);
+ }
+}
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
index 550fe6ff7083..dfd35df5b161 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
@@ -39,8 +39,6 @@ use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
use TYPO3\CMS\Core\Messaging\FlashMessageService;
use TYPO3\CMS\Core\Resource\FileRepository;
use TYPO3\CMS\Core\Resource\ResourceStorage;
-use TYPO3\CMS\Core\Site\Entity\Site;
-use TYPO3\CMS\Core\Site\SiteFinder;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
@@ -1115,59 +1113,6 @@ class TcaSelectItemsTest extends UnitTestCase
self::assertSame($expectedItems, $result['processedTca']['columns']['aField']['config']['items']);
}
- /**
- * @test
- */
- public function addDataAddsLanguagesWithSpecialLanguages(): void
- {
- $input = [
- 'tableName' => 'aTable',
- 'databaseRow' => [],
- 'processedTca' => [
- 'columns' => [
- 'aField' => [
- 'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'special' => 'languages',
- ],
- ],
- ],
- ],
- ];
-
- $siteFinder = $this->prophesize(SiteFinder::class);
- $siteFinder->getAllSites()->willReturn([
- new Site('test', 13, [
- 'base' => '/',
- 'languages' => [
- [
- 'title' => 'French',
- 'languageId' => 13,
- 'base' => '/fr/',
- 'locale' => 'fr_FR',
- 'flag' => 'aFlag.gif'
- ]
- ]
- ])
- ]);
- GeneralUtility::addInstance(SiteFinder::class, $siteFinder->reveal());
-
- $expectedItems = [
- 0 => [
- 0 => 'French [Site: test]',
- 1 => 13,
- 2 => 'flags-aFlag.gif',
- 3 => null,
- 4 => null,
- ],
- ];
-
- $result = (new TcaSelectItems())->addData($input);
-
- self::assertSame($expectedItems, $result['processedTca']['columns']['aField']['config']['items']);
- }
-
/**
* @test
*/
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index a82ec0eac2dc..925666184486 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -1540,6 +1540,9 @@ class DataHandler implements LoggerAwareInterface
case 'slug':
$res = $this->checkValueForSlug((string)$value, $tcaFieldConf, $table, $id, (int)$realPid, $field, $additionalData['incomingFieldArray'] ?? []);
break;
+ case 'language':
+ $res = $this->checkValueForLanguage((int)$value, $table, $field);
+ break;
case 'check':
$res = $this->checkValueForCheck($res, $value, $tcaFieldConf, $table, $id, $realPid, $field);
break;
@@ -1801,6 +1804,34 @@ class DataHandler implements LoggerAwareInterface
return ['value' => $value];
}
+ /**
+ * Evaluate "language" type value.
+ *
+ * Checks whether the user is allowed to add such a value as language
+ *
+ * @param int $value The value to set.
+ * @param string $table Table name
+ * @param string $field Field name
+ * @return array $res The result array. The processed value (if any!) is set in the "value" key.
+ */
+ protected function checkValueForLanguage(int $value, string $table, string $field): array
+ {
+ // If given table is localizable and the given field is the defined
+ // languageField, check if the selected language is allowed for the user.
+ // Note: Usually this method should never be reached, in case the language value is
+ // not valid, since recordEditAccessInternals checks for proper permission beforehand.
+ if (BackendUtility::isTableLocalizable($table)
+ && ($GLOBALS['TCA'][$table]['ctrl']['languageField'] ?? '') === $field
+ && !$this->BE_USER->checkLanguageAccess($value)
+ ) {
+ return [];
+ }
+
+ // @todo Should we also check if the language is allowed for the current site - if record has site context?
+
+ return ['value' => $value];
+ }
+
/**
* Evaluates 'check' type values.
*
@@ -1974,9 +2005,8 @@ class DataHandler implements LoggerAwareInterface
}
// For select types which has a foreign table attached:
$unsetResult = false;
- if (
- $tcaFieldConf['type'] === 'group' && $tcaFieldConf['internal_type'] === 'db'
- || $tcaFieldConf['type'] === 'select' && (($tcaFieldConf['foreign_table'] ?? false) || isset($tcaFieldConf['special']) && $tcaFieldConf['special'] === 'languages')
+ if (($tcaFieldConf['type'] === 'group' && $tcaFieldConf['internal_type'] === 'db')
+ || ($tcaFieldConf['type'] === 'select' && ($tcaFieldConf['foreign_table'] ?? false))
) {
// check, if there is a NEW... id in the value, that should be substituted later
if (strpos($value, 'NEW') !== false) {
@@ -2661,13 +2691,7 @@ class DataHandler implements LoggerAwareInterface
*/
public function checkValue_group_select_processDBdata($valueArray, $tcaFieldConf, $id, $status, $type, $currentTable, $currentField)
{
- if ($type === 'group') {
- $tables = $tcaFieldConf['allowed'];
- } elseif (!empty($tcaFieldConf['special']) && $tcaFieldConf['special'] === 'languages') {
- $tables = 'sys_language';
- } else {
- $tables = $tcaFieldConf['foreign_table'];
- }
+ $tables = $type === 'group' ? $tcaFieldConf['allowed'] : $tcaFieldConf['foreign_table'];
$prep = $type === 'group' ? ($tcaFieldConf['prepend_tname'] ?? '') : '';
$newRelations = implode(',', $valueArray);
/** @var RelationHandler $dbAnalysis */
diff --git a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
index fd86a96abbeb..b22c91eaf684 100644
--- a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
+++ b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
@@ -464,8 +464,6 @@ class DataMapProcessor
{
$specialTableName = null;
$configuration = $GLOBALS['TCA'][$item->getTableName()]['columns'][$fieldName];
- $isSpecialLanguageField = ($configuration['config']['special'] ?? null) === 'languages';
-
$fromId = $fromRecord['uid'];
if ($this->isSetInDataMap($item->getTableName(), $fromId, $fieldName)) {
$fromValue = $this->allDataMap[$item->getTableName()][$fromId][$fieldName];
@@ -478,7 +476,6 @@ class DataMapProcessor
if (
empty($configuration['config']['MM'])
|| $this->isSetInDataMap($item->getTableName(), $fromId, $fieldName)
- || $isSpecialLanguageField
) {
$this->modifyDataMap(
$item->getTableName(),
@@ -487,10 +484,6 @@ class DataMapProcessor
);
return;
}
- // resolve the language special table name
- if ($isSpecialLanguageField) {
- $specialTableName = 'sys_language';
- }
// fetch MM relations from storage
$type = $configuration['config']['type'];
$manyToManyTable = $configuration['config']['MM'];
@@ -1466,16 +1459,16 @@ class DataMapProcessor
$configuration = $GLOBALS['TCA'][$tableName]['columns'][$fieldName]['config'];
- return
- $configuration['type'] === 'group'
+ return (
+ $configuration['type'] === 'group'
&& ($configuration['internal_type'] ?? null) === 'db'
&& !empty($configuration['allowed'])
- || $configuration['type'] === 'select'
- && (
- !empty($configuration['foreign_table'])
- && !empty($GLOBALS['TCA'][$configuration['foreign_table']])
- || ($configuration['special'] ?? null) === 'languages'
- )
+ )
+ || (
+ $configuration['type'] === 'select'
+ && !empty($configuration['foreign_table'])
+ && !empty($GLOBALS['TCA'][$configuration['foreign_table']])
+ )
|| $this->isInlineRelationField($tableName, $fieldName)
;
}
diff --git a/typo3/sysext/core/Classes/DataHandling/TableColumnType.php b/typo3/sysext/core/Classes/DataHandling/TableColumnType.php
index 95a7737a6c18..c52506851eef 100644
--- a/typo3/sysext/core/Classes/DataHandling/TableColumnType.php
+++ b/typo3/sysext/core/Classes/DataHandling/TableColumnType.php
@@ -34,6 +34,7 @@ final class TableColumnType extends Enumeration
const SELECT = 'SELECT';
const GROUP = 'GROUP';
const NONE = 'NONE';
+ const LANGUAGE = 'LANGUAGE';
const PASSTHROUGH = 'PASSTHROUGH';
const USER = 'USER';
const FLEX = 'FLEX';
diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index b86931cfcee9..4984ca7a5113 100644
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -406,12 +406,7 @@ class RelationHandler
? strrev(trim($parts[1] ?? ''))
: ($secondTable && $theID < 0 ? $secondTable : $this->firstTable);
// If the ID is not blank and the table name is among the names in the inputted tableList
- if (
- (string)$theID != ''
- // allow the default language '0' for the special languages configuration
- && ($theID || ($configuration['special'] ?? null) === 'languages')
- && $theTable && isset($this->tableArray[$theTable])
- ) {
+ if ((string)$theID != '' && $theID && $theTable && isset($this->tableArray[$theTable])) {
// Get ID as the right value:
$theID = $secondTable ? abs((int)$theID) : (int)$theID;
// Register ID/table name in internal arrays:
diff --git a/typo3/sysext/core/Classes/Localization/TcaSystemLanguageCollector.php b/typo3/sysext/core/Classes/Localization/TcaSystemLanguageCollector.php
index 82dc7452d98b..3e3192f9965c 100644
--- a/typo3/sysext/core/Classes/Localization/TcaSystemLanguageCollector.php
+++ b/typo3/sysext/core/Classes/Localization/TcaSystemLanguageCollector.php
@@ -17,7 +17,11 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Localization;
+use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Site\Entity\NullSite;
+use TYPO3\CMS\Core\Site\SiteFinder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Provides ItemProcFunc fields for special population of available TYPO3 system languages
@@ -56,4 +60,61 @@ class TcaSystemLanguageCollector
$fieldInformation['items'] = array_merge($fieldInformation['items'], $availableLanguages);
$fieldInformation['items'] = array_merge($fieldInformation['items'], $unavailableLanguages);
}
+
+ /**
+ * Provides a list of all languages available for ALL sites.
+ * In case no site configuration can be found in the system,
+ * a fallback is used to add at least the default language.
+ *
+ * Used by be_users and be_groups for their `allowed_languages` column.
+ */
+ public function populateAvailableSiteLanguages(array &$fieldInformation): void
+ {
+ $allLanguages = [];
+ foreach ($this->getAllSites() as $site) {
+ foreach ($site->getAllLanguages() as $language) {
+ $languageId = $language->getLanguageId();
+ if (isset($allLanguages[$languageId])) {
+ // Language already provided by another site, just add the label separately
+ $allLanguages[$languageId][0] .= ', ' . $language->getTitle() . ' [Site: ' . $site->getIdentifier() . ']';
+ continue;
+ }
+ $allLanguages[$languageId] = [
+ 0 => $language->getTitle() . ' [Site: ' . $site->getIdentifier() . ']',
+ 1 => $languageId,
+ 2 => $language->getFlagIdentifier(),
+ ];
+ }
+ }
+
+ if ($allLanguages !== []) {
+ ksort($allLanguages);
+ foreach ($allLanguages as $item) {
+ $fieldInformation['items'][] = $item;
+ }
+ return;
+ }
+
+ // Fallback if no site configuration exists
+ $recordPid = (int)($fieldInformation['row']['pid'] ?? 0);
+ $languages = (new NullSite())->getAvailableLanguages($this->getBackendUser(), false, $recordPid);
+
+ foreach ($languages as $languageId => $language) {
+ $fieldInformation['items'][] = [
+ 0 => $language->getTitle(),
+ 1 => $languageId,
+ 2 => $language->getFlagIdentifier(),
+ ];
+ }
+ }
+
+ protected function getAllSites(): array
+ {
+ return GeneralUtility::makeInstance(SiteFinder::class)->getAllSites();
+ }
+
+ protected function getBackendUser(): BackendUserAuthentication
+ {
+ return $GLOBALS['BE_USER'];
+ }
}
diff --git a/typo3/sysext/core/Classes/Migrations/TcaMigration.php b/typo3/sysext/core/Classes/Migrations/TcaMigration.php
index 41a368908517..5aeb2b0d2fa3 100644
--- a/typo3/sysext/core/Classes/Migrations/TcaMigration.php
+++ b/typo3/sysext/core/Classes/Migrations/TcaMigration.php
@@ -58,6 +58,8 @@ class TcaMigration
$tca = $this->removeExcludeFieldForTransOrigPointerField($tca);
$tca = $this->removeShowRecordFieldListField($tca);
$tca = $this->removeWorkspacePlaceholderShadowColumnsConfiguration($tca);
+ $tca = $this->migrateLanguageFieldToTcaTypeLanguage($tca);
+ $tca = $this->migrateSpecialLanguagesToTcaTypeLanguage($tca);
return $tca;
}
@@ -255,23 +257,27 @@ class TcaMigration
*/
protected function sanitizeControlSectionIntegrity(array $tca): array
{
+ $defaultControlSectionColumnConfig = [
+ 'type' => 'passthrough',
+ 'default' => 0,
+ ];
$controlSectionNames = [
- 'origUid',
- 'languageField',
- 'transOrigPointerField',
- 'translationSource'
+ 'origUid' => $defaultControlSectionColumnConfig,
+ 'languageField' => [
+ 'type' => 'language'
+ ],
+ 'transOrigPointerField' => $defaultControlSectionColumnConfig,
+ 'translationSource' => $defaultControlSectionColumnConfig,
];
+
foreach ($tca as $tableName => &$configuration) {
- foreach ($controlSectionNames as $controlSectionName) {
+ foreach ($controlSectionNames as $controlSectionName => $controlSectionColumnConfig) {
$columnName = $configuration['ctrl'][$controlSectionName] ?? null;
if (empty($columnName) || !empty($configuration['columns'][$columnName])) {
continue;
}
$configuration['columns'][$columnName] = [
- 'config' => [
- 'type' => 'passthrough',
- 'default' => 0,
- ],
+ 'config' => $controlSectionColumnConfig
];
}
}
@@ -350,4 +356,61 @@ class TcaMigration
}
return $tca;
}
+
+ /**
+ * Replaces $TCA[$mytable][columns][$TCA[$mytable][ctrl][languageField]][config] with
+ * $TCA[$mytable][columns][$TCA[$mytable][ctrl][languageField]][config][type] = 'language'
+ *
+ * @param array $tca
+ * @return array
+ */
+ protected function migrateLanguageFieldToTcaTypeLanguage(array $tca): array
+ {
+ foreach ($tca as $table => &$configuration) {
+ if (isset($configuration['ctrl']['languageField'], $configuration['columns'][$configuration['ctrl']['languageField']])
+ && ($configuration['columns'][$configuration['ctrl']['languageField']]['config']['type'] ?? '') !== 'language'
+ ) {
+ $this->messages[] = 'The TCA field \'' . $configuration['ctrl']['languageField'] . '\' '
+ . 'of table \'' . $table . '\' is defined as the \'languageField\' and should '
+ . 'therefore use the TCA type \'language\' instead of TCA type \'select\' with '
+ . '\'foreign_table=sys_language\' or \'special=languages\'.';
+ $configuration['columns'][$configuration['ctrl']['languageField']]['config'] = [
+ 'type' => 'language'
+ ];
+ }
+ }
+
+ return $tca;
+ }
+
+ /**
+ * Replaces $TCA[$mytable][columns][field][config][special] = 'languages' with
+ * $TCA[$mytable][columns][field][config][type] = 'language'
+ *
+ * @param array $tca
+ * @return array
+ */
+ protected function migrateSpecialLanguagesToTcaTypeLanguage(array $tca): array
+ {
+ foreach ($tca as $table => &$tableDefinition) {
+ if (!isset($tableDefinition['columns']) || !is_array($tableDefinition['columns'])) {
+ continue;
+ }
+ foreach ($tableDefinition['columns'] as $fieldName => &$fieldConfig) {
+ if ((string)($fieldConfig['config']['type'] ?? '') !== 'select'
+ || (string)($fieldConfig['config']['special'] ?? '') !== 'languages'
+ ) {
+ continue;
+ }
+ $this->messages[] = 'The TCA field \'' . $fieldName . '\' of table \'' . $table . '\' is '
+ . 'defined as type \'select\' with the \'special=languages\' option. This is not '
+ . 'evaluated anymore and should be replaced by the TCA type \'language\'.';
+ $fieldConfig['config'] = [
+ 'type' => 'language'
+ ];
+ }
+ }
+
+ return $tca;
+ }
}
diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index 4f6d0393efc1..40c311b6bbd1 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -543,10 +543,17 @@ return [
\TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsProcessShowitem::class,
],
],
+ \TYPO3\CMS\Backend\Form\FormDataProvider\TcaLanguage::class => [
+ 'depends' => [
+ \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseSystemLanguageRows::class,
+ \TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsRemoveUnused::class
+ ],
+ ],
\TYPO3\CMS\Backend\Form\FormDataProvider\TcaTypesShowitem::class => [
'depends' => [
\TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRecordTypeValue::class,
\TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseSystemLanguageRows::class,
+ \TYPO3\CMS\Backend\Form\FormDataProvider\TcaLanguage::class,
\TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class,
\TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsRemoveUnused::class,
],
diff --git a/typo3/sysext/core/Configuration/TCA/be_groups.php b/typo3/sysext/core/Configuration/TCA/be_groups.php
index 0f34066bc601..8e3a1a02bf23 100644
--- a/typo3/sysext/core/Configuration/TCA/be_groups.php
+++ b/typo3/sysext/core/Configuration/TCA/be_groups.php
@@ -174,7 +174,7 @@ return [
'config' => [
'type' => 'select',
'renderType' => 'selectCheckBox',
- 'special' => 'languages',
+ 'itemsProcFunc' => \TYPO3\CMS\Core\Localization\TcaSystemLanguageCollector::class . '->populateAvailableSiteLanguages',
]
],
'custom_options' => [
diff --git a/typo3/sysext/core/Configuration/TCA/be_users.php b/typo3/sysext/core/Configuration/TCA/be_users.php
index 4930901c85b9..78ffb5b395b7 100644
--- a/typo3/sysext/core/Configuration/TCA/be_users.php
+++ b/typo3/sysext/core/Configuration/TCA/be_users.php
@@ -313,7 +313,7 @@ return [
'config' => [
'type' => 'select',
'renderType' => 'selectCheckBox',
- 'special' => 'languages',
+ 'itemsProcFunc' => \TYPO3\CMS\Core\Localization\TcaSystemLanguageCollector::class . '->populateAvailableSiteLanguages',
]
],
'TSconfig' => [
diff --git a/typo3/sysext/core/Configuration/TCA/pages.php b/typo3/sysext/core/Configuration/TCA/pages.php
index b56184fbca3b..070e5ff5dd52 100644
--- a/typo3/sysext/core/Configuration/TCA/pages.php
+++ b/typo3/sysext/core/Configuration/TCA/pages.php
@@ -297,16 +297,7 @@ return [
'sys_language_uid' => [
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [], // no default language here, as the pages table is always the default language
- 'default' => 0,
- 'fieldWizard' => [
- 'selectIcons' => [
- 'disabled' => false,
- ],
- ],
+ 'type' => 'language'
]
],
'l10n_diffsource' => [
diff --git a/typo3/sysext/core/Configuration/TCA/sys_category.php b/typo3/sysext/core/Configuration/TCA/sys_category.php
index 32f1dbd95e00..8e14e1a415ec 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_category.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_category.php
@@ -56,17 +56,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'special' => 'languages',
- 'items' => [
- [
- 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
- -1,
- 'flags-multiple'
- ],
- ],
- 'default' => 0,
+ 'type' => 'language'
]
],
'l10n_parent' => [
diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_collection.php b/typo3/sysext/core/Configuration/TCA/sys_file_collection.php
index f3ef1d25537d..e3ab3ce704bf 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_file_collection.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_file_collection.php
@@ -34,19 +34,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0,
- 'fieldWizard' => [
- 'selectIcons' => [
- 'disabled' => false,
- ],
- ],
+ 'type' => 'language'
]
],
'l10n_parent' => [
diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php b/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php
index 4d3670743519..e41099230a8b 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php
@@ -34,19 +34,7 @@ return [
'sys_language_uid' => [
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0,
- 'fieldWizard' => [
- 'selectIcons' => [
- 'disabled' => false,
- ],
- ],
+ 'type' => 'language'
]
],
'l10n_parent' => [
diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_reference.php b/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
index 960acc72a705..225493896f39 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
@@ -38,19 +38,7 @@ return [
'sys_language_uid' => [
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0,
- 'fieldWizard' => [
- 'selectIcons' => [
- 'disabled' => false,
- ],
- ],
+ 'type' => 'language'
]
],
'l10n_parent' => [
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-57082-NewTCATypeLanguage.rst b/typo3/sysext/core/Documentation/Changelog/master/Feature-57082-NewTCATypeLanguage.rst
new file mode 100644
index 000000000000..e40967115b35
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Feature-57082-NewTCATypeLanguage.rst
@@ -0,0 +1,101 @@
+.. include:: ../../Includes.txt
+
+=========================================
+Feature: #57082 - New TCA type "language"
+=========================================
+
+See :issue:`57082`
+
+Description
+===========
+
+A new TCA field type called `language` has been added to TYPO3 Core. It's main
+purpose is to simplify the TCA language configuration. It therefore supersedes
+the `special=languages` option of TCA columns with `type=select` as well as the
+now mis-use of the `foreign_table` option, being set to `sys_language`.
+
+Since the introduction of site configurations and the corresponding site
+languages back in v9, the `sys_language` table was not longer the only source
+of thruth regarding available languages. Actually, the languages, available for
+a record, are defined by the associated site configuration.
+
+The new field therefore allows to finally decouple the actually available site
+languages from the `sys_language` table. This effectively reduces quite an
+amount of code and complexity, since no relations have to be fetched and
+processed anymore. This also makes the `sys_refindex` table a bit smaller,
+since no entries have to be added for this relation anymore. To clean up your
+exisiting reference index, you might use the CLI command
+:php:`bin/typo3 referenceindex:update`.
+
+Another pain point was the special `-1` language which always had to be added
+to each TCA configuration manually. Thus, a lot of different implementations
+of this special case could be found in one and the same TYPO3 installation.
+
+The new TCA type now automatically displays all available languages for the
+current context (the corresponding site configuration) and also automatically
+adds the special `-1` language for all record types, except `pages`.
+
+.. code-block:: php
+
+ // Before
+
+ 'config' => [
+ 'type' => 'select',
+ 'renderType' => 'selectSingle',
+ 'foreign_table' => 'sys_language',
+ 'items' => [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
+ ],
+ 'default' => 0
+ ]
+
+ // After
+
+ 'config' => [
+ 'type' => 'language'
+ ]
+
+.. code-block:: php
+
+ // Before
+
+ 'config' => [
+ 'type' => 'select',
+ 'renderType' => 'selectSingle',
+ 'special' => 'languages',
+ 'items' => [
+ [
+ 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
+ -1,
+ 'flags-multiple'
+ ],
+ ],
+ 'default' => 0,
+ ]
+
+ // After
+
+ 'config' => [
+ 'type' => 'language'
+ ]
+
+Since the new TCA type is mostly based on the `type=select` internally, most
+of the associated TCA and TSconfig options can still be applied. This includes
+e.g. the `selectIcons` field wizard, as well as the :typoscript:`keepItems`
+and :typoscript:`removeItems` page TSconfig options.
+
+In records on root level (`pid=0`) or on a page, outside of a site context,
+all languages form all site configurations are displayed in the new field.
+
+An automatic TCA migration is performed on the fly, migrating all occurences
+to the new TCA type and adding a deprecation message to the deprecation log
+where code adaption has to take place. Occurences are all columns, defined as
+:php:`$TCA['ctrl']['languageField']`, as well as all columns, using the
+`special=languages` option in combination with `type=select`.
+
+Note that the migration resets the whole `config` array to use the new TCA
+type. Custom setting such as field wizards are not evaluated until the TCA
+configuration is adapted.
+
+.. index:: Backend, PHP-API, TCA, ext:core
diff --git a/typo3/sysext/core/Resources/Private/Language/locallang_general.xlf b/typo3/sysext/core/Resources/Private/Language/locallang_general.xlf
index 572820a0ca06..79bccf6e2f49 100644
--- a/typo3/sysext/core/Resources/Private/Language/locallang_general.xlf
+++ b/typo3/sysext/core/Resources/Private/Language/locallang_general.xlf
@@ -171,6 +171,12 @@
<trans-unit id="LGL.l18n_parent" resname="LGL.l18n_parent">
<source>Transl.Orig</source>
</trans-unit>
+ <trans-unit id="LGL.siteLanguages" resname="LGL.siteLanguages">
+ <source>Site languages</source>
+ </trans-unit>
+ <trans-unit id="LGL.specialLanguages" resname="LGL.specialLanguages">
+ <source>Special languages</source>
+ </trans-unit>
<trans-unit id="LGL.allLanguages" resname="LGL.allLanguages">
<source>[All]</source>
</trans-unit>
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/SpecialLanguagesTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/SpecialLanguagesTest.php
deleted file mode 100644
index c39888be08a6..000000000000
--- a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/SpecialLanguagesTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-namespace TYPO3\CMS\Core\Tests\Functional\DataHandling\DataHandler;
-
-use TYPO3\CMS\Core\Tests\Functional\DataHandling\AbstractDataHandlerActionTestCase;
-
-/**
- * Testing behavior of TCA field configuration 'special' => 'languages'
- */
-class SpecialLanguagesTest extends AbstractDataHandlerActionTestCase
-{
- protected function setUp(): void
- {
- parent::setUp();
- $this->backendUser->workspace = 0;
- }
-
- /**
- * @param string $value
- * @param string $expected
- *
- * @test
- * @dataProvider allowedLanguagesAreAssignedToBackendUserGroupDataProvider
- */
- public function allowedLanguagesAreAssignedToBackendUserGroup($value, $expected)
- {
- $this->actionService->createNewRecord('be_groups', 0, [
- 'title' => 'Testing Group',
- 'allowed_languages' => $value,
- ]);
-
- $statement = $this->getConnectionPool()
- ->getQueryBuilderForTable('be_groups')
- ->select('allowed_languages')
- ->from('be_groups')
- ->orderBy('uid', 'DESC')
- ->setMaxResults(1)
- ->execute();
- self::assertEquals($expected, $statement->fetchColumn(0));
- }
-
- /**
- * @return array
- */
- public function allowedLanguagesAreAssignedToBackendUserGroupDataProvider()
- {
- return [
- 'valid languages' => ['1,2', '1,2'],
- 'default language' => ['0', '0'],
- 'empty value' => ['', ''],
- 'invalid integer' => ['not-an-integer', ''],
- ];
- }
-}
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContentToLanguage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContentToLanguage.csv
index 685c41eaa654..bdb32f888a43 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContentToLanguage.csv
@@ -47,10 +47,7 @@
,"e9821262721c25f2645b5b045724fbe0","tt_content",331,"image",,,,0,0,"sys_file_reference",128,,,,,,,,
,"5aa620d796bedb2df9724db6d47487f8","tt_content",331,"image",,,,1,0,"sys_file_reference",129,,,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
-,"046fb06ef64a73bd4c5c86c7dd3f49b2","sys_file_reference",130,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
,"252dc24e456cc50f92697e1758bdebe3","sys_file_reference",130,"uid_local",,,,0,0,"sys_file",21,,,,,,,,
-,"8df2b48c7bb380e4b2f6785c96813293","sys_file_reference",131,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
,"5b968ea4f118b73c63947691a29d6699","sys_file_reference",131,"uid_local",,,,0,0,"sys_file",1,,,,,,,,
,"74fef103ad1ce60f35379cb6708de42d","tt_content",332,"image",,,,0,0,"sys_file_reference",130,,,,,,,,
,"67800a8a3e68bd7d374bcb2bd2e92817","tt_content",332,"image",,,,1,0,"sys_file_reference",131,,,,,,,,
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 801b02afc916..005d832525d3 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
@@ -47,11 +47,8 @@
,"e9821262721c25f2645b5b045724fbe0","tt_content",331,"image",,,,0,0,"sys_file_reference",128,,,,,,,,
,"5aa620d796bedb2df9724db6d47487f8","tt_content",331,"image",,,,1,0,"sys_file_reference",129,,,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
-,"046fb06ef64a73bd4c5c86c7dd3f49b2","sys_file_reference",130,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
,"7481b0e8948fb02ee8492d5d4b9fa94f","sys_file_reference",130,"l10n_parent",,,,0,0,"sys_file_reference",128,,,,,,,,
,"252dc24e456cc50f92697e1758bdebe3","sys_file_reference",130,"uid_local",,,,0,0,"sys_file",21,,,,,,,,
-,"8df2b48c7bb380e4b2f6785c96813293","sys_file_reference",131,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
,"b6607efd38e771cc5d64f7521d2e0161","sys_file_reference",131,"l10n_parent",,,,0,0,"sys_file_reference",129,,,,,,,,
,"5b968ea4f118b73c63947691a29d6699","sys_file_reference",131,"uid_local",,,,0,0,"sys_file",1,,,,,,,,
,"0a3fa2f40b53744357c071f667281c84","tt_content",332,"l18n_parent",,,,0,0,"tt_content",331,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentToLanguageOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentToLanguageOfRelation.csv
index b9384d91c39a..ddd3232bad26 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentToLanguageOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentToLanguageOfRelation.csv
@@ -25,7 +25,6 @@
,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",2,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",1,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",3,,
,"9eb90715dba7cc8415acb68cae5b38f9","tt_content",299,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",3,,
,"ed4feb7ada13109df48aaeeac6150c84","tt_content",299,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",2,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementToLanguageOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementToLanguageOfRelation.csv
index 439d43822f02..b511750f9023 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementToLanguageOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementToLanguageOfRelation.csv
@@ -24,4 +24,3 @@
,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",2,,
,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",1,,
,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",3,,
-,"f73b157a3ad0579eab2f3b7f3fce0c69","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
index 06b1e35aa8e6..d2e9a7464238 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
@@ -25,7 +25,5 @@
,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",2,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",1,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",3,,
,"e6d2afeb8da9fb54ceb83ae73d85e964","tx_testdatahandler_element",4,"l10n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",1,,
-,"f73b157a3ad0579eab2f3b7f3fce0c69","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToLanguageWithAllChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToLanguageWithAllChildren.csv
index fa28784d7010..4a2eb5f8b89a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToLanguageWithAllChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToLanguageWithAllChildren.csv
@@ -56,10 +56,6 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
-,"fa0f578eaaaa900ba7a1b4752dc97448","tx_irretutorial_1ncsv_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,
-,"6fa40fc483e8f2e3343a08d221e0ca1f","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,
,"36abb0a718184cad7af9231682f25cd3","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",14,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"861e9ad5dec6a3ceb973908b2f8d0c32","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,
,"035a36508d0e590c242199f3ef948bac","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index a38a4ea74e06..af617a79aae9 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -58,12 +58,9 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"035a36508d0e590c242199f3ef948bac","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
,"861e9ad5dec6a3ceb973908b2f8d0c32","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,
-,"d6506f8fc7c2c4066d66cb2472413508","tx_irretutorial_1ncsv_offer",10,"sys_language_uid",,,,0,0,"sys_language",1,,
,"615c48291ed0e77278a40bab1f9ddb5f","tx_irretutorial_1ncsv_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,
-,"9f61604cec24ed7a1e777e731aa663b1","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",,,,0,0,"sys_language",1,,
,"31269293887fab23c5057f80f5eb5506","tx_irretutorial_1ncsv_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
,"beac3ec367f17c0930e3c0888b4f3bf3","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",10,,
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeNCopyPageWSynchronization.csv
index 571f8def7472..8aef32b53a24 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeNCopyPageWSynchronization.csv
@@ -72,12 +72,9 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b0eaf0437064577b79cff881315c267e","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",2,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"ac316d076ce8d712c48ed79ecdb7e1a6","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
-,"48a1e12bca21d31165c81a30f7386d51","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",,,,0,0,"sys_language",1,,
,"23fe169723e228d693799c9fede743ff","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",7,,
,"32e6be8215c94aab7f19c20e2ddc099f","tx_irretutorial_1ncsv_hotel",9,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,
,"e88cd236cffca6f43e372d5c06e58ad8","tx_irretutorial_1ncsv_hotel",10,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",10,,
@@ -85,7 +82,6 @@
,"3eb7a8fe7e2c5cb2031a1dfe21aa5175","tx_irretutorial_1ncsv_hotel",11,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",12,,
,"77967556f6dce21935d1c53835252682","pages",92,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",7,,
,"1b378366812bd1ad436fa8f62b6a8f1e","pages",93,"l10n_parent",,,,0,0,"pages",92,,
-,"42fde10529922b34ba37b5f675b7e944","pages",93,"sys_language_uid",,,,0,0,"sys_language",1,,
,"0fac40d7fe106167565477f912fdcabd","pages",93,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",8,,
,"36abb0a718184cad7af9231682f25cd3","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",14,,
,"1c93e757990ee4f8063137599c33ebf1","tx_irretutorial_1ncsv_offer",10,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",15,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
index f4e5de7341b5..d293d0fcbe0b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
@@ -77,7 +77,6 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"ac316d076ce8d712c48ed79ecdb7e1a6","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
,"5dda89d4d27f2ba1f8c78d823489db5e","pages",89,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",7,,
,"cde406c4001748bdd2d5598c6a5cf7b0","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",8,,
@@ -88,7 +87,6 @@
,"fae7e84a1837b92babe289bb7253336a","pages",92,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",9,,
,"9f9dda7ae315d15f448e72a57cb6c5ed","pages",92,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",10,,
,"1b378366812bd1ad436fa8f62b6a8f1e","pages",93,"l10n_parent",,,,0,0,"pages",92,,
-,"42fde10529922b34ba37b5f675b7e944","pages",93,"sys_language_uid",,,,0,0,"sys_language",1,,
,"aea3d4db5cfad3ca79249f10a7be7511","pages",93,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",11,,
,"216b67a0e8fa0719c38365266f59ed00","pages",93,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",12,,
,"36abb0a718184cad7af9231682f25cd3","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",14,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
index 6b78bb3de6b6..dee07389368a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
@@ -54,12 +54,9 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b0eaf0437064577b79cff881315c267e","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",2,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"ac316d076ce8d712c48ed79ecdb7e1a6","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
,"5dda89d4d27f2ba1f8c78d823489db5e","pages",89,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",7,,
,"cde406c4001748bdd2d5598c6a5cf7b0","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",8,,
-,"48a1e12bca21d31165c81a30f7386d51","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",,,,0,0,"sys_language",1,,
,"23fe169723e228d693799c9fede743ff","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
index b977b3cb63c8..1edd0d58cb5c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
@@ -54,12 +54,9 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b0eaf0437064577b79cff881315c267e","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",2,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"ac316d076ce8d712c48ed79ecdb7e1a6","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
,"5dda89d4d27f2ba1f8c78d823489db5e","pages",89,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",7,,
,"cde406c4001748bdd2d5598c6a5cf7b0","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",8,,
-,"48a1e12bca21d31165c81a30f7386d51","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",,,,0,0,"sys_language",1,,
,"23fe169723e228d693799c9fede743ff","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
index f550b36e8757..b0bce9ea92cc 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
@@ -55,7 +55,6 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"ac316d076ce8d712c48ed79ecdb7e1a6","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
,"5dda89d4d27f2ba1f8c78d823489db5e","pages",89,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",7,,
,"cde406c4001748bdd2d5598c6a5cf7b0","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",8,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageTwiceWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageTwiceWExclude.csv
index a49798ba8449..b516e9f6b217 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageTwiceWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageTwiceWExclude.csv
@@ -54,13 +54,9 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b0eaf0437064577b79cff881315c267e","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",2,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"ac316d076ce8d712c48ed79ecdb7e1a6","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
-,"3c32a17d0585bdfe401af90248438f2a","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",,,,0,0,"sys_language",2,,
,"518b5ce4bfb326df7834f3dc9972fe60","tx_irretutorial_1ncsv_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",2,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,
-,"ace92fe82ea936fa3945cffa086fef17","pages",92,"sys_language_uid",,,,0,0,"sys_language",2,,
,"77967556f6dce21935d1c53835252682","pages",92,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWExclude.csv
index 099f04587f9e..ba38ac1b119a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWExclude.csv
@@ -52,8 +52,6 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b0eaf0437064577b79cff881315c267e","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",2,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"ac316d076ce8d712c48ed79ecdb7e1a6","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWSynchronization.csv
index 971463d1fcdf..8d24fd7894b5 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWSynchronization.csv
@@ -52,8 +52,6 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b0eaf0437064577b79cff881315c267e","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",2,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"ac316d076ce8d712c48ed79ecdb7e1a6","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
index eed09a428b0f..355da9c7b9ee 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
@@ -53,10 +53,7 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b0eaf0437064577b79cff881315c267e","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",2,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"ac316d076ce8d712c48ed79ecdb7e1a6","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
,"a6b0eeb7c2c2a37287c46c1cfacc4375","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",7,,
-,"9f61604cec24ed7a1e777e731aa663b1","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",,,,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentLanguageSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentLanguageSynchronization.csv
index 6130e867a9e8..0ef82a632d24 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentLanguageSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentLanguageSynchronization.csv
@@ -58,18 +58,13 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
-,"fa0f578eaaaa900ba7a1b4752dc97448","tx_irretutorial_1ncsv_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b842ef889bb06c9e139d150c1995adae","tx_irretutorial_1ncsv_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
-,"6fa40fc483e8f2e3343a08d221e0ca1f","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,
,"3e32c2fc50e95f5ca33df650a67f7a36","tx_irretutorial_1ncsv_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_offer",8,,
,"36abb0a718184cad7af9231682f25cd3","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",14,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"88ae3f8d74fc86815009ef345a081f5a","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",5,,
,"861e9ad5dec6a3ceb973908b2f8d0c32","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,
,"035a36508d0e590c242199f3ef948bac","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,
,"c737c4ea84bc8ae182c5275648ed8074","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",7,,
,"c0ef7dcec071320e103cf1817adc1e7a","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,1,0,"tx_irretutorial_1ncsv_hotel",8,,
-,"48a1e12bca21d31165c81a30f7386d51","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",,,,0,0,"sys_language",1,,
,"23fe169723e228d693799c9fede743ff","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
index 84495463ce26..aa103a9a2af4 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -56,13 +56,9 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
-,"fa0f578eaaaa900ba7a1b4752dc97448","tx_irretutorial_1ncsv_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b842ef889bb06c9e139d150c1995adae","tx_irretutorial_1ncsv_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_price",13,,
-,"6fa40fc483e8f2e3343a08d221e0ca1f","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,
,"3e32c2fc50e95f5ca33df650a67f7a36","tx_irretutorial_1ncsv_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_offer",8,,
,"36abb0a718184cad7af9231682f25cd3","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",14,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,
,"88ae3f8d74fc86815009ef345a081f5a","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",5,,
,"861e9ad5dec6a3ceb973908b2f8d0c32","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv
index c329f539a8fd..7c19c74e2748 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv
@@ -56,10 +56,6 @@
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
-,"ddf30b5f96113ff856bc9e7aaa07f7f4","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
-,"0a0b60674d754575b9148bb7d86241f4","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 3f679116822e..4d19493ea80e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -58,12 +58,9 @@
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"b3c4ea9f9a1a599c91d06b35aff21185","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"e1dcdb90066ed63c6e6eb1a88a9465d4","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"6a707a3af7969b80bcf2636a46a56857","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"29589c28b3f6979a757d467e0f180925","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
index 8410cf94a70c..52f28e76161e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
@@ -58,12 +58,9 @@
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"b3c4ea9f9a1a599c91d06b35aff21185","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"e1dcdb90066ed63c6e6eb1a88a9465d4","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"6a707a3af7969b80bcf2636a46a56857","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"29589c28b3f6979a757d467e0f180925","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv
index 8010ef567f05..fc3ef3cde1cd 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv
@@ -72,12 +72,9 @@
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"fad8379d1d9fd1a00c867caa89374cb6","tx_irretutorial_1nff_hotel",8,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"f9deb9c241aee46f01a5853da0cc82cf","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
,"63e1a5c21981a873e4d224f3bca1228e","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
,"160abb6141e0a7f8d163e8e254c330ff","tx_irretutorial_1nff_hotel",10,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
@@ -85,7 +82,6 @@
,"d34c592485d6f7b809a7963ca222e788","tx_irretutorial_1nff_hotel",11,"offers",,,,0,0,"tx_irretutorial_1nff_offer",12,,,,,
,"29b6533c8423c49c7794d8dee1de67d8","pages",92,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
,"1b378366812bd1ad436fa8f62b6a8f1e","pages",93,"l10n_parent",,,,0,0,"pages",92,,,,,
-,"42fde10529922b34ba37b5f675b7e944","pages",93,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"4664db8a28397f4cdd8ba5938ed1b28a","pages",93,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
index b7535e71d5ff..2d44b43fa98a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
@@ -77,7 +77,6 @@
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
,"db0b3eb875bac3e17a8164454d0363ff","pages",89,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,
,"7da166f108ec3797b6ee9e29f56cb966","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
@@ -88,7 +87,6 @@
,"dc116a94ce47210e4a1bf40d0080ea67","pages",92,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",9,,,,,
,"c9ba9169138a12a2c7dc39f4e2833cf7","pages",92,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",10,,,,,
,"1b378366812bd1ad436fa8f62b6a8f1e","pages",93,"l10n_parent",,,,0,0,"pages",92,,,,,
-,"42fde10529922b34ba37b5f675b7e944","pages",93,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"a340f6c8b892f5208d961eb4f1376eff","pages",93,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",11,,,,,
,"64afb023a0de73bf74f89c1c69c57a09","pages",93,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",12,,,,,
,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
index a16ae161c068..10f4657a80dd 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
@@ -54,12 +54,9 @@
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
,"db0b3eb875bac3e17a8164454d0363ff","pages",89,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,
,"7da166f108ec3797b6ee9e29f56cb966","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
-,"fad8379d1d9fd1a00c867caa89374cb6","tx_irretutorial_1nff_hotel",8,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"f9deb9c241aee46f01a5853da0cc82cf","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
index 7576f87ff41d..1567c7396db5 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
@@ -54,12 +54,9 @@
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
,"db0b3eb875bac3e17a8164454d0363ff","pages",89,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,
,"7da166f108ec3797b6ee9e29f56cb966","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
-,"fad8379d1d9fd1a00c867caa89374cb6","tx_irretutorial_1nff_hotel",8,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"f9deb9c241aee46f01a5853da0cc82cf","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
index a7e76ca61d86..4018c49f9edf 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
@@ -55,7 +55,6 @@
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
,"db0b3eb875bac3e17a8164454d0363ff","pages",89,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,
,"7da166f108ec3797b6ee9e29f56cb966","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv
index e7dbd43eef65..4cea860d6131 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv
@@ -54,13 +54,9 @@
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"d0ccc3b4cd32a4f87a58526e826ba9ea","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,"sys_language",2,,,,,
,"a46b4c51b6a00b7b4bf6c444128a4ae4","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"ace92fe82ea936fa3945cffa086fef17","pages",92,"sys_language_uid",,,,0,0,"sys_language",2,,,,,
,"29b6533c8423c49c7794d8dee1de67d8","pages",92,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv
index 39ad927b610e..2c3191854339 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv
@@ -52,8 +52,6 @@
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv
index fa254b38b51b..6ad266fcace8 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv
@@ -52,8 +52,6 @@
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
index 5f52b09a7b1b..ad4bfc2e69a2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
@@ -53,10 +53,7 @@
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
,"26832806a9009a14707170bdd32dfd62","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"6a707a3af7969b80bcf2636a46a56857","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
index 38c6452e0089..94686d614622 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
@@ -64,25 +64,17 @@
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"ace92fe82ea936fa3945cffa086fef17","pages",92,"sys_language_uid",,,,0,0,"sys_language",2,,,,,
-,"ddf30b5f96113ff856bc9e7aaa07f7f4","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"0a0b60674d754575b9148bb7d86241f4","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,
,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"63e14d8f0c7ceafe0370d1d189502804","tx_irretutorial_1nff_price",15,"sys_language_uid",,,,0,0,"sys_language",2,,,,,
,"15ab2383a097db10b533186c7d07c197","tx_irretutorial_1nff_price",15,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"0af9e810c299c3aed721d12325129407","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,0,"sys_language",2,,,,,
,"299a92e95a5a0289812614182f880629","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,
-,"d0ccc3b4cd32a4f87a58526e826ba9ea","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,"sys_language",2,,,,,
,"bd06b82bb9288961fa444b181d2167f1","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
,"96c729dcc96a40a04fd5591a442b68b5","tt_content",300,"l18n_parent",,,,0,0,"tt_content",298,,,,,
@@ -90,7 +82,5 @@
,"be78553000cb0c8b3440a7c5f8c2f44d","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
,"41a4430156504ec9044d6c0803955553","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",9,,,,,
,"67b4b0218f2533aff5418fa9d0dae12a","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",10,,,,,
-,"da1d5930c69da5c0db9592b9fdcfbeec","tx_irretutorial_1nff_hotel",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"a68f6f4deb34438983149e1ba47669c2","tx_irretutorial_1nff_hotel",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
-,"36146c0106a7379a5f5f520348bc51a3","tx_irretutorial_1nff_hotel",10,"sys_language_uid",,,,0,0,"sys_language",2,,,,,
,"557846bc31a575f7d5bcab6a39c64572","tx_irretutorial_1nff_hotel",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv
index b49e0a860f81..3376843e61cd 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv
@@ -62,13 +62,9 @@
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"ddf30b5f96113ff856bc9e7aaa07f7f4","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"0a0b60674d754575b9148bb7d86241f4","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
@@ -76,12 +72,9 @@
,"3186356d41d5349c64afab914747c186","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,,
,"8533721c12fa2a6d3ead3d44e85818db","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,,
,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
-,"fad8379d1d9fd1a00c867caa89374cb6","tx_irretutorial_1nff_hotel",8,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"f9deb9c241aee46f01a5853da0cc82cf","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
,"bd9fc535705c2e1d650cf90276628081","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,"tx_irretutorial_1nff_offer",11,,,,,,
,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,,
-,"8d9fd3179f1027157c620ded32fd361b","tx_irretutorial_1nff_offer",11,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"e3f831a73cabfa51b5d4b46a74753290","tx_irretutorial_1nff_offer",11,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
,"3e90e7e724dd19e513c0c77537e839b4","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",16,,,,,,
-,"244e205f758dba2b93e4d971435da6b5","tx_irretutorial_1nff_price",16,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"b84cd124046f729f73c996d2ade1a4dd","tx_irretutorial_1nff_price",16,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv
index c102001372c7..2414a705b7aa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv
@@ -56,13 +56,9 @@
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"ddf30b5f96113ff856bc9e7aaa07f7f4","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"0a0b60674d754575b9148bb7d86241f4","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
index 123a9a57ffbb..068d937f496f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -56,13 +56,9 @@
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
-,"ddf30b5f96113ff856bc9e7aaa07f7f4","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"0a0b60674d754575b9148bb7d86241f4","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,
,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
index 4633a44e5ddc..02bec5f164a8 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
@@ -35,6 +35,5 @@
,"b102e2f9b1ed99b14d813363199cb281","sys_category",30,"items",,,,0,0,"tt_content",298,,,
,"1b70a8e25c22645f7a49a79f57f3cf3f","sys_category",31,"parent",,,,0,0,"sys_category",28,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"6353f17422ca9ee8ea9f0b18d2b233ce","sys_category",32,"l10n_parent",,,,0,0,"sys_category",28,,,
,"f80e9fad5422a2c5d2b73765108d053a","sys_category",32,"items",,,,0,0,"tt_content",297,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
index 0a43489311f0..a6a8ede9dfce 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
@@ -28,4 +28,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
index ea8c6f88db8b..4850bc4d3472 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
@@ -29,6 +29,4 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,
-,"ace92fe82ea936fa3945cffa086fef17","pages",92,"sys_language_uid",,,,0,0,"sys_language",2,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWExclude.csv
index e7ff5d92cdf2..92c5ad401f5f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWExclude.csv
@@ -28,4 +28,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWSynchronization.csv
index f5e7f635d128..115ba3d78c6e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWSynchronization.csv
@@ -28,4 +28,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentForLanguageAll.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentForLanguageAll.csv
index 423d923e9013..f59b3698769b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentForLanguageAll.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentForLanguageAll.csv
@@ -29,6 +29,4 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,,
-,"ace92fe82ea936fa3945cffa086fef17","pages",92,"sys_language_uid",,,,0,0,"sys_language",2,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContent.csv
index 261112cbf080..a0315e834812 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContent.csv
@@ -29,5 +29,4 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"6000cbc7fbee0d718f956c85c0d4b5f8","tt_content",304,"l18n_parent",,,,0,0,"tt_content",303,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWExclude.csv
index 3df740b79e99..1e213a4f0367 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWExclude.csv
@@ -29,5 +29,4 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"6000cbc7fbee0d718f956c85c0d4b5f8","tt_content",304,"l18n_parent",,,,0,0,"tt_content",303,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWSynchronization.csv
index 4af56db9f82b..3c5c9e5a7e94 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWSynchronization.csv
@@ -29,5 +29,4 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"6000cbc7fbee0d718f956c85c0d4b5f8","tt_content",304,"l18n_parent",,,,0,0,"tt_content",303,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
index 7070e1acfaf4..46e657fdbe17 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -16,4 +16,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
index 7b1ae92d0326..0244f0d19861 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
@@ -28,5 +28,4 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"b46a287e12e9c731a9ff158a03280a07","tt_content",303,"l18n_parent",,,,0,0,"tt_content",298,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
index e13a86ec76b9..9dcd527d7cef 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
@@ -29,7 +29,5 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,
-,"ace92fe82ea936fa3945cffa086fef17","pages",92,"sys_language_uid",,,,0,0,"sys_language",2,,
,"31fa6f8fd7ec40b76ea2a316edddec7b","tt_content",303,"l18n_parent",,,,0,0,"tt_content",299,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationDefault.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationDefault.csv
index 4dfa09bcedfc..708b0ff58a46 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationDefault.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationDefault.csv
@@ -29,7 +29,5 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,,
-,"ace92fe82ea936fa3945cffa086fef17","pages",92,"sys_language_uid",,,,0,0,"sys_language",2,,,
,"31fa6f8fd7ec40b76ea2a316edddec7b","tt_content",303,"l18n_parent",,,,0,0,"tt_content",299,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationSource.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationSource.csv
index c322917e6c2b..7b66b4fa59cd 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationSource.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationSource.csv
@@ -29,7 +29,5 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,,
-,"ace92fe82ea936fa3945cffa086fef17","pages",92,"sys_language_uid",,,,0,0,"sys_language",2,,,
,"31fa6f8fd7ec40b76ea2a316edddec7b","tt_content",303,"l18n_parent",,,,0,0,"tt_content",299,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronization.csv
index 1b589a9c0ea9..36b2f1a0f3f6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronization.csv
@@ -28,5 +28,4 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"b46a287e12e9c731a9ff158a03280a07","tt_content",303,"l18n_parent",,,,0,0,"tt_content",298,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronizationHNull.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronizationHNull.csv
index 37cd7623621c..8f291b3cdd68 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronizationHNull.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronizationHNull.csv
@@ -28,5 +28,4 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,
,"b46a287e12e9c731a9ff158a03280a07","tt_content",303,"l18n_parent",,,,0,0,"tt_content",298,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv
index 52a45d2d4e7f..5a38296f6721 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv
@@ -25,4 +25,3 @@
"sys_refindex",,,,,,,,,,,,,
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPage.csv
index 31ce6eca83c9..0fa5f8cdb56d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPage.csv
@@ -35,9 +35,7 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
,"1b378366812bd1ad436fa8f62b6a8f1e","pages",93,"l10n_parent",,,,0,0,"pages",92,,
-,"42fde10529922b34ba37b5f675b7e944","pages",93,"sys_language_uid",,,,0,0,"sys_language",1,,
,"6000cbc7fbee0d718f956c85c0d4b5f8","tt_content",304,"l18n_parent",,,,0,0,"tt_content",303,,
,"e87069b61fe0470841bc2d196edb0624","tt_content",307,"l18n_parent",,,,0,0,"tt_content",306,,
,"ca4707efbf5a7def7e5b0fb26964f4cd","tt_content",308,"l18n_parent",,,,0,0,"tt_content",306,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPageWSynchronization.csv
index 2a662887032d..20c35d883c48 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPageWSynchronization.csv
@@ -35,9 +35,7 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"1b378366812bd1ad436fa8f62b6a8f1e","pages",93,"l10n_parent",,,,0,0,"pages",92,,,
-,"42fde10529922b34ba37b5f675b7e944","pages",93,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"6000cbc7fbee0d718f956c85c0d4b5f8","tt_content",304,"l18n_parent",,,,0,0,"tt_content",303,,,
,"e87069b61fe0470841bc2d196edb0624","tt_content",307,"l18n_parent",,,,0,0,"tt_content",306,,,
,"ca4707efbf5a7def7e5b0fb26964f4cd","tt_content",308,"l18n_parent",,,,0,0,"tt_content",306,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv
index 71c60c9b2f3e..99391e46f036 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv
@@ -32,9 +32,7 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"63f8eb86e577893c26c56ab8ad818336","pages",91,"l10n_parent",,,,0,0,"pages",88,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"35fe2fec92f9c47891055850ed1e8649","tt_content",303,"l18n_parent",,,,0,0,"tt_content",296,,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,,
-,"1b482f5cf5e2d5935f7b52422295b96a","pages",92,"sys_language_uid",,,,0,0,"sys_language",1,,,
,"9284c2437ea4aa81c7a500fa332c87de","tt_content",304,"l18n_parent",,,,0,0,"tt_content",298,,,
,"aec03a4dc5c6118559a25ec38c69bcbd","tt_content",306,"l18n_parent",,,,0,0,"tt_content",305,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
index 6538c03cdebf..a77e7d03f94d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
@@ -27,4 +27,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageWSynchronization.csv
index 91ce9e750fe1..4b02d291d81f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageWSynchronization.csv
@@ -27,4 +27,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyTranslatedContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyTranslatedContent.csv
index d8dd5b3d826b..39a1bbb84e82 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyTranslatedContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyTranslatedContent.csv
@@ -27,4 +27,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedToDifferentPageTwice.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedToDifferentPageTwice.csv
index be513c114e86..addc12bcc647 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedToDifferentPageTwice.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedToDifferentPageTwice.csv
@@ -27,4 +27,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementToLanguageOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementToLanguageOfRelation.csv
index f82680ec0117..2db9ddcf596b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementToLanguageOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementToLanguageOfRelation.csv
@@ -24,4 +24,3 @@
,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",2,,
,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",2,,
,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",3,,
-,"f73b157a3ad0579eab2f3b7f3fce0c69","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
index 46aa66ec2a4d..89ac1b715caa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
@@ -26,6 +26,4 @@
,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",2,,
,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",3,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,
-,"f73b157a3ad0579eab2f3b7f3fce0c69","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,"sys_language",1,,
,"e6d2afeb8da9fb54ceb83ae73d85e964","tx_testdatahandler_element",4,"l10n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",1,,
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_hotel.php
index f5a00c80bdfc..235efeb478ed 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_hotel.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0,
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_offer.php
index cefdad0705eb..dca99bb8d471 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_offer.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_price.php
index 646f0212cfe6..8812d035945c 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1ncsv_price.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php
index 8447ccf13d7e..28e90df91a01 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php
index dd86f9435641..da7639169ddf 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php
index 22e6fe1e3c28..1b07bbf79a04 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel.php
index 4bc483198cf6..7e7f6f4e8c10 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel_offer_rel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel_offer_rel.php
index f1792e20fed9..78398068f2bb 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel_offer_rel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_hotel_offer_rel.php
@@ -23,14 +23,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_offer.php
index 881040e78027..3120ef58efe5 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_offer.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_price.php
index 7ed5a4a8d30c..995d78055ff6 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnasym_price.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel.php
index 9fbc6980abed..afc9658938ee 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel_offer_rel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel_offer_rel.php
index 4aabb07600ef..c5f7f59f1e6e 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel_offer_rel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_hotel_offer_rel.php
@@ -23,14 +23,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_offer.php
index 330450bc313e..a397aa40d6a4 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnattr_offer.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_hotel.php
index 054a09565240..d0ee29edbca0 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_hotel.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_offer.php
index 15f1052d5aa7..ce6a3e83d6f1 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_offer.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_price.php
index a92e67ec8015..c30709a54f4b 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnmmasym_price.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel.php
index 9393e6769e2c..b4f94f16b132 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel_rel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel_rel.php
index ca901ef4c2d1..d7f2e21dbb48 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel_rel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_mnsym_hotel_rel.php
@@ -23,14 +23,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/Configuration/TCA/tx_testdatahandler_element.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/Configuration/TCA/tx_testdatahandler_element.php
index 9f3250f64938..72e27c047d59 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/Configuration/TCA/tx_testdatahandler_element.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/Configuration/TCA/tx_testdatahandler_element.php
@@ -24,14 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
- ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
- ],
- 'default' => 0
+ 'type' => 'language',
]
],
'l10n_parent' => [
diff --git a/typo3/sysext/core/Tests/Unit/Localization/TcaSystemLanguageCollectorTest.php b/typo3/sysext/core/Tests/Unit/Localization/TcaSystemLanguageCollectorTest.php
new file mode 100644
index 000000000000..a6598c388605
--- /dev/null
+++ b/typo3/sysext/core/Tests/Unit/Localization/TcaSystemLanguageCollectorTest.php
@@ -0,0 +1,137 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+namespace TYPO3\CMS\Core\Tests\Unit\Localization;
+
+use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Cache\CacheManager;
+use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
+use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Localization\Locales;
+use TYPO3\CMS\Core\Localization\TcaSystemLanguageCollector;
+use TYPO3\CMS\Core\Site\Entity\Site;
+use TYPO3\CMS\Core\Site\SiteFinder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+class TcaSystemLanguageCollectorTest extends UnitTestCase
+{
+ /**
+ * @var bool
+ */
+ protected $resetSingletonInstances = true;
+
+ public function setUp(): void
+ {
+ parent::setUp();
+ $cacheManagerProphecy = $this->prophesize(CacheManager::class);
+ GeneralUtility::setSingletonInstance(CacheManager::class, $cacheManagerProphecy->reveal());
+ $cacheFrontendProphecy = $this->prophesize(FrontendInterface::class);
+ $cacheManagerProphecy->getCache('runtime')->willReturn($cacheFrontendProphecy->reveal());
+
+ $GLOBALS['BE_USER'] = new BackendUserAuthentication();
+ $GLOBALS['BE_USER']->groupData = ['allowed_languages' => ''];
+
+ $languageServiceProphecy = $this->prophesize(LanguageService::class);
+ $GLOBALS['LANG'] = $languageServiceProphecy->reveal();
+ }
+
+ /**
+ * @test
+ */
+ public function populateAvailableSiteLanguagesTest(): void
+ {
+ $siteFinder = $this->prophesize(SiteFinder::class);
+ $siteFinder->getAllSites()->willReturn([
+ new Site('site-1', 1, [
+ 'base' => '/',
+ 'languages' => [
+ [
+ 'title' => 'English',
+ 'languageId' => 0,
+ 'base' => '/',
+ 'locale' => 'en_US',
+ 'flag' => 'us'
+ ],
+ [
+ 'title' => 'German',
+ 'languageId' => 2,
+ 'base' => '/de/',
+ 'locale' => 'de_DE',
+ 'flag' => 'de'
+ ]
+ ]
+ ]),
+ new Site('site-2', 2, [
+ 'base' => '/',
+ 'languages' => [
+ [
+ 'title' => 'English',
+ 'languageId' => 0,
+ 'base' => '/',
+ 'locale' => 'en_US',
+ 'flag' => 'us'
+ ],
+ ]
+ ])
+ ]);
+ GeneralUtility::addInstance(SiteFinder::class, $siteFinder->reveal());
+
+ $expectedItems = [
+ 0 => [
+ 0 => 'English [Site: site-1], English [Site: site-2]',
+ 1 => 0,
+ 2 => 'flags-us'
+ ],
+ 1 => [
+ 0 => 'German [Site: site-1]',
+ 1 => 2,
+ 2 => 'flags-de'
+ ],
+ ];
+
+ $fieldInformation = ['items' => []];
+
+ (new TcaSystemLanguageCollector(new Locales()))->populateAvailableSiteLanguages($fieldInformation);
+
+ self::assertSame($expectedItems, $fieldInformation['items']);
+ }
+
+ /**
+ * @test
+ */
+ public function populateAvailableSiteLanguagesWithoutSiteTest(): void
+ {
+ $siteFinder = $this->prophesize(SiteFinder::class);
+ $siteFinder->getAllSites()->willReturn([]);
+ GeneralUtility::addInstance(SiteFinder::class, $siteFinder->reveal());
+
+ $expectedItems = [
+ 0 => [
+ 0 => 'Default',
+ 1 => 0,
+ 2 => ''
+ ]
+ ];
+
+ $fieldInformation = ['items' => []];
+
+ (new TcaSystemLanguageCollector(new Locales()))->populateAvailableSiteLanguages($fieldInformation);
+
+ self::assertSame($expectedItems, $fieldInformation['items']);
+ }
+}
diff --git a/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php b/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
index ba0e94f25e02..cedfbb91ec69 100644
--- a/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
@@ -279,7 +279,7 @@ class TcaMigrationTest extends UnitTestCase
'bField' => [
'label' => 'bField',
'config' => [
- 'type' => 'none',
+ 'type' => 'language',
],
],
'cField' => [
@@ -343,7 +343,7 @@ class TcaMigrationTest extends UnitTestCase
'bField' => [
'label' => 'bField',
'config' => [
- 'type' => 'none',
+ 'type' => 'language',
],
],
'cField' => [
@@ -393,8 +393,7 @@ class TcaMigrationTest extends UnitTestCase
],
'bField' => [
'config' => [
- 'type' => 'passthrough',
- 'default' => 0,
+ 'type' => 'language',
],
],
'cField' => [
@@ -667,4 +666,146 @@ class TcaMigrationTest extends UnitTestCase
$subject = new TcaMigration();
self::assertEquals($expected, $subject->migrate($input));
}
+
+ /**
+ * @test
+ */
+ public function languageFieldsAreMigratedToTcaTypeLanguage(): void
+ {
+ $input = [
+ 'aTable' => [
+ 'ctrl' => [
+ 'title' => 'aTable',
+ 'languageField' => 'aLanguageField',
+ ],
+ 'columns' => [
+ 'aLanguageField' => [
+ 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
+ 'config' => [
+ 'type' => 'select',
+ 'renderType' => 'selectSingle',
+ 'special' => 'languages',
+ 'items' => [
+ [
+ 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
+ -1,
+ 'flags-multiple'
+ ],
+ ],
+ 'default' => 0,
+ ]
+ ]
+ ]
+ ],
+ 'bTable' => [
+ 'ctrl' => [
+ 'title' => 'bTable',
+ 'languageField' => 'bLanguageField',
+ ],
+ 'columns' => [
+ 'bLanguageField' => [
+ 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
+ 'config' => [
+ 'type' => 'select',
+ 'renderType' => 'selectSingle',
+ 'foreign_table' => 'sys_language',
+ 'items' => [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
+ ],
+ 'default' => 0
+ ]
+ ]
+ ]
+ ],
+ 'cTable' => [
+ 'ctrl' => [
+ 'title' => 'cTable',
+ ],
+ 'columns' => [
+ 'cLanguageField' => [
+ 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
+ 'config' => [
+ 'type' => 'select',
+ 'renderType' => 'selectSingle',
+ 'special' => 'languages',
+ 'fieldWizard' => [
+ 'selectIcons' => [
+ 'disabled' => false,
+ ],
+ ]
+ ]
+ ]
+ ]
+ ],
+ 'dTable' => [
+ 'ctrl' => [
+ 'title' => 'dTable'
+ ],
+ 'columns' => [
+ 'dLanguageField' => [
+ 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
+ 'config' => [
+ 'type' => 'select',
+ 'renderType' => 'selectSingle',
+ 'foreign_table' => 'sys_language',
+ 'items' => [
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages', -1],
+ ['LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.default_value', 0]
+ ],
+ 'default' => 0
+ ]
+ ]
+ ]
+ ]
+ ];
+
+ $expected = [
+ 'aTable' => [
+ 'ctrl' => [
+ 'title' => 'aTable',
+ 'languageField' => 'aLanguageField',
+ ],
+ 'columns' => [
+ 'aLanguageField' => [
+ 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
+ 'config' => [
+ 'type' => 'language',
+ ]
+ ]
+ ]
+ ],
+ 'bTable' => [
+ 'ctrl' => [
+ 'title' => 'bTable',
+ 'languageField' => 'bLanguageField',
+ ],
+ 'columns' => [
+ 'bLanguageField' => [
+ 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
+ 'config' => [
+ 'type' => 'language',
+ ]
+ ]
+ ]
+ ],
+ 'cTable' => [
+ 'ctrl' => [
+ 'title' => 'cTable',
+ ],
+ 'columns' => [
+ 'cLanguageField' => [
+ 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
+ 'config' => [
+ 'type' => 'language',
+ ]
+ ]
+ ]
+ ],
+ 'dTable' => $input['dTable']
+ ];
+
+ $subject = new TcaMigration();
+ self::assertEquals($expected, $subject->migrate($input));
+ }
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php
index 2e9c96b3e828..acafbdb36c37 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php
@@ -23,17 +23,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'special' => 'languages',
- 'items' => [
- [
- 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
- -1,
- 'flags-multiple'
- ],
- ],
- 'default' => 0
+ 'type' => 'language'
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_info.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_info.php
index 9244a5bbe10b..b17fcb792acf 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_info.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_info.php
@@ -22,17 +22,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'special' => 'languages',
- 'items' => [
- [
- 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
- -1,
- 'flags-multiple'
- ],
- ],
- 'default' => 0,
+ 'type' => 'language',
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_person.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_person.php
index 7351669cf54c..79ecf1f714ee 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_person.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_person.php
@@ -24,17 +24,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'special' => 'languages',
- 'items' => [
- [
- 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
- -1,
- 'flags-multiple'
- ],
- ],
- 'default' => 0
+ 'type' => 'language'
]
],
'l10n_parent' => [
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php
index 526a81301ed7..be4f047a90cf 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php
@@ -32,17 +32,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'special' => 'languages',
- 'items' => [
- [
- 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
- -1,
- 'flags-multiple'
- ],
- ],
- 'default' => 0
+ 'type' => 'language'
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_tag.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_tag.php
index 8d3992a9d8c8..c93f4945c62f 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_tag.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_tag.php
@@ -21,17 +21,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'special' => 'languages',
- 'items' => [
- [
- 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
- -1,
- 'flags-multiple'
- ],
- ],
- 'default' => 0
+ 'type' => 'language'
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
index 6ba8f7eca50c..9878f23f45b7 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
@@ -565,6 +565,7 @@ class DataMapFactoryTest extends UnitTestCase
[['type' => 'group', 'internal_type' => 'db'], TableColumnType::GROUP, TableColumnSubType::DB],
[['type' => 'group', 'internal_type' => 'folder'], TableColumnType::GROUP, TableColumnSubType::FOLDER],
[['type' => 'none'], TableColumnType::NONE, null],
+ [['type' => 'language'], TableColumnType::LANGUAGE, null],
[['type' => 'passthrough'], TableColumnType::PASSTHROUGH, null],
[['type' => 'user'], TableColumnType::USER, null],
[['type' => 'flex'], TableColumnType::FLEX, null],
diff --git a/typo3/sysext/frontend/Configuration/TCA/tt_content.php b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
index 6d82d9eeba33..da999e8f3de9 100644
--- a/typo3/sysext/frontend/Configuration/TCA/tt_content.php
+++ b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
@@ -332,17 +332,7 @@ return [
'exclude' => true,
'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'special' => 'languages',
- 'items' => [
- [
- 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.allLanguages',
- -1,
- 'flags-multiple'
- ],
- ],
- 'default' => 0,
+ 'type' => 'language'
]
],
'l18n_parent' => [
diff --git a/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv b/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv
index 49afe6543702..b80df0a08a88 100644
--- a/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv
@@ -52,10 +52,8 @@
"sys_refindex",,,,,,,,,,,,,,,,,,,,
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,,,,
,"04650b476b686bf7b8fabdf7f7642991","sys_category",4,"items",,,,0,0,"tt_content",301,,,,,,,,,
-,"046fb06ef64a73bd4c5c86c7dd3f49b2","sys_file_reference",130,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,,
,"0ad00e77a175a4a5d134cc2b115839fd","sys_file",20,"storage",,,,0,0,"sys_file_storage",1,,,,,,,,,
,"0d94a787208533a22dc514568c32ff6d","sys_category",1,"items",,,,1,0,"tt_content",301,,,,,,,,,
-,"104d904d882bf25dbea13eb1b3387c1f","pages",91,"sys_language_uid",,,,0,0,"sys_language",3,,,,,,,,,
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,,,,
,"12c2c72b6222bd07cb817a2d7db4c72b","tt_content",308,"l18n_parent",,,,0,0,"tt_content",307,,,,,,,,,
,"135027830c065c9ab089c028eaa85ca6","tt_content",299,"image",,,,0,0,"sys_file_reference",127,,,,,,,,,
@@ -70,15 +68,11 @@
,"58bc58699db7b2480929ca99490aa0b0","sys_file_reference",132,"uid_local",,,,0,0,"sys_file",1,,,,,,,,,
,"5b968ea4f118b73c63947691a29d6699","sys_file_reference",131,"uid_local",,,,0,0,"sys_file",1,,,,,,,,,
,"6d8283ea74e4379720297750955d2352","sys_file_reference",127,"uid_local",,,,0,0,"sys_file",21,,,,,,,,,
-,"765e891bbf63218c495316b2c15c5ef5","sys_file_reference",128,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,,
,"7a494c7f7952f3426f3ac471bbb52b07","sys_file_reference",129,"uid_local",,,,0,0,"sys_file",1,,,,,,,,,
-,"856c022195ad04cb2910c6ee04d188c8","sys_file_reference",131,"sys_language_uid",,,,0,0,"sys_language",2,,,,,,,,,
,"8ebb17c55331f8a6f72502fe7eff2f62","tt_content",300,"image",,,,1,0,"sys_file_reference",129,,,,,,,,,
,"a37fdd63b3a05fab2257441d4eda7287","tt_content",298,"image",,,,0,0,"sys_file_reference",132,,,,,,,,,
-,"a54f122f69d2c115a2ff0abeef673673","pages",90,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,,
,"ace39676e3513ffcfce4efc9b1d62dba","tt_content",309,"l18n_parent",,,,0,0,"tt_content",298,,,,,,,,,
,"bb9038a252bcfeadc2e1e8a6b5266986","sys_file_metadata",1,"file",,,,0,0,"sys_file",1,,,,,,,,,
-,"bc561f3a42b498f453ce374e30a04659","sys_file_reference",129,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,,
,"c78c9588e7aadd6bcfc994551fe0540c","sys_file_metadata",21,"file",,,,0,0,"sys_file",21,,,,,,,,,
,"cee4982ae84071471dea0e697628816a","sys_file_reference",130,"uid_local",,,,0,0,"sys_file",1,,,,,,,,,
,"d43e69f0be8e738554b1ddcf8c308fe8","sys_file_reference",128,"uid_local",,,,0,0,"sys_file",21,,,,,,,,,
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButNotIncluded.csv b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButNotIncluded.csv
index 113302ff8895..ed51207160c0 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButNotIncluded.csv
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButNotIncluded.csv
@@ -20,4 +20,4 @@
"sys_file_metadata",,,,,,,,,,,,
,"uid","pid","file","title","width","height","description","alternative","sys_language_uid","l10n_parent",,
,1,0,1,"Dummy image",400,300,"This is a dummy image.","Photo of program code",0,0,,
-,2,0,1,"Beispiel Bild",0,0,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
+,2,0,1,"Beispiel Bild",400,300,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButWithoutStorageOnCaseInsensitiveFilesystems.csv b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButWithoutStorageOnCaseInsensitiveFilesystems.csv
index 1162db2c91ed..32f0b49c4bb6 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButWithoutStorageOnCaseInsensitiveFilesystems.csv
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButWithoutStorageOnCaseInsensitiveFilesystems.csv
@@ -20,4 +20,4 @@
"sys_file_metadata",,,,,,,,,,,,
,"uid","pid","file","title","width","height","description","alternative","sys_language_uid","l10n_parent",,
,1,0,1,"Dummy image",400,300,"This is a dummy image.","Photo of program code",0,0,,
-,2,0,1,"Beispiel Bild",0,0,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
+,2,0,1,"Beispiel Bild",400,300,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButWithoutStorageOnCaseSensitiveFilesystems.csv b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButWithoutStorageOnCaseSensitiveFilesystems.csv
index bf60d04e6674..66afe35a4484 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButWithoutStorageOnCaseSensitiveFilesystems.csv
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesButWithoutStorageOnCaseSensitiveFilesystems.csv
@@ -20,4 +20,4 @@
"sys_file_metadata",,,,,,,,,,,,
,"uid","pid","file","title","width","height","description","alternative","sys_language_uid","l10n_parent",,
,1,0,1,"Dummy image",400,300,"This is a dummy image.","Photo of program code",0,0,,
-,2,0,1,"Beispiel Bild",0,0,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
+,2,0,1,"Beispiel Bild",400,300,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesOnCaseInsensitiveFilesystems.csv b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesOnCaseInsensitiveFilesystems.csv
index 81e83ee2b9fe..fddfda4ad69f 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesOnCaseInsensitiveFilesystems.csv
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesOnCaseInsensitiveFilesystems.csv
@@ -20,4 +20,4 @@
"sys_file_metadata",,,,,,,,,,,,
,"uid","pid","file","title","width","height","description","alternative","sys_language_uid","l10n_parent",,
,1,0,1,"Dummy image",400,300,"This is a dummy image.","Photo of program code",0,0,,
-,2,0,1,"Beispiel Bild",0,0,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
+,2,0,1,"Beispiel Bild",400,300,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesOnCaseSensitiveFilesystems.csv b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesOnCaseSensitiveFilesystems.csv
index ff450c4ed3ed..a661e873332e 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesOnCaseSensitiveFilesystems.csv
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithImagesOnCaseSensitiveFilesystems.csv
@@ -20,4 +20,4 @@
"sys_file_metadata",,,,,,,,,,,,
,"uid","pid","file","title","width","height","description","alternative","sys_language_uid","l10n_parent",,
,1,0,1,"Dummy image",400,300,"This is a dummy image.","Photo of program code",0,0,,
-,2,0,1,"Beispiel Bild",0,0,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
+,2,0,1,"Beispiel Bild",400,300,"Nur ein Beispielbild.","Foto von Programmcode",1,1,,
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-corrupt-image.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-corrupt-image.xml
index 87030e83126b..9cff8b9bf9c8 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-corrupt-image.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-corrupt-image.xml
@@ -120,10 +120,6 @@
<title>typo3_image2.jpg</title>
<relationLevel>2</relationLevel>
<relations index="rels" type="array">
- <element index="sys_language:1" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
<element index="sys_file_metadata:1" type="array">
<id>1</id>
<table>sys_file_metadata</table>
@@ -411,15 +407,6 @@
<field index="alternative">Foto von Programmcode</field>
</fieldlist>
<related index="rels" type="array">
- <field index="sys_language_uid" type="array">
- <type>db</type>
- <relations index="itemArray" type="array">
- <element index="0" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
- </relations>
- </field>
<field index="l10n_parent" type="array">
<type>db</type>
<relations index="itemArray" type="array">
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-image-but-not-included.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-image-but-not-included.xml
index 76d9b7fae88c..6737764d17e4 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-image-but-not-included.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-image-but-not-included.xml
@@ -120,10 +120,6 @@
<title>typo3_image2.jpg</title>
<relationLevel>2</relationLevel>
<relations index="rels" type="array">
- <element index="sys_language:1" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
<element index="sys_file_metadata:1" type="array">
<id>1</id>
<table>sys_file_metadata</table>
@@ -411,15 +407,6 @@
<field index="alternative">Foto von Programmcode</field>
</fieldlist>
<related index="rels" type="array">
- <field index="sys_language_uid" type="array">
- <type>db</type>
- <relations index="itemArray" type="array">
- <element index="0" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
- </relations>
- </field>
<field index="l10n_parent" type="array">
<type>db</type>
<relations index="itemArray" type="array">
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-image.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-image.xml
index 10ffa69b0131..a25f1369abc9 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-image.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-with-image.xml
@@ -120,10 +120,6 @@
<title>typo3_image2.jpg</title>
<relationLevel>2</relationLevel>
<relations index="rels" type="array">
- <element index="sys_language:1" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
<element index="sys_file_metadata:1" type="array">
<id>1</id>
<table>sys_file_metadata</table>
@@ -411,15 +407,6 @@
<field index="alternative">Foto von Programmcode</field>
</fieldlist>
<related index="rels" type="array">
- <field index="sys_language_uid" type="array">
- <type>db</type>
- <relations index="itemArray" type="array">
- <element index="0" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
- </relations>
- </field>
<field index="l10n_parent" type="array">
<type>db</type>
<relations index="itemArray" type="array">
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image-but-not-included.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image-but-not-included.xml
index a109e7a7b217..00eba9d5fde9 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image-but-not-included.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image-but-not-included.xml
@@ -120,10 +120,6 @@
<title>typo3_image2.jpg</title>
<relationLevel>2</relationLevel>
<relations index="rels" type="array">
- <element index="sys_language:1" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
<element index="sys_file_metadata:1" type="array">
<id>1</id>
<table>sys_file_metadata</table>
@@ -411,15 +407,6 @@
<field index="alternative">Foto von Programmcode</field>
</fieldlist>
<related index="rels" type="array">
- <field index="sys_language_uid" type="array">
- <type>db</type>
- <relations index="itemArray" type="array">
- <element index="0" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
- </relations>
- </field>
<field index="l10n_parent" type="array">
<type>db</type>
<relations index="itemArray" type="array">
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image-without-storage.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image-without-storage.xml
index 73eb3a96188d..fa430ac67309 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image-without-storage.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image-without-storage.xml
@@ -98,10 +98,6 @@
<title>typo3_image2.jpg</title>
<relationLevel>2</relationLevel>
<relations index="rels" type="array">
- <element index="sys_language:1" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
<element index="sys_file_reference:1" type="array">
<id>1</id>
<table>sys_file_reference</table>
@@ -327,15 +323,6 @@
<field index="alternative">Foto von Programmcode</field>
</fieldlist>
<related index="rels" type="array">
- <field index="sys_language_uid" type="array">
- <type>db</type>
- <relations index="itemArray" type="array">
- <element index="0" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
- </relations>
- </field>
<field index="l10n_parent" type="array">
<type>db</type>
<relations index="itemArray" type="array">
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image.xml
index 92c405941379..ad3203dfa381 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-image.xml
@@ -120,10 +120,6 @@
<title>typo3_image2.jpg</title>
<relationLevel>2</relationLevel>
<relations index="rels" type="array">
- <element index="sys_language:1" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
<element index="sys_file_metadata:1" type="array">
<id>1</id>
<table>sys_file_metadata</table>
@@ -411,15 +407,6 @@
<field index="alternative">Foto von Programmcode</field>
</fieldlist>
<related index="rels" type="array">
- <field index="sys_language_uid" type="array">
- <type>db</type>
- <relations index="itemArray" type="array">
- <element index="0" type="array">
- <id>1</id>
- <table>sys_language</table>
- </element>
- </relations>
- </field>
<field index="l10n_parent" type="array">
<type>db</type>
<relations index="itemArray" type="array">
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Discard/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Discard/DataSet/localizeContent.csv
index 10d60075febf..b11b900879d3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Discard/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Discard/DataSet/localizeContent.csv
@@ -53,4 +53,3 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,,,
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 a771fe64a5a5..0c7c7b12ee3b 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
@@ -56,11 +56,8 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,,,
-,"78d6654c16888782c0c8926e1c84eb91","sys_file_reference",130,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,,,
,"b31b9d503048d23a729d45aaefef50e3","sys_file_reference",130,"l10n_parent",,,,0,1,"sys_file_reference",128,,,,,,,,
,"36f1ed8936df905a25f6454b259f05eb","sys_file_reference",130,"uid_local",,,,0,1,"sys_file",21,,,,,,,,
-,"d62c42560d6c8d14732189e48a4966dc","sys_file_reference",131,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,,,
,"e736591c7c711ff9f5f5c63b0a99e746","sys_file_reference",131,"l10n_parent",,,,0,1,"sys_file_reference",129,,,,,,,,
,"69bd4dfe47d34722a1668f50c7f2deaa","sys_file_reference",131,"uid_local",,,,0,1,"sys_file",1,,,,,,,,
,"ba31b8a67c7225f082b6334055ede323","tt_content",332,"l18n_parent",,,,0,1,"tt_content",331,,,,,,,,
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 e4c9d5df5ae2..886a2a91baa3 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
@@ -56,13 +56,10 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
,"0a3fa2f40b53744357c071f667281c84","tt_content",332,"l18n_parent",,,,0,0,"tt_content",331,,,,,,,,
,"74fef103ad1ce60f35379cb6708de42d","tt_content",332,"image",,,,0,0,"sys_file_reference",130,,,,,,,,
,"67800a8a3e68bd7d374bcb2bd2e92817","tt_content",332,"image",,,,1,0,"sys_file_reference",131,,,,,,,,
-,"046fb06ef64a73bd4c5c86c7dd3f49b2","sys_file_reference",130,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
,"7481b0e8948fb02ee8492d5d4b9fa94f","sys_file_reference",130,"l10n_parent",,,,0,0,"sys_file_reference",128,,,,,,,,
,"252dc24e456cc50f92697e1758bdebe3","sys_file_reference",130,"uid_local",,,,0,0,"sys_file",21,,,,,,,,
-,"8df2b48c7bb380e4b2f6785c96813293","sys_file_reference",131,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
,"b6607efd38e771cc5d64f7521d2e0161","sys_file_reference",131,"l10n_parent",,,,0,0,"sys_file_reference",129,,,,,,,,
,"5b968ea4f118b73c63947691a29d6699","sys_file_reference",131,"uid_local",,,,0,0,"sys_file",1,,,,,,,,
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 9798539d18dc..50822bc161ff 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
@@ -58,11 +58,8 @@
,"0a3fa2f40b53744357c071f667281c84","tt_content",332,"l18n_parent",,,,0,0,"tt_content",331,,,,,,,,
,"74fef103ad1ce60f35379cb6708de42d","tt_content",332,"image",,,,0,0,"sys_file_reference",130,,,,,,,,
,"67800a8a3e68bd7d374bcb2bd2e92817","tt_content",332,"image",,,,1,0,"sys_file_reference",131,,,,,,,,
-,"046fb06ef64a73bd4c5c86c7dd3f49b2","sys_file_reference",130,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
,"7481b0e8948fb02ee8492d5d4b9fa94f","sys_file_reference",130,"l10n_parent",,,,0,0,"sys_file_reference",128,,,,,,,,
,"252dc24e456cc50f92697e1758bdebe3","sys_file_reference",130,"uid_local",,,,0,0,"sys_file",21,,,,,,,,
-,"8df2b48c7bb380e4b2f6785c96813293","sys_file_reference",131,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
,"b6607efd38e771cc5d64f7521d2e0161","sys_file_reference",131,"l10n_parent",,,,0,0,"sys_file_reference",129,,,,,,,,
,"5b968ea4f118b73c63947691a29d6699","sys_file_reference",131,"uid_local",,,,0,0,"sys_file",1,,,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Discard/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Discard/DataSet/localizeElementOfRelation.csv
index 35bd1e6840e0..703fa48073cd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Discard/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Discard/DataSet/localizeElementOfRelation.csv
@@ -34,4 +34,3 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
index b035e24692ea..3d53ff4ee338 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
@@ -35,6 +35,4 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
-,"95fee7c6e202951c54038169e7f7e703","tx_testdatahandler_element",4,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"6cbe530f070905e764e858bfea02a82b","tx_testdatahandler_element",4,"l10n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/DataSet/localizeElementOfRelation.csv
index 7fd8daa50b37..ace2a5318143 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/DataSet/localizeElementOfRelation.csv
@@ -35,6 +35,4 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"f73b157a3ad0579eab2f3b7f3fce0c69","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"e6d2afeb8da9fb54ceb83ae73d85e964","tx_testdatahandler_element",4,"l10n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/DataSet/localizeElementOfRelation.csv
index 7fd8daa50b37..ace2a5318143 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/DataSet/localizeElementOfRelation.csv
@@ -35,6 +35,4 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"f73b157a3ad0579eab2f3b7f3fce0c69","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"e6d2afeb8da9fb54ceb83ae73d85e964","tx_testdatahandler_element",4,"l10n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 7abbbe0b81e7..dbdb41164b08 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -59,4 +59,3 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/localizeParentContentWAllChildren.csv
index 7abbbe0b81e7..dbdb41164b08 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/localizeParentContentWAllChildren.csv
@@ -59,4 +59,3 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index a596b9b6b960..284932124390 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -65,12 +65,9 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"caad2222956222fafe344085ab7393ef","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,1,"tx_irretutorial_1ncsv_hotel",6,,,,,,
,"8140fd8f74b30ebbb5e9c7ce429cf0a8","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,1,"tx_irretutorial_1ncsv_offer",9,,,,,,
-,"dc4f18e3d3375e17b367bd49c8e0e981","tx_irretutorial_1ncsv_offer",10,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"d8413dd9513a15fa15315ea8addd4b22","tx_irretutorial_1ncsv_offer",10,"l18n_parent",,,,0,1,"tx_irretutorial_1ncsv_offer",9,,,,,,
-,"ce0e36f5799648df48747a6be58c8e0b","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"8585a5b228f88f0e056a2d2153a5114f","tx_irretutorial_1ncsv_hotel",7,"l18n_parent",,,,0,1,"tx_irretutorial_1ncsv_hotel",6,,,,,,
,"d26aa26a3187d0da65ce84d951ae95cd","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,1,"tx_irretutorial_1ncsv_offer",10,,,,,,
,"7582c96a875797f3e5718474fa53203d","tt_content",300,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
index 180f89f2f880..2e400c391078 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -63,13 +63,9 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
-,"021363581428cb83c20c098ed18a1b96","tx_irretutorial_1ncsv_price",14,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"3ad4456863d273b5d76285fef74a0acd","tx_irretutorial_1ncsv_price",14,"l18n_parent",,,,0,1,"tx_irretutorial_1ncsv_price",13,,,,,,
-,"478cd766c8e81c0255dcd42f31c4a1e5","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"675232e0667f35800ae88c1561157cf5","tx_irretutorial_1ncsv_offer",9,"l18n_parent",,,,0,1,"tx_irretutorial_1ncsv_offer",8,,,,,,
,"f92216ac7261befdce6bc4918bf9824b","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,1,"tx_irretutorial_1ncsv_price",14,,,,,,
-,"676a68fd6f7fe370b0342299d9eacf68","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"492587be9c7f832d981fbefe805797ae","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,1,"tx_irretutorial_1ncsv_hotel",5,,,,,,
,"8140fd8f74b30ebbb5e9c7ce429cf0a8","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,1,"tx_irretutorial_1ncsv_offer",9,,,,,,
,"e4afda9b67d6ad42e03f5c797250235d","tt_content",299,"l18n_parent",,,,0,1,"tt_content",298,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index ed590b35b569..31ca2cc71c9c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -65,13 +65,10 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"035a36508d0e590c242199f3ef948bac","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,,
,"861e9ad5dec6a3ceb973908b2f8d0c32","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,,
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"e5e0bfb63ea0ce40c5d5c35e2a5487f8","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,,
-,"9f61604cec24ed7a1e777e731aa663b1","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"31269293887fab23c5057f80f5eb5506","tx_irretutorial_1ncsv_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,,
,"beac3ec367f17c0930e3c0888b4f3bf3","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",10,,,,,,
-,"d6506f8fc7c2c4066d66cb2472413508","tx_irretutorial_1ncsv_offer",10,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"615c48291ed0e77278a40bab1f9ddb5f","tx_irretutorial_1ncsv_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/localizeParentContentWAllChildren.csv
index 4634d547b43c..eefe7bd5395f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/localizeParentContentWAllChildren.csv
@@ -63,14 +63,10 @@
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
,"035a36508d0e590c242199f3ef948bac","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"88ae3f8d74fc86815009ef345a081f5a","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",5,,,,,,
,"861e9ad5dec6a3ceb973908b2f8d0c32","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,,
-,"6fa40fc483e8f2e3343a08d221e0ca1f","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"3e32c2fc50e95f5ca33df650a67f7a36","tx_irretutorial_1ncsv_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_offer",8,,,,,,
,"36abb0a718184cad7af9231682f25cd3","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",14,,,,,,
-,"fa0f578eaaaa900ba7a1b4752dc97448","tx_irretutorial_1ncsv_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"b842ef889bb06c9e139d150c1995adae","tx_irretutorial_1ncsv_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 8733b11a91b0..0b5a1436573b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -64,14 +64,11 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,,,,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
-,"9f61604cec24ed7a1e777e731aa663b1","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"31269293887fab23c5057f80f5eb5506","tx_irretutorial_1ncsv_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,,
,"beac3ec367f17c0930e3c0888b4f3bf3","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",10,,,,,,
,"861e9ad5dec6a3ceb973908b2f8d0c32","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,,
-,"d6506f8fc7c2c4066d66cb2472413508","tx_irretutorial_1ncsv_offer",10,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"615c48291ed0e77278a40bab1f9ddb5f","tx_irretutorial_1ncsv_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,,
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"e5e0bfb63ea0ce40c5d5c35e2a5487f8","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,,
,"035a36508d0e590c242199f3ef948bac","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/localizeParentContentWAllChildren.csv
index 2cb40da27bf2..be39eac654a7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/localizeParentContentWAllChildren.csv
@@ -62,15 +62,11 @@
,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,"tx_irretutorial_1ncsv_price",11,,,,,,
,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",12,,,,,,
,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
-,"6fa40fc483e8f2e3343a08d221e0ca1f","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"3e32c2fc50e95f5ca33df650a67f7a36","tx_irretutorial_1ncsv_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_offer",8,,,,,,
,"36abb0a718184cad7af9231682f25cd3","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,"tx_irretutorial_1ncsv_price",14,,,,,,
-,"fa0f578eaaaa900ba7a1b4752dc97448","tx_irretutorial_1ncsv_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"b842ef889bb06c9e139d150c1995adae","tx_irretutorial_1ncsv_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_price",13,,,,,,
-,"ad1ac9faef49fbcb2ba0ad1f190ae0c2","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"88ae3f8d74fc86815009ef345a081f5a","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1ncsv_hotel",5,,,,,,
,"861e9ad5dec6a3ceb973908b2f8d0c32","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,,
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
,"035a36508d0e590c242199f3ef948bac","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index da14e1b948a5..f1fc265dd423 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -52,7 +52,6 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv
index 5494b3b0e1e7..6fafae4a3890 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv
@@ -52,7 +52,6 @@
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 3b5787e70355..24592a57c554 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -54,7 +54,6 @@
,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"104b9c1a72e956ad63790e2d3ea480c8","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
,"1d9069b3e1d717848ec7e6f4265cb13c","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
@@ -62,7 +61,6 @@
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
@@ -72,7 +70,6 @@
,"7582c96a875797f3e5718474fa53203d","tt_content",300,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
,"9bd5048c24347f5517c03b938f6c3ac9","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",7,,,,,,
,"a3f812d1ccd98d01b5bccd3e7d004abe","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"b37e678d051858784b9116070ae0d9a7","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
index 6a0fe6111d6b..09a64b74abdd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
@@ -54,7 +54,6 @@
,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"104b9c1a72e956ad63790e2d3ea480c8","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
,"1d9069b3e1d717848ec7e6f4265cb13c","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
@@ -62,7 +61,6 @@
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
@@ -72,7 +70,6 @@
,"7582c96a875797f3e5718474fa53203d","tt_content",300,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
,"9bd5048c24347f5517c03b938f6c3ac9","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",7,,,,,,
,"a3f812d1ccd98d01b5bccd3e7d004abe","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"b37e678d051858784b9116070ae0d9a7","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
index e25ed0fd579f..327d52a949a1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -57,22 +57,18 @@
,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"5556e0e974c5b0647087fb10523694b7","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
,"6e383727a415ed98cb8ae97c4b5e79c9","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_price",13,,,,,,
,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"83874b6772414f0d77c6afbf74b06085","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"a68265bc2cb22cc9b657b472edfecdcf","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",5,,,,,,
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"d5ee020133c002a3652eba24feeb63f6","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"e4afda9b67d6ad42e03f5c797250235d","tt_content",299,"l18n_parent",,,,0,1,"tt_content",298,,,,,,
,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
,"ffe9a8f88937c514d978845069a00389","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_offer",8,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 38a0551df53f..c00ee379faef 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -66,10 +66,7 @@
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6a707a3af7969b80bcf2636a46a56857","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"b3c4ea9f9a1a599c91d06b35aff21185","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv
index a1c0b1ab3b98..bbb1ed32640a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv
@@ -48,7 +48,6 @@
"sys_refindex",,,,,,,,,,,,,,,,,
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0a0b60674d754575b9148bb7d86241f4","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
@@ -59,7 +58,6 @@
,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
@@ -67,12 +65,10 @@
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"ddf30b5f96113ff856bc9e7aaa07f7f4","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 38a0551df53f..c00ee379faef 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -66,10 +66,7 @@
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6a707a3af7969b80bcf2636a46a56857","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"b3c4ea9f9a1a599c91d06b35aff21185","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv
index a1c0b1ab3b98..bbb1ed32640a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv
@@ -48,7 +48,6 @@
"sys_refindex",,,,,,,,,,,,,,,,,
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0a0b60674d754575b9148bb7d86241f4","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
@@ -59,7 +58,6 @@
,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"45d5219294f18bc5959918ef77e1a69d","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
@@ -67,12 +65,10 @@
,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"ddf30b5f96113ff856bc9e7aaa07f7f4","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Discard/DataSet/localizeCategoryOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Discard/DataSet/localizeCategoryOfRelation.csv
index 9ed509fd927d..b48740bf660a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Discard/DataSet/localizeCategoryOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Discard/DataSet/localizeCategoryOfRelation.csv
@@ -38,7 +38,6 @@
,"1b70a8e25c22645f7a49a79f57f3cf3f","sys_category",31,"parent",,,,0,0,"sys_category",28,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"3c637501ab9c158daa933643bff8cc43","sys_category",28,"items",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"aabda97b66f9b693f30d1faf442b37d6","sys_category",29,"items",,,,1,0,"tt_content",298,,,,,,
,"b102e2f9b1ed99b14d813363199cb281","sys_category",30,"items",,,,0,0,"tt_content",298,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
index 649dd9a248ee..a431ef336c2a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
@@ -40,7 +40,6 @@
,"1b70a8e25c22645f7a49a79f57f3cf3f","sys_category",31,"parent",,,,0,0,"sys_category",28,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"3c637501ab9c158daa933643bff8cc43","sys_category",28,"items",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"aabda97b66f9b693f30d1faf442b37d6","sys_category",29,"items",,,,1,0,"tt_content",298,,,,,,
,"b102e2f9b1ed99b14d813363199cb281","sys_category",30,"items",,,,0,0,"tt_content",298,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/DataSet/localizeCategoryOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/DataSet/localizeCategoryOfRelation.csv
index 815bfbe7143b..ffe1c9f4b878 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/DataSet/localizeCategoryOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/DataSet/localizeCategoryOfRelation.csv
@@ -42,7 +42,6 @@
,"3c637501ab9c158daa933643bff8cc43","sys_category",28,"items",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"6353f17422ca9ee8ea9f0b18d2b233ce","sys_category",32,"l10n_parent",,,,0,0,"sys_category",28,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"aabda97b66f9b693f30d1faf442b37d6","sys_category",29,"items",,,,1,0,"tt_content",298,,,,,,
,"b102e2f9b1ed99b14d813363199cb281","sys_category",30,"items",,,,0,0,"tt_content",298,,,,,,
,"e19100d609a435906e16432a41b55c72","sys_category",29,"items",,,,0,0,"tt_content",297,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/DataSet/localizeCategoryOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/DataSet/localizeCategoryOfRelation.csv
index 815bfbe7143b..ffe1c9f4b878 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/DataSet/localizeCategoryOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/DataSet/localizeCategoryOfRelation.csv
@@ -42,7 +42,6 @@
,"3c637501ab9c158daa933643bff8cc43","sys_category",28,"items",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"6353f17422ca9ee8ea9f0b18d2b233ce","sys_category",32,"l10n_parent",,,,0,0,"sys_category",28,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"aabda97b66f9b693f30d1faf442b37d6","sys_category",29,"items",,,,1,0,"tt_content",298,,,,,,
,"b102e2f9b1ed99b14d813363199cb281","sys_category",30,"items",,,,0,0,"tt_content",298,,,,,,
,"e19100d609a435906e16432a41b55c72","sys_category",29,"items",,,,0,0,"tt_content",297,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/copyContentToLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/copyContentToLanguage.csv
index f88203f2a9f8..cac479256bc8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/copyContentToLanguage.csv
@@ -35,6 +35,5 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
index 7888dacbcc1c..fb9e729d21df 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
@@ -36,8 +36,6 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"7975eec03f5893b1b106b0e7c69d9277","pages",92,"sys_language_uid",,,,0,1,"sys_language",2,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/createContentAndLocalize.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/createContentAndLocalize.csv
index e1c36f5ed2d0..c747e8782287 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/createContentAndLocalize.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/createContentAndLocalize.csv
@@ -35,6 +35,5 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/deleteLocalizedContentNDeleteContent.csv
index 7399d2fcc3d2..874c0daee523 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/deleteLocalizedContentNDeleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -38,6 +38,5 @@
,"1aabb1deaec63ac369ca0b48bb8ed261","tt_content",321,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeContent.csv
index 4f07070c1b96..7c382b232f02 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeContent.csv
@@ -35,6 +35,5 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeContentFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeContentFromNonDefaultLanguage.csv
index 7888dacbcc1c..fb9e729d21df 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeContentFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeContentFromNonDefaultLanguage.csv
@@ -36,8 +36,6 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"7975eec03f5893b1b106b0e7c69d9277","pages",92,"sys_language_uid",,,,0,1,"sys_language",2,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeNestedPagesAndContents.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeNestedPagesAndContents.csv
index e355cb396799..3a764cafdfc4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeNestedPagesAndContents.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/localizeNestedPagesAndContents.csv
@@ -39,5 +39,4 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"df7fdfe7276be741fca5a5e773024b52","tt_content",322,"l18n_parent",,,,0,1,"tt_content",298,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
index 622befdcaffb..db03baccbd9e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
@@ -37,4 +37,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
index 381c8b65c0a6..465eefe6b055 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
@@ -39,5 +39,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
index fba73f3b4110..0236718b5b10 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
@@ -39,5 +39,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedToDifferentPageTwice.csv
index b1715f195a40..63b8562cb271 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/movePageLocalizedToDifferentPageTwice.csv
@@ -35,6 +35,5 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
index 78286b968c26..0ccc0c2d5523 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
@@ -36,6 +36,5 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
index 64a8be2f2fc9..053236c411e0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
@@ -37,8 +37,6 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"7975eec03f5893b1b106b0e7c69d9277","pages",92,"sys_language_uid",,,,0,1,"sys_language",2,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndLocalize.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndLocalize.csv
index ad29adf8a01e..8a58af144d89 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndLocalize.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentAndLocalize.csv
@@ -37,7 +37,6 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"c2633afdf3e4dcb6b71f7917b1639f03","tt_content",322,"l18n_parent",,,,0,1,"tt_content",321,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedNotHiddenWorkspaceContentHiddenInLive.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedNotHiddenWorkspaceContentHiddenInLive.csv
index 7de962c3175c..807912869d1c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedNotHiddenWorkspaceContentHiddenInLive.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedNotHiddenWorkspaceContentHiddenInLive.csv
@@ -39,4 +39,3 @@
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"1aabb1deaec63ac369ca0b48bb8ed261","tt_content",321,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
index 386bf8867ad1..917f110adaf5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -38,6 +38,5 @@
,"1aabb1deaec63ac369ca0b48bb8ed261","tt_content",321,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
index e473952fd3c5..124f29f62599 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
@@ -36,7 +36,6 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"b23b1bb6b70e67c019a42d216ad2b530","tt_content",321,"l18n_parent",,,,0,1,"tt_content",298,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
index 15a5e61b4db9..965f4aae6474 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
@@ -38,8 +38,6 @@
,"1aabb1deaec63ac369ca0b48bb8ed261","tt_content",321,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"7975eec03f5893b1b106b0e7c69d9277","pages",92,"sys_language_uid",,,,0,1,"sys_language",2,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWHideAtCopy.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWHideAtCopy.csv
index e473952fd3c5..124f29f62599 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWHideAtCopy.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWHideAtCopy.csv
@@ -36,7 +36,6 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"b23b1bb6b70e67c019a42d216ad2b530","tt_content",321,"l18n_parent",,,,0,1,"tt_content",298,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv
index a264e3f1d74d..468cf9cc468f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv
@@ -34,5 +34,4 @@
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv
index df4b9d0dce73..c4d8b8ab22f0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv
@@ -41,10 +41,8 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"9434c924e680160a60c83df200f810a7","pages",91,"l10n_parent",,,,0,1,"pages",88,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"df7fdfe7276be741fca5a5e773024b52","tt_content",322,"l18n_parent",,,,0,1,"tt_content",298,,,,,,
,"fffdbb98fc1d298c0a4ef3ab1dfa0ffb","tt_content",324,"l18n_parent",,,,0,1,"tt_content",323,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
index 324932285aeb..9d1dc66ff6e4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
@@ -35,6 +35,5 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
index 61429c87e43c..47e9a84d83c1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
@@ -39,6 +39,4 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"5d2643e0002a940e537ae23a0fa2237c","pages",93,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"73570d996321eee465b18303997e9a62","pages",93,"l10n_parent",,,,0,1,"pages",92,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
index 87e039be4aa9..f6d6bf3535b9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
@@ -40,5 +40,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
index 04becb2a9e08..1b2d2fc4e622 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
@@ -40,5 +40,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedToDifferentPageTwice.csv
index f6c7b72a59c3..eeb0d5e732b4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageLocalizedToDifferentPageTwice.csv
@@ -36,6 +36,5 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguage.csv
index 8ee7b8cc9ab1..b5de39a88adb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguage.csv
@@ -38,4 +38,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
index 0e9c95b92af1..6c1ee3629af3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
@@ -39,4 +39,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"b9f68741a742c8da7251cc72ae92c14f","pages",91,"sys_language_uid",,,,0,0,"sys_language",2,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContentAndLocalize.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContentAndLocalize.csv
index 717a435412fe..69ea98fabc6a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContentAndLocalize.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/createContentAndLocalize.csv
@@ -37,7 +37,6 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"c2633afdf3e4dcb6b71f7917b1639f03","tt_content",322,"l18n_parent",,,,0,1,"tt_content",321,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContent.csv
index 550fe28fe9f7..ffbf39ccf6e5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContent.csv
@@ -38,5 +38,4 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"bb3615bcac442f70831d822f4fc41780","tt_content",321,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContentFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContentFromNonDefaultLanguage.csv
index f06d5e48159f..afb0af99a064 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContentFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeContentFromNonDefaultLanguage.csv
@@ -40,4 +40,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"5e374c8c5517e121bc1672a7a7fd94ea","tt_content",321,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
-,"b9f68741a742c8da7251cc72ae92c14f","pages",91,"sys_language_uid",,,,0,0,"sys_language",2,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeNestedPagesAndContents.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeNestedPagesAndContents.csv
index c27bb35aba9e..1e1d8f925f1d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeNestedPagesAndContents.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizeNestedPagesAndContents.csv
@@ -44,7 +44,5 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"63f8eb86e577893c26c56ab8ad818336","pages",91,"l10n_parent",,,,0,0,"pages",88,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"df7fdfe7276be741fca5a5e773024b52","tt_content",322,"l18n_parent",,,,0,1,"tt_content",298,,,,,,
,"fffdbb98fc1d298c0a4ef3ab1dfa0ffb","tt_content",324,"l18n_parent",,,,0,1,"tt_content",323,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizePage.csv
index 238fb5edd447..6ecb6dfcdd53 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/localizePage.csv
@@ -37,4 +37,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
index 05343c52db54..603780035939 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
@@ -39,5 +39,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"5d2643e0002a940e537ae23a0fa2237c","pages",93,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
index ef88ab66541f..102b51c1babb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
@@ -39,5 +39,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
index 711ed4de1d10..5fa0627a2f17 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedInLiveWorkspaceDeletedToDifferentPageTwice.csv
@@ -39,5 +39,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"81bed3ff81afcdb0e38d7f99f497b890","pages",92,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
-,"9d3332684525c081c5fd3ce639d0df64","pages",92,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedToDifferentPageTwice.csv
index a4d77fcf3c69..61623f6d8107 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/movePageLocalizedToDifferentPageTwice.csv
@@ -35,6 +35,5 @@
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguage.csv
index 8ee7b8cc9ab1..b5de39a88adb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguage.csv
@@ -38,4 +38,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
index 0e1d2e487675..cd7a6f46ff9a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
@@ -38,4 +38,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"b9f68741a742c8da7251cc72ae92c14f","pages",91,"sys_language_uid",,,,0,0,"sys_language",2,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContentAndLocalize.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContentAndLocalize.csv
index e0f174eb0d19..c3e104cf5f4a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContentAndLocalize.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/createContentAndLocalize.csv
@@ -40,4 +40,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"5c2adb1fc186647240c77da0e8809478","tt_content",322,"l18n_parent",,,,0,0,"tt_content",321,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv
index 3e3a8863d4ce..a6b1ab2b4992 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -36,4 +36,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContent.csv
index 550fe28fe9f7..ffbf39ccf6e5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContent.csv
@@ -38,5 +38,4 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"bb3615bcac442f70831d822f4fc41780","tt_content",321,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContentFromNonDefaultLanguage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContentFromNonDefaultLanguage.csv
index 170e53215e1d..9079206f5f75 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContentFromNonDefaultLanguage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeContentFromNonDefaultLanguage.csv
@@ -39,4 +39,3 @@
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"5e374c8c5517e121bc1672a7a7fd94ea","tt_content",321,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
-,"b9f68741a742c8da7251cc72ae92c14f","pages",91,"sys_language_uid",,,,0,0,"sys_language",2,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeNestedPagesAndContents.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeNestedPagesAndContents.csv
index f036efd61236..576fd8dabc8c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeNestedPagesAndContents.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizeNestedPagesAndContents.csv
@@ -39,12 +39,10 @@
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"0de72a88cbb2e461b5e83ef06a7ebf08","tt_content",324,"l18n_parent",,,,0,0,"tt_content",323,,,,,,
,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
-,"1b482f5cf5e2d5935f7b52422295b96a","pages",92,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"63f8eb86e577893c26c56ab8ad818336","pages",91,"l10n_parent",,,,0,0,"pages",88,,,,,,
,"6e4feda97e1bebed53dddae0ea158346","tt_content",321,"l18n_parent",,,,0,0,"tt_content",296,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
,"ad35846417f19b4a89ddf0294657865c","tt_content",322,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePage.csv
index 238fb5edd447..6ecb6dfcdd53 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/localizePage.csv
@@ -37,4 +37,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
index 11b6c1e0e165..ee85fd8789b7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedInLiveToDifferentPageTwice.csv
@@ -37,4 +37,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
index 7c692a02137d..699f9dfc5f3b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedInLiveWorkspaceChangedToDifferentPageTwice.csv
@@ -37,4 +37,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedToDifferentPageTwice.csv
index 013048e22a38..8b14b24f19dc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/movePageLocalizedToDifferentPageTwice.csv
@@ -37,4 +37,3 @@
,"25f3b71b67f29fa33fbfd4fa2d930b70","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"4a1e04a83a4a17882682d86f6cd61f3d","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Discard/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Discard/DataSet/localizeElementOfRelation.csv
index 659ae2f59eb7..8b6c40a1960c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Discard/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Discard/DataSet/localizeElementOfRelation.csv
@@ -29,7 +29,6 @@
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,,,,,,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",2,,,,,,
,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",1,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
index 386938038ec2..41b5b1d6b705 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
@@ -23,10 +23,8 @@
,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string"
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,
-,"4433e80cbec985130824d6d302ad293f","pages",91,"sys_language_uid",,,,0,1,"sys_language",1,
,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,
,"6cbe530f070905e764e858bfea02a82b","tx_testdatahandler_element",4,"l10n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",1,
-,"95fee7c6e202951c54038169e7f7e703","tx_testdatahandler_element",4,"sys_language_uid",,,,0,1,"sys_language",1,
,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",2,
,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",1,
,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",3,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/DataSet/localizeElementOfRelation.csv
index 48d60c3f1882..0651ca134f74 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/DataSet/localizeElementOfRelation.csv
@@ -24,10 +24,8 @@
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,
,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",2,
,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",1,
,"e6d2afeb8da9fb54ceb83ae73d85e964","tx_testdatahandler_element",4,"l10n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",1,
,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",3,
-,"f73b157a3ad0579eab2f3b7f3fce0c69","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,"sys_language",1,
,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",2,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/DataSet/localizeElementOfRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/DataSet/localizeElementOfRelation.csv
index 48d60c3f1882..0651ca134f74 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/DataSet/localizeElementOfRelation.csv
@@ -24,10 +24,8 @@
,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,
,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,
,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,
-,"8d96507cabb44e003ba3015a13265f03","pages",91,"sys_language_uid",,,,0,0,"sys_language",1,
,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",2,
,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",1,
,"e6d2afeb8da9fb54ceb83ae73d85e964","tx_testdatahandler_element",4,"l10n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",1,
,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",3,
-,"f73b157a3ad0579eab2f3b7f3fce0c69","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,"sys_language",1,
,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",2,
--
GitLab