From c448bd9d51a1a2a4296e475424dc65208df94342 Mon Sep 17 00:00:00 2001 From: Pawel Cieslik Date: Wed, 29 Nov 2017 13:03:54 +0100 Subject: [PATCH] [!!!][TASK] Remove TYPO3.LLL usages in TYPO3 core Remove TYPO3.LLL after moving to new JS API for translations TYPO3.lang Resolves: #83161 Releases: master Change-Id: I815b15349c8bfe6ca71f4d1ce59b7b01e670eae2 Reviewed-on: https://review.typo3.org/54860 Reviewed-by: Markus Klein Tested-by: Markus Klein Tested-by: TYPO3com Reviewed-by: Benni Mack Tested-by: Benni Mack --- Classes/FrontendEditAssetLoader.php | 64 ----------------------------- ext_localconf.php | 7 ---- 2 files changed, 71 deletions(-) delete mode 100644 Classes/FrontendEditAssetLoader.php diff --git a/Classes/FrontendEditAssetLoader.php b/Classes/FrontendEditAssetLoader.php deleted file mode 100644 index 46b65ad..0000000 --- a/Classes/FrontendEditAssetLoader.php +++ /dev/null @@ -1,64 +0,0 @@ -getLanguageService(); - $coreLabels = [ - 'csh_tooltip_loading' => $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:csh_tooltip_loading') - ]; - $generatedLabels = []; - $generatedLabels['core'] = $coreLabels; - $code = 'TYPO3.LLL = ' . json_encode($generatedLabels) . ';'; - $filePath = 'typo3temp/assets/js/backend-' . sha1($code) . '.js'; - if (!file_exists(PATH_site . $filePath)) { - // writeFileToTypo3tempDir() returns NULL on success (please double-read!) - $error = GeneralUtility::writeFileToTypo3tempDir(PATH_site . $filePath, $code); - if ($error !== null) { - throw new \RuntimeException('Locallang JS file could not be written to ' . $filePath . '. Reason: ' . $error, 1446118286); - } - } - $pageRenderer->addJsFile('../' . $filePath); - } - } - - /** - * Returns LanguageService - * - * @return \TYPO3\CMS\Core\Localization\LanguageService - */ - protected function getLanguageService() - { - return $GLOBALS['LANG']; - } -} diff --git a/ext_localconf.php b/ext_localconf.php index c531b71..943ffcd 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -3,10 +3,3 @@ defined('TYPO3_MODE') or die(); // Register the edit panel view. $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/classes/class.frontendedit.php']['edit'] = \TYPO3\CMS\Feedit\FrontendEditPanel::class; - -\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class)->connect( - \TYPO3\CMS\Backend\Controller\EditDocumentController::class, - 'initAfter', - \TYPO3\CMS\Feedit\FrontendEditAssetLoader::class, - 'attachAssets' -);