From 9f2c63d9077a13df8a3f54d2a1bdd686105cb763 Mon Sep 17 00:00:00 2001
From: Kevin Ditscheid <kevin.ditscheid@sgalinski.de>
Date: Thu, 20 Dec 2018 17:39:08 +0100
Subject: [PATCH] [BUGFIX] Fix News translations

---
 .../Backend/TranslationLinksViewHelper.php    |  8 +++----
 Configuration/TCA/Overrides/pages.php         | 22 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php b/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php
index df34c49..352743e 100644
--- a/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php
+++ b/Classes/ViewHelpers/Backend/TranslationLinksViewHelper.php
@@ -90,9 +90,9 @@ class TranslationLinksViewHelper extends AbstractViewHelper {
 			$newLabel = LocalizationUtility::translate('backend.action.new', 'SgNews');
 			$translationParameters = '&cmd[' . $table . '][' . $row['uid'] . '][localize]=%s';
 			if ($table === 'pages') {
-				$translationParameters = '&edit[pages_language_overlay][' . $row['uid'] . ']=new';
-				$translationParameters .= '&overrideVals[pages_language_overlay][doktype]=' . $row['doktype'];
-				$translationParameters .= '&overrideVals[pages_language_overlay][sys_language_uid]=%s';
+				$translationParameters = '&edit[pages][' . $row['uid'] . ']=new';
+				$translationParameters .= '&overrideVals[pages][doktype]=' . $row['doktype'];
+				$translationParameters .= '&overrideVals[pages][sys_language_uid]=%s';
 			}
 			foreach ($languages as $languageUid => $language) {
 				$translatedUid = 0;
@@ -100,7 +100,7 @@ class TranslationLinksViewHelper extends AbstractViewHelper {
 					$translationTable = $table;
 					$translatedUid = $uid;
 				} else {
-					$translationTable = $table === 'pages' ? 'pages_language_overlay' : $table;
+					$translationTable = $table;
 					$translatedRows = BackendUtility::getRecordLocalization($table, $uid, $languageUid);
 					if (count($translatedRows)) {
 						$translatedUid = (int) $translatedRows[0]['uid'];
diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
index 84b47b2..e25c6a1 100644
--- a/Configuration/TCA/Overrides/pages.php
+++ b/Configuration/TCA/Overrides/pages.php
@@ -65,9 +65,10 @@ call_user_func(
 		}
 
 		$GLOBALS['TCA'][$table]['types'][\SGalinski\SgNews\Utility\BackendNewsUtility::NEWS_DOKTYPE] = [
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_tca.xlf:' . $table . '.palettes.standard;standard,
+			'showitem' => '--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
+					--palette--;;standard,
 					--palette--;;titleDescriptionAndHighlightFlag,
-					--palette--;LLL:EXT:cms/locallang_tca.xlf:' . $table . '.palettes.editorial;editorialWithNewsAuthor,
+					--palette--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.editorial;editorialWithNewsAuthor,
 					tx_sgnews_related_news, tx_sgnews_tags,
 				--div--;' . $localLangDbPath . $table . '.tabs.images,
 					tx_sgnews_teaser2_image, tx_sgnews_teaser1_image,
@@ -78,17 +79,19 @@ call_user_func(
 				--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.tabs.appearance,
 					--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.layout;layout,
 				--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
-					--palette--;LLL:EXT:cms/locallang_tca.xlf:' . $table . '.palettes.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_tca.xlf:' . $table . '.palettes.access;access,
+					--palette--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.visibility;visibility,
+					--palette--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.access;access,
 				--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.tabs.behaviour,
 					--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.caching;caching,
-					--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.language;language,
 					--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.miscellaneous;miscellaneous,
+				--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
+					--palette--;;language
 				'
 		];
 
 		$GLOBALS['TCA'][$table]['types'][\SGalinski\SgNews\Utility\BackendNewsUtility::CATEGORY_DOKTYPE] = [
-			'showitem' => '--palette--;LLL:EXT:cms/locallang_tca.xlf:' . $table . '.palettes.standard;standard,
+			'showitem' => '--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
+					--palette--;;standard,
 					title, tx_realurl_pathsegment, tx_realurl_exclude,
 				--div--;' . $localLangDbPath . $table . '.tabs.images,
 					tx_sgnews_teaser2_image, tx_sgnews_teaser1_image,
@@ -99,12 +102,13 @@ call_user_func(
 				--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.tabs.appearance,
 					--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.layout;layout,
 				--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
-					--palette--;LLL:EXT:cms/locallang_tca.xlf:' . $table . '.palettes.visibility;visibility,
-					--palette--;LLL:EXT:cms/locallang_tca.xlf:' . $table . '.palettes.access;access,
+					--palette--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.visibility;visibility,
+					--palette--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.access;access,
 				--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.tabs.behaviour,
 					--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.caching;caching,
-					--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.language;language,
 					--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:' . $table . '.palettes.miscellaneous;miscellaneous,
+				--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
+					--palette--;;language
 				'
 		];
 
-- 
GitLab