Follow Up for #8270: fixed some naming and CGL issues
authorIngo Renner <ingo.renner@typo3.org>
Mon, 2 Jun 2008 10:05:05 +0000 (10:05 +0000)
committerIngo Renner <ingo.renner@typo3.org>
Mon, 2 Jun 2008 10:05:05 +0000 (10:05 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3748 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/classes/class.backendsearchmenu.php
typo3/classes/class.clearcachemenu.php
typo3/classes/class.shortcutmenu.php
typo3/sysext/lang/locallang_core.xml

index fb196b2..0b2dd34 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-02  Ingo Renner  <ingo@typo3.org>
+
+       * Follow Up for #8270: fixed some naming and CGL issues
+
 2008-06-02  Ernesto Baschny  <ernst@cron-it.de>
 
        * Fixed bug #8362: Duplicate entry for [tstamp] and [crdate] in Web->List module for single table in selector-box (thanks to Steffen Kamper)
index e24b199..ddbb390 100644 (file)
@@ -69,7 +69,7 @@ class BackendSearchMenu implements backend_toolbarItem {
         * @return      string          workspace selector as HTML select
         */
        public function render() {
-               $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.search',1);
+               $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.search', true);
                $this->addJavascriptToBackend();
                $searchMenu = array();
 
index db22c12..22670b5 100644 (file)
@@ -57,7 +57,7 @@ class ClearCacheMenu implements backend_toolbarItem {
 
                        // Clear cache for ALL tables!
                if($GLOBALS['BE_USER']->isAdmin() || $GLOBALS['BE_USER']->getTSConfigVal('options.clearCache.all')) {
-                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:rm.clearCacheMenu_all',1);
+                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:rm.clearCacheMenu_all', true);
                        $this->cacheActions[] = array(
                                'id'    => 'all',
                                'title' => $title,
@@ -68,7 +68,7 @@ class ClearCacheMenu implements backend_toolbarItem {
 
                        // Clear cache for either ALL pages
                if($GLOBALS['BE_USER']->isAdmin() || $GLOBALS['BE_USER']->getTSConfigVal('options.clearCache.pages')) {
-                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:rm.clearCacheMenu_pages',1);
+                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:rm.clearCacheMenu_pages', true);
                        $this->cacheActions[] = array(
                                'id'    => 'pages',
                                'title' => $title,
@@ -79,7 +79,7 @@ class ClearCacheMenu implements backend_toolbarItem {
 
                        // Clearing of cache-files in typo3conf/ + menu
                if($GLOBALS['BE_USER']->isAdmin() && $GLOBALS['TYPO3_CONF_VARS']['EXT']['extCache']) {
-                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:rm.clearCacheMenu_allTypo3Conf',1);
+                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:rm.clearCacheMenu_allTypo3Conf', true);
                        $this->cacheActions[] = array(
                                'id'    => 'temp_CACHED',
                                'title' => $title,
@@ -109,7 +109,7 @@ class ClearCacheMenu implements backend_toolbarItem {
         * @return      string          workspace selector as HTML select
         */
        public function render() {
-               $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:rm.clearCache_clearCache',1);
+               $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:rm.clearCache_clearCache', true);
                $this->addJavascriptToBackend();
                $cacheMenu = array();
 
index cd56b0f..22869bd 100644 (file)
@@ -114,7 +114,7 @@ class ShortcutMenu implements backend_toolbarItem {
         * @return      string          workspace selector as HTML select
         */
        public function render() {
-               $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.shortcut',1);
+               $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcuts', true);
                $this->addJavascriptToBackend();
 
                $shortcutMenu = array();
@@ -134,10 +134,10 @@ class ShortcutMenu implements backend_toolbarItem {
         */
        public function renderMenu() {
 
-               $shortcutGroup  = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.shortcutGroup',1);
-               $shortcutEdit   = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.shortcutEdit',1);
-               $shortcutDelete = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.shortcutDelete',1);
-                               
+               $shortcutGroup  = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcutsGroup', true);
+               $shortcutEdit   = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcutsEdit', true);
+               $shortcutDelete = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcutsDelete', true);
+
                $groupIcon  = '<img'.t3lib_iconWorks::skinImg($this->backPath, 'gfx/i/sysf.gif', 'width="18" height="16"').' title="'.$shortcutGroup.'" alt="'.$shortcutGroup.'" />';
                $editIcon   = '<img'.t3lib_iconWorks::skinImg($this->backPath, 'gfx/edit2.gif', 'width="11" height="12"').' title="'.$shortcutEdit.'" alt="'.$shortcutEdit.'"';
                $deleteIcon = '<img'.t3lib_iconWorks::skinImg($this->backPath, 'gfx/garbage.gif', 'width="11" height="12"').' title="'.$shortcutDelete.'" alt="'.$shortcutDelete.'" />';
@@ -197,7 +197,7 @@ class ShortcutMenu implements backend_toolbarItem {
 
                if(count($shortcutMenu) == 1) {
                                //no shortcuts added yet, show a small help message how to add shortcuts
-                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.shortcut',1);
+                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:toolbarItems.shortcuts', true);
                        $icon  = '<img'.t3lib_iconWorks::skinImg($backPath,'gfx/shortcut.gif','width="14" height="14"').' title="'.$title.'" alt="'.$title.'" />';
                        $label = str_replace('%icon%', $icon, $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.php:shortcutDescription'));
 
index 8be6eae..9c84694 100755 (executable)
@@ -28,10 +28,6 @@ Do you want to continue WITHOUT saving?</label>
                        <label index="labels._CONTROL_">Control</label>
                        <label index="labels._PATH_">Path</label>
                        <label index="labels._LOCALIZATION_">Localization</label>
-                       <label index="labels.shortcut">Shortcut</label>         
-                       <label index="labels.shortcutGroup">Shortcut Group</label>      
-                       <label index="labels.shortcutEdit">Edit Shortcut</label>        
-                       <label index="labels.shortcutDelete">Delete Shortcut</label>            
                        <label index="labels.setFields">Set fields</label>
                        <label index="labels.search">Search</label>
                        <label index="labels.author">Author:</label>
@@ -202,6 +198,11 @@ Would you like to save now in order to refresh the display?</label>
                        <label index="warning.install_encryption">The encryption key is not set. Set it in the %sBasic Configuration section%s of the Install Tool.</label>
                        <label index="warning.install_update">This installation is not configured for the TYPO3 version it is running. If you did so intentionally, this message can be safely ignored. If you are unsure, visit the %sUpdate Wizard%s section of the Install Tool to see how TYPO3 would change.</label>
                        <label index="warning.backend_reference">The Reference Index table is empty which is likely the result of a recent TYPO3 upgrade. Please go to %sTools&gt;DB Check%s and update the reference index.</label>
+                       <label index="toolbarItems.shortcuts">Shortcuts</label>
+                       <label index="toolbarItems.shortcutsGroup">Shortcut Group</label>
+                       <label index="toolbarItems.shortcutsEdit">Edit Shortcut</label>
+                       <label index="toolbarItems.shortcutsDelete">Delete Shortcut</label>
+                       <label index="toolbarItems.search">Search</label>
                </languageKey>
        </data>
 </T3locallang>