Fixed bug #9859: Upload files in fileadmin: Singular and plural are the same ("files")

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

diff --git a/ChangeLog b/ChangeLog
index ca660a4..11c3762 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Fixed bug #9645: Memcached backend is not working properly
        * Fixed bug #9790: class.gzip_encode.php fails with     open_basedir restrictions
+       * Fixed bug #9859: Upload files in fileadmin: Singular and plural are the same ("files")
 
 2008-12-01  Steffen Kamper  <info@sk-typo3.de>
 

diff --git a/typo3/file_upload.php b/typo3/file_upload.php
index e6545e8..01585e0 100755 (executable)
--- a/typo3/file_upload.php
+++ b/typo3/file_upload.php
@@ -213,10 +213,14 @@ class SC_file_upload {
                $this->number = t3lib_div::intInRange($this->number,1,10);
                $code .= '
                        <div id="c-select">
+                               <label for="number">' .
+                               $LANG->sL('LLL:EXT:lang/locallang_core.php:file_upload.php.number_of_files') .
+                               '</label>
                                <select name="number" onchange="reload(this.options[this.selectedIndex].value);">';
                for ($a=1;$a<=$this->uploadNumber;$a++) {
-                       $code.='
-                                       <option value="'.$a.'"'.($this->number==$a?' selected="selected"':'').'>'.$a.' '.$LANG->sL('LLL:EXT:lang/locallang_core.php:file_upload.php.files',1).'</option>';
+                       $code.='<option value="' . $a . '"' .
+                                               ($this->number == $a ? ' selected="selected"' : '' ) .
+                                               '>' . $a . '</option>';
                }
                $code.='
                                </select>

diff --git a/typo3/sysext/lang/locallang_core.xml b/typo3/sysext/lang/locallang_core.xml
index 5ef27d3..b891190 100755 (executable)
--- a/typo3/sysext/lang/locallang_core.xml
+++ b/typo3/sysext/lang/locallang_core.xml
@@ -128,6 +128,7 @@ Do you want to continue WITHOUT saving?</label>
                        <label index="file_upload.php.pagetitle">Upload files</label>
                        <label index="file_upload.php.submit">Upload files</label>
                        <label index="file_upload.php.files">files</label>
+                       <label index="file_upload.php.number_of_files">Number of files:</label>
                        <label index="file_rename.php.pagetitle">Rename</label>
                        <label index="file_rename.php.submit">Rename</label>
                        <label index="file_edit.php.pagetitle">Edit</label>