From 40e2761cfa36161c28599f7edad16b3c71ad2e84 Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Fri, 6 Mar 2015 08:46:11 +0100
Subject: [PATCH] [BUGFIX] Fix broken scheduler tasks
Fix two broken tasks in the scheduler:
"Remove deleted records" from EXT:recycler refers to the right xlf now.
"System Status Update" belongs to EXT:reports again
Resolves: #65558
Releases: master
Change-Id: I50319632f1a26cd48f36b1ec872d8cf04da8992b
Reviewed-on: http://review.typo3.org/37583
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../recycler/Classes/Task/CleanerFieldProvider.php | 10 +++++-----
typo3/sysext/recycler/ext_localconf.php | 6 +++---
typo3/sysext/reports/ext_localconf.php | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php b/typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php
index eeef26cbf0fb..3f037255cec7 100644
--- a/typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php
+++ b/typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php
@@ -42,14 +42,14 @@ class CleanerFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProvid
$additionalFields['period'] = array(
'code' => '<input type="text" class="form-control" name="tx_scheduler[RecyclerCleanerPeriod]" value="' . $taskInfo['RecyclerCleanerPeriod'] . '">',
- 'label' => 'LLL:EXT:recycler/locallang_tasks.xlf:cleanerTaskPeriod',
+ 'label' => 'LLL:EXT:recycler/Resources/Private/Language/locallang_tasks.xlf:cleanerTaskPeriod',
'cshKey' => '',
'cshLabel' => 'task_recyclerCleaner_selectedPeriod'
);
$additionalFields['tca'] = array(
'code' => $this->getTcaSelectHtml($taskInfo['RecyclerCleanerTCA']),
- 'label' => 'LLL:EXT:recycler/locallang_tasks.xlf:cleanerTaskTCA',
+ 'label' => 'LLL:EXT:recycler/Resources/Private/Language/locallang_tasks.xlf:cleanerTaskTCA',
'cshKey' => '',
'cshLabel' => 'task_recyclerCleaner_selectedTables'
);
@@ -122,7 +122,7 @@ class CleanerFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProvid
$validTca = TRUE;
} else {
$schedulerModule->addMessage(
- $this->getLanguageService()->sL('LLL:EXT:recycler/locallang_tasks.xlf:cleanerTaskErrorTCAempty', TRUE),
+ $this->getLanguageService()->sL('LLL:EXT:recycler/Resources/Private/Language/locallang_tasks.xlf:cleanerTaskErrorTCAempty', TRUE),
FlashMessage::ERROR
);
$validTca = FALSE;
@@ -144,7 +144,7 @@ class CleanerFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProvid
if (!isset($GLOBALS['TCA'][$tcaTable])) {
$checkTca = FALSE;
$schedulerModule->addMessage(
- sprintf($this->getLanguageService()->sL('LLL:EXT:recycler/locallang_tasks.xlf:cleanerTaskErrorTCANotSet', TRUE), $tcaTable),
+ sprintf($this->getLanguageService()->sL('LLL:EXT:recycler/Resources/Private/Language/locallang_tasks.xlf:cleanerTaskErrorTCANotSet', TRUE), $tcaTable),
FlashMessage::ERROR
);
break;
@@ -168,7 +168,7 @@ class CleanerFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProvid
$validPeriod = TRUE;
} else {
$schedulerModule->addMessage(
- $this->getLanguageService()->sL('LLL:EXT:recycler/locallang_tasks.xlf:cleanerTaskErrorPeriod', TRUE),
+ $this->getLanguageService()->sL('LLL:EXT:recycler/Resources/Private/Language/locallang_tasks.xlf:cleanerTaskErrorPeriod', TRUE),
FlashMessage::ERROR
);
$validPeriod = FALSE;
diff --git a/typo3/sysext/recycler/ext_localconf.php b/typo3/sysext/recycler/ext_localconf.php
index 3fcbcc7d6aae..18ac04f82577 100644
--- a/typo3/sysext/recycler/ext_localconf.php
+++ b/typo3/sysext/recycler/ext_localconf.php
@@ -7,8 +7,8 @@ if (TYPO3_MODE === 'BE') {
$GLOBALS['TYPO3_CONF_VARS']['BE']['AJAX']['RecyclerAjaxController::init'] = \TYPO3\CMS\Recycler\Task\CleanerTask::class . '->init';
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\TYPO3\CMS\Recycler\Task\CleanerTask::class] = array(
- 'extension' => $_EXTKEY,
- 'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang_tasks.xlf:cleanerTaskTitle',
- 'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang_tasks.xlf:cleanerTaskDescription',
+ 'extension' => 'recycler',
+ 'title' => 'LLL:EXT:recycler/Resources/Private/Language/locallang_tasks.xlf:cleanerTaskTitle',
+ 'description' => 'LLL:EXT:recycler/Resources/Private/Language/locallang_tasks.xlf:cleanerTaskDescription',
'additionalFields' => \TYPO3\CMS\Recycler\Task\CleanerFieldProvider::class
);
\ No newline at end of file
diff --git a/typo3/sysext/reports/ext_localconf.php b/typo3/sysext/reports/ext_localconf.php
index 40bcdb3c137a..9ea4cc239b1c 100644
--- a/typo3/sysext/reports/ext_localconf.php
+++ b/typo3/sysext/reports/ext_localconf.php
@@ -2,9 +2,9 @@
defined('TYPO3_MODE') or die();
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\TYPO3\CMS\Reports\Task\SystemStatusUpdateTask::class] = array(
- 'extension' => 'recycler',
- 'title' => 'LLL:EXT:recycler/reports/locallang.xlf:status_updateTaskTitle',
- 'description' => 'LLL:EXT:recycler/reports/locallang.xlf:status_updateTaskDescription',
+ 'extension' => 'reports',
+ 'title' => 'LLL:EXT:reports/reports/locallang.xlf:status_updateTaskTitle',
+ 'description' => 'LLL:EXT:reports/reports/locallang.xlf:status_updateTaskDescription',
'additionalFields' => \TYPO3\CMS\Reports\Task\SystemStatusUpdateTaskNotificationEmailField::class
);
--
GitLab