#8990: Labels 'TEMP' and 'RECYCLER' are hardcoded (thanx to Stefano Kowalke)
authorMartin Kutschker <martin.t.kutschker@blackbox.net>
Wed, 30 Jul 2008 20:17:33 +0000 (20:17 +0000)
committerMartin Kutschker <martin.t.kutschker@blackbox.net>
Wed, 30 Jul 2008 20:17:33 +0000 (20:17 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3924 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/class.file_list.inc
typo3/sysext/lang/locallang_mod_file_list.xml

index c7c401c..09ecd33 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 
        * Fixed bug #5387: Creation of multiple folders in filelist module results in blank page (thanx to Christian Kuhn and Christopher Hlubek)
        * Fixed bug #9026: Label 'Sort alphabetically:' is hardcoded (thanx to Stefano Kowalke)
+       * Fixed bug #8990: Labels 'TEMP' and 'RECYCLER' are hardcoded (thanx to Stefano Kowalke)
 
 2008-07-25  Benjamin Mack  <benni@typo3.org>
 
index 0494001..c1eea10 100755 (executable)
@@ -419,22 +419,22 @@ class fileList extends t3lib_recordList {
         * @return      array           (title, icon, path)
         */
        function dirData($theFile)      {
-               $path = $theFile['path'].$theFile['file'].'/';
-               $webpath=t3lib_BEfunc::getPathType_web_nonweb($path);
+               $path = $theFile['path'] . $theFile['file'] . '/';
+               $webpath = t3lib_BEfunc::getPathType_web_nonweb($path);
 
-               $title=htmlspecialchars($theFile['file']);
-               $icon = 'gfx/i/_icon_'.$webpath.'folders.gif';
-               if ($title=='_temp_')   {
+               $title = htmlspecialchars($theFile['file']);
+               $icon = 'gfx/i/_icon_' . $webpath . 'folders.gif';
+               if ($title == '_temp_') {
                        $icon = 'gfx/i/sysf.gif';
-                       $title='<b>TEMP</b>';
+                       $title = '<strong>' . $GLOBALS['LANG']->getLL('temp', true) . '</strong>';
                }
-               if ($title=='_recycler_')       {
+               if ($title == '_recycler_')     {
                        $icon = 'gfx/i/recycler.gif';
-                       $title='<b>RECYCLER</b>';
+                       $title = '<strong>' . $GLOBALS['LANG']->getLL('recycler', true) . '</strong>';
                }
-               $icon = $theFile['writable'] ? 'gfx/i/_icon_'.$webpath.'folders_ro.gif' : $icon;
+               $icon = $theFile['writable'] ? 'gfx/i/_icon_' . $webpath . 'folders_ro.gif' : $icon;
 
-               return Array($title,$icon,$path);
+               return array($title, $icon, $path);
        }
 
        /**
index b574c91..9b40bb2 100755 (executable)
@@ -21,6 +21,8 @@
                        <label index="c_rw">RW</label>
                        <label index="c__REF_">Ref</label>                      
                        <label index="files">files</label>
+                       <label index="temp">Temporary files</label>
+                       <label index="recycler">Recycler</label>        
                        <label index="mlang_labels_tablabel">Listing of files in the directory</label>
                        <label index="mlang_labels_tabdescr">This is the file administration system in TYPO3. It allows you to access the file mounts of your login. Through this module you can upload, copy, move an delete files on the server.</label>
                        <label index="mlang_tabs_tab">Filelist</label>