[BUGFIX] Fix broken scheduler tasks 83/37583/3
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Fri, 6 Mar 2015 07:46:11 +0000 (08:46 +0100)
committerWouter Wolters <typo3@wouterwolters.nl>
Fri, 6 Mar 2015 11:54:31 +0000 (12:54 +0100)
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>
typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php
typo3/sysext/recycler/ext_localconf.php
typo3/sysext/reports/ext_localconf.php

index eeef26c..3f03725 100644 (file)
@@ -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;
index 3fcbcc7..18ac04f 100644 (file)
@@ -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
index 40bcdb3..9ea4cc2 100644 (file)
@@ -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
 );