[TASK] Unify levels-dropdowns and their language-labels 64/42364/4
authorStefan Neufeind <typo3.neufeind@speedpartner.de>
Fri, 7 Aug 2015 11:19:09 +0000 (13:19 +0200)
committerFrank Nägler <frank.naegler@typo3.org>
Sat, 8 Aug 2015 13:22:27 +0000 (15:22 +0200)
Have all levels-dropdowns use the same number of levels
and use the same language-labels everywhere

Change-Id: I061ae1ade6193497f9efdab7e7e79c1c570ab5a0
Resolves: #68833
Releases: master
Reviewed-on: http://review.typo3.org/42364
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
typo3/sysext/belog/Classes/Controller/AbstractController.php
typo3/sysext/frontend/Classes/Controller/PageInformationController.php
typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/impexp/Resources/Private/Language/locallang.xlf
typo3/sysext/indexed_search/Configuration/TCA/index_config.php
typo3/sysext/indexed_search/Resources/Private/Language/locallang_db.xlf
typo3/sysext/lang/locallang_mod_web_info.xlf
typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php

index 3a51deb..8d7d982 100644 (file)
@@ -282,10 +282,12 @@ abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\Acti
         */
        protected function createPageDepthOptions() {
                $options = array(
-                       0 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_mod_web_info.xlf:depth_0', 'lang'),
-                       1 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_mod_web_info.xlf:depth_1', 'lang'),
-                       2 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_mod_web_info.xlf:depth_2', 'lang'),
-                       3 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_mod_web_info.xlf:depth_3', 'lang')
+                       0 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_0', 'lang'),
+                       1 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_1', 'lang'),
+                       2 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_2', 'lang'),
+                       3 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_3', 'lang'),
+                       4 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_4', 'lang'),
+                       999 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi', 'lang')
                );
                return $options;
        }
index 430e087..e935b32 100644 (file)
@@ -36,10 +36,11 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti
                                1 => $GLOBALS['LANG']->sL('LLL:EXT:frontend/Resources/Private/Language/locallang_webinfo.xlf:pages_1')
                        ),
                        'depth' => array(
-                               0 => $GLOBALS['LANG']->getLL('depth_0'),
-                               1 => $GLOBALS['LANG']->getLL('depth_1'),
-                               2 => $GLOBALS['LANG']->getLL('depth_2'),
-                               3 => $GLOBALS['LANG']->getLL('depth_3'),
+                               0 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
+                               1 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
+                               2 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
+                               3 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
+                               4 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
                                999 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
                        )
                );
index f009e1e..c8cec6c 100644 (file)
@@ -48,10 +48,11 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                $lang = $this->getLanguageService();
                $menuArray = array(
                        'depth' => array(
-                               0 => $lang->getLL('depth_0'),
-                               1 => $lang->getLL('depth_1'),
-                               2 => $lang->getLL('depth_2'),
-                               3 => $lang->getLL('depth_3'),
+                               0 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
+                               1 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
+                               2 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
+                               3 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
+                               4 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
                                999 => $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
                        )
                );
index 35a8249..1b87022 100644 (file)
@@ -535,12 +535,12 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                        $opt = array(
                                '-2' => $this->lang->getLL('makeconfig_tablesOnThisPage'),
                                '-1' => $this->lang->getLL('makeconfig_expandedTree'),
-                               '0' => $this->lang->getLL('makeconfig_onlyThisPage'),
-                               '1' => $this->lang->getLL('makeconfig_1Level'),
-                               '2' => $this->lang->getLL('makeconfig_2Levels'),
-                               '3' => $this->lang->getLL('makeconfig_3Levels'),
-                               '4' => $this->lang->getLL('makeconfig_4Levels'),
-                               '999' => $this->lang->getLL('makeconfig_infinite')
+                               '0' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
+                               '1' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
+                               '2' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
+                               '3' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
+                               '4' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
+                               '999' => $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi'),
                        );
                        $row[] = '
                                <tr class="bgColor4">
index 8e3b434..743157a 100644 (file)
                        <trans-unit id="makeconfig_expandedTree">
                                <source>Expanded tree</source>
                        </trans-unit>
-                       <trans-unit id="makeconfig_onlyThisPage">
-                               <source>Only this page</source>
-                       </trans-unit>
-                       <trans-unit id="makeconfig_1Level">
-                               <source>1 level</source>
-                       </trans-unit>
-                       <trans-unit id="makeconfig_2Levels">
-                               <source>2 levels</source>
-                       </trans-unit>
-                       <trans-unit id="makeconfig_3Levels">
-                               <source>3 levels</source>
-                       </trans-unit>
-                       <trans-unit id="makeconfig_4Levels">
-                               <source>4 levels</source>
-                       </trans-unit>
-                       <trans-unit id="makeconfig_infinite">
-                               <source>Infinite</source>
-                       </trans-unit>
                        <trans-unit id="makeconfig_levels">
                                <source>Levels:</source>
                        </trans-unit>
index a9b31bf..43e4762 100644 (file)
@@ -74,10 +74,11 @@ return array(
                        'config' => array(
                                'type' => 'select',
                                'items' => array(
-                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.depth.I.0', '0'),
-                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.depth.I.1', '1'),
-                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.depth.I.2', '2'),
-                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.depth.I.3', '3')
+                                       array('LLL:EXT:lang/locallang_core.xlf:labels.depth_0', '0'),
+                                       array('LLL:EXT:lang/locallang_core.xlf:labels.depth_1', '1'),
+                                       array('LLL:EXT:lang/locallang_core.xlf:labels.depth_2', '2'),
+                                       array('LLL:EXT:lang/locallang_core.xlf:labels.depth_3', '3'),
+                                       array('LLL:EXT:lang/locallang_core.xlf:labels.depth_4', '4')
                                ),
                                'size' => 1,
                                'maxitems' => 1
index 7ed5237..c0b8177 100644 (file)
                        <trans-unit id="index_config.type">
                                <source>Type:</source>
                        </trans-unit>
-                       <trans-unit id="index_config.depth.I.0">
-                               <source>Single page</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.depth.I.1">
-                               <source>1 Level</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.depth.I.2">
-                               <source>2 Levels</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.depth.I.3">
-                               <source>3 Levels</source>
-                       </trans-unit>
                        <trans-unit id="index_config.depth">
                                <source>Depth:</source>
                        </trans-unit>
index 6c0cca6..48dcad4 100644 (file)
@@ -6,18 +6,6 @@
                        <trans-unit id="title">
                                <source>Page information</source>
                        </trans-unit>
-                       <trans-unit id="depth_0">
-                               <source>This page</source>
-                       </trans-unit>
-                       <trans-unit id="depth_1">
-                               <source>1 level</source>
-                       </trans-unit>
-                       <trans-unit id="depth_2">
-                               <source>2 levels</source>
-                       </trans-unit>
-                       <trans-unit id="depth_3">
-                               <source>3 levels</source>
-                       </trans-unit>
                        <trans-unit id="mlang_labels_tablabel">
                                <source>Page related information, eg. hit statistics, change log, record counts</source>
                        </trans-unit>
index 4b468ab..7083977 100644 (file)
@@ -331,6 +331,7 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
                        1 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
                        2 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
                        3 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
+                       4 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_4'),
                        999 => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
                );
                foreach ($availableOptions as $optionValue => $optionLabel) {