From 550cc0111aac2b6d1481c187ec2081f75a7469d4 Mon Sep 17 00:00:00 2001 From: Stefan Froemken Date: Thu, 1 Jun 2023 16:33:08 +0200 Subject: [PATCH 1/3] Remove last fragments of csh usage --- .../EventQueueWorkerTaskAdditionalFieldProvider.php | 2 -- .../IndexQueueWorkerTaskAdditionalFieldProvider.php | 6 ------ .../OptimizeIndexTaskAdditionalFieldProvider.php | 4 ---- Classes/Task/ReIndexTaskAdditionalFieldProvider.php | 4 ---- .../Private/Language/de.locallang_csh_pages.xlf | 12 ------------ Resources/Private/Language/locallang_csh_pages.xlf | 11 ----------- 6 files changed, 39 deletions(-) delete mode 100644 Resources/Private/Language/de.locallang_csh_pages.xlf delete mode 100644 Resources/Private/Language/locallang_csh_pages.xlf diff --git a/Classes/Task/EventQueueWorkerTaskAdditionalFieldProvider.php b/Classes/Task/EventQueueWorkerTaskAdditionalFieldProvider.php index e58fdd21db..c66a33e4f3 100644 --- a/Classes/Task/EventQueueWorkerTaskAdditionalFieldProvider.php +++ b/Classes/Task/EventQueueWorkerTaskAdditionalFieldProvider.php @@ -59,8 +59,6 @@ public function getAdditionalFields( $additionalFields['limit'] = [ 'code' => '', 'label' => 'LLL:EXT:solr/Resources/Private/Language/locallang_be.xlf:task.eventQueueWorkerTask.limit', - 'cshKey' => '', - 'cshLabel' => '', ]; return $additionalFields; diff --git a/Classes/Task/IndexQueueWorkerTaskAdditionalFieldProvider.php b/Classes/Task/IndexQueueWorkerTaskAdditionalFieldProvider.php index abb32594ef..90438678e0 100644 --- a/Classes/Task/IndexQueueWorkerTaskAdditionalFieldProvider.php +++ b/Classes/Task/IndexQueueWorkerTaskAdditionalFieldProvider.php @@ -90,22 +90,16 @@ public function getAdditionalFields( $taskInfo['site'] ), 'label' => 'LLL:EXT:solr/Resources/Private/Language/locallang.xlf:field_site', - 'cshKey' => '', - 'cshLabel' => '', ]; $additionalFields['documentsToIndexLimit'] = [ 'code' => '', 'label' => 'LLL:EXT:solr/Resources/Private/Language/locallang.xlf:indexqueueworker_field_documentsToIndexLimit', - 'cshKey' => '', - 'cshLabel' => '', ]; $additionalFields['forcedWebRoot'] = [ 'code' => '', 'label' => 'LLL:EXT:solr/Resources/Private/Language/locallang.xlf:indexqueueworker_field_forcedWebRoot', - 'cshKey' => '', - 'cshLabel' => '', ]; return $additionalFields; diff --git a/Classes/Task/OptimizeIndexTaskAdditionalFieldProvider.php b/Classes/Task/OptimizeIndexTaskAdditionalFieldProvider.php index a7317a08a7..85cee2029e 100644 --- a/Classes/Task/OptimizeIndexTaskAdditionalFieldProvider.php +++ b/Classes/Task/OptimizeIndexTaskAdditionalFieldProvider.php @@ -136,15 +136,11 @@ public function getAdditionalFields( $additionalFields['site'] = [ 'code' => $siteSelectorField->getAvailableSitesSelector('tx_scheduler[site]', $this->site), 'label' => $this->languageFile . ':field_site', - 'cshKey' => '', - 'cshLabel' => '', ]; $additionalFields['cores'] = [ 'code' => $this->getCoreSelectorMarkup(), 'label' => $this->languageFile . ':field_cores', - 'cshKey' => '', - 'cshLabel' => '', ]; return $additionalFields; diff --git a/Classes/Task/ReIndexTaskAdditionalFieldProvider.php b/Classes/Task/ReIndexTaskAdditionalFieldProvider.php index 1c823bc63e..b6ec26f533 100644 --- a/Classes/Task/ReIndexTaskAdditionalFieldProvider.php +++ b/Classes/Task/ReIndexTaskAdditionalFieldProvider.php @@ -123,15 +123,11 @@ public function getAdditionalFields( $this->site ), 'label' => 'LLL:EXT:solr/Resources/Private/Language/locallang.xlf:field_site', - 'cshKey' => '', - 'cshLabel' => '', ]; $additionalFields['indexingConfigurations'] = [ 'code' => $this->getIndexingConfigurationSelector(), 'label' => 'Index Queue configurations to re-index', - 'cshKey' => '', - 'cshLabel' => '', ]; return $additionalFields; diff --git a/Resources/Private/Language/de.locallang_csh_pages.xlf b/Resources/Private/Language/de.locallang_csh_pages.xlf deleted file mode 100644 index 504757410a..0000000000 --- a/Resources/Private/Language/de.locallang_csh_pages.xlf +++ /dev/null @@ -1,12 +0,0 @@ - - - -
- - - If enabled, this option includes the sub entries of this page in Solr index. (NOTE: Value=0 means enabled in this view.) - Falls aktiviert, werden die Untereinträge dieser Seite bei einer Suche berücksichtigt. (Bitte beachte, dass der Wert=0 wegen Negation in dieser Ansicht "aktiviert" bedeutet.) - - - - diff --git a/Resources/Private/Language/locallang_csh_pages.xlf b/Resources/Private/Language/locallang_csh_pages.xlf deleted file mode 100644 index f04dc06b63..0000000000 --- a/Resources/Private/Language/locallang_csh_pages.xlf +++ /dev/null @@ -1,11 +0,0 @@ - - - -
- - - If enabled, this option includes the sub entries of this page in Solr index. (NOTE: Value=0 means enabled in this view.) - - - - From 4e599501f48ea75e6c0fdc472466764653faeda2 Mon Sep 17 00:00:00 2001 From: Stefan Froemken Date: Fri, 2 Jun 2023 09:46:24 +0200 Subject: [PATCH 2/3] Remove CSH registration from ext_tables.php --- ext_tables.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/ext_tables.php b/ext_tables.php index 0d8ab18d17..84b9946c90 100644 --- a/ext_tables.php +++ b/ext_tables.php @@ -6,20 +6,6 @@ defined('TYPO3') or die('Access denied.'); -(static function () { - if (($GLOBALS['TYPO3_REQUEST'] ?? null) instanceof ServerRequestInterface - && ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend() - ) { - // Register Context Sensitive Help (CSH) translation labels - ExtensionManagementUtility::addLLrefForTCAdescr( - 'pages', - 'EXT:solr/Resources/Private/Language/locallang_csh_pages.xlf' - ); - } -})(); - -// ----- # ----- # ----- # ----- # ----- # ----- # ----- # ----- # ----- # - $isComposerMode = defined('TYPO3_COMPOSER_MODE') && TYPO3_COMPOSER_MODE; if (!$isComposerMode) { // we load the autoloader for our libraries From 94ddae4252308f129f534f61411b651d1706a01a Mon Sep 17 00:00:00 2001 From: Stefan Froemken Date: Fri, 2 Jun 2023 10:56:20 +0200 Subject: [PATCH 3/3] Remove unused imports from ext_tables.php --- ext_tables.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/ext_tables.php b/ext_tables.php index 84b9946c90..7a495707eb 100644 --- a/ext_tables.php +++ b/ext_tables.php @@ -1,7 +1,5 @@