Skip to content

Commit

Permalink
[TASK] Remove last fragments of csh usage
Browse files Browse the repository at this point in the history
* Removes last fragments of csh usage
* Removes CSH registration from ext_tables.php
* Removes unused imports from ext_tables.php

Fixes: TYPO3-Solr#3488
Relates: TYPO3-Solr#3376
  • Loading branch information
sfroemkenjw committed Jun 2, 2023
1 parent 75f8503 commit 90fa1a9
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 55 deletions.
2 changes: 0 additions & 2 deletions Classes/Task/EventQueueWorkerTaskAdditionalFieldProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ public function getAdditionalFields(
$additionalFields['limit'] = [
'code' => '<input type="number" class="form-control" name="tx_scheduler[solr_eventqueueworkertask_limit]" value="' . (int)$taskInfo['solr_eventqueueworkertask_limit'] . '" />',
'label' => 'LLL:EXT:solr/Resources/Private/Language/locallang_be.xlf:task.eventQueueWorkerTask.limit',
'cshKey' => '',
'cshLabel' => '',
];

return $additionalFields;
Expand Down
6 changes: 0 additions & 6 deletions Classes/Task/IndexQueueWorkerTaskAdditionalFieldProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => '<input type="number" class="form-control" name="tx_scheduler[documentsToIndexLimit]" value="' . htmlspecialchars((string)$taskInfo['documentsToIndexLimit']) . '" />',
'label' => 'LLL:EXT:solr/Resources/Private/Language/locallang.xlf:indexqueueworker_field_documentsToIndexLimit',
'cshKey' => '',
'cshLabel' => '',
];

$additionalFields['forcedWebRoot'] = [
'code' => '<input type="text" class="form-control" name="tx_scheduler[forcedWebRoot]" value="' . htmlspecialchars($taskInfo['forcedWebRoot']) . '" />',
'label' => 'LLL:EXT:solr/Resources/Private/Language/locallang.xlf:indexqueueworker_field_forcedWebRoot',
'cshKey' => '',
'cshLabel' => '',
];

return $additionalFields;
Expand Down
4 changes: 0 additions & 4 deletions Classes/Task/OptimizeIndexTaskAdditionalFieldProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions Classes/Task/ReIndexTaskAdditionalFieldProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 0 additions & 12 deletions Resources/Private/Language/de.locallang_csh_pages.xlf

This file was deleted.

11 changes: 0 additions & 11 deletions Resources/Private/Language/locallang_csh_pages.xlf

This file was deleted.

16 changes: 0 additions & 16 deletions ext_tables.php
Original file line number Diff line number Diff line change
@@ -1,25 +1,9 @@
<?php

use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Core\Http\ApplicationType;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;

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
Expand Down

0 comments on commit 90fa1a9

Please sign in to comment.