Fixed bug #8505: String File/Files in Fileadmin are hardcoded (thanks to Stefano...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4349 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index b2c60b6..d5f8503 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-10-22  Jeff Segars  <jeff@webempoweredchurch.org>
 
        * Fixed bug #8636: Hardcoded labels in Configuration module (thanks to Christopher Stelmaszyk)
+       * Fixed bug #8505: String "File/Files" in Fileadmin are hardcoded (thanks to Stefano Kowalke)
 
 2008-10-22  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/class.file_list.inc b/typo3/class.file_list.inc
index dbe5798..0b4e502 100755 (executable)
--- a/typo3/class.file_list.inc
+++ b/typo3/class.file_list.inc
@@ -125,6 +125,7 @@ class fileList extends t3lib_recordList {
                if (!$GLOBALS['TYPO3_CONF_VARS']['GFX']['thumbnails'])  {
                        $this->thumbScript='gfx/notfound_thumb.gif';
                }
+               $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_common.xml');
        }
 
        /**
@@ -295,11 +296,11 @@ class fileList extends t3lib_recordList {
         **/
        function getFolderInfo() {
                if($this->counter == 1) {
-                       $fileLabel = 'File';
+                       $fileLabel = $GLOBALS['LANG']->getLL('file', true);
                } else {
-                       $fileLabel = 'Files';
+                       $fileLabel = $GLOBALS['LANG']->getLL('files', true);
                }
-               return $this->counter.' '.$fileLabel.', '.t3lib_div::formatSize($this->totalbytes).'bytes';
+               return $this->counter . ' ' . $fileLabel . ', ' . t3lib_div::formatSize($this->totalbytes, $GLOBALS['LANG']->getLL('byteSizeUnits', true));
        }
 
        /**

diff --git a/typo3/sysext/lang/locallang_common.xml b/typo3/sysext/lang/locallang_common.xml
index c6a7f20..a577cfc 100644 (file)
--- a/typo3/sysext/lang/locallang_common.xml
+++ b/typo3/sysext/lang/locallang_common.xml
@@ -9,6 +9,7 @@
                        <label index="about">About</label>
                        <label index="ascending">Ascending</label>
                        <label index="back">Back</label>
+                       <label index="byteSizeUnits"> B| KB| MB| GB</label>
                        <label index="cancel">Cancel</label>
                        <label index="category">Category</label>
                        <label index="close">Close</label>