Fixed bug #9860: Fileadmin: New folders: Singular and plural are the same ("folders")
authorDmitry Dulepov <dmitry.dulepov@gmail.com>
Mon, 1 Dec 2008 20:23:54 +0000 (20:23 +0000)
committerDmitry Dulepov <dmitry.dulepov@gmail.com>
Mon, 1 Dec 2008 20:23:54 +0000 (20:23 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4519 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/file_newfolder.php
typo3/sysext/lang/locallang_core.xml

index 11c3762..79549b5 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@
 
        * 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")
+       * Fixed bug #9859: Upload files in fileadmin: Singular and plural are the same ("files") (co-authored with Stefano Kowalke)
+       * Fixed bug #9860: Fileadmin: New folders: Singular and plural are the same ("folders") (co-authored with Stefano Kowalke)
 
 2008-12-01  Steffen Kamper  <info@sk-typo3.de>
 
index 4a63921..99e32e5 100755 (executable)
@@ -202,10 +202,14 @@ class SC_file_newfolder {
                $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_newfolder.php.number_of_folders') .
+                               '</label>
                                <select name="number" onchange="reload(this.options[this.selectedIndex].value);">';
                for ($a=1;$a<=$this->folderNumber;$a++) {
-                       $code.='
-                                       <option value="'.$a.'"'.($this->number==$a?' selected="selected"':'').'>'.$a.' '.$LANG->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.folders',1).'</option>';
+                       $code .= '<option value="' . $a . '"' .
+                                       ($this->number == $a ? ' selected="selected"' : '') .
+                                       '>' . $a . '</option>';
                }
                $code.='
                                </select>
index b891190..e9f8338 100755 (executable)
@@ -140,6 +140,7 @@ Do you want to continue WITHOUT saving?</label>
                        <label index="file_newfolder.php.folders">folders</label>
                        <label index="file_newfolder.php.newfile_submit">Create file</label>
                        <label index="file_newfolder.php.newfile">Create new textfile</label>
+                       <label index="file_newfolder.php.number_of_folders">Number of folders:</label>
                        <label index="file_clipupload.php.warning_head">Upload path error</label>
                        <label index="file_clipupload.php.warning">No upload-folder is found. You should create a TEMP-folder (&quot;_temp_&quot;) in the root of one of your mounts first!</label>
                        <label index="mess.redraw">Redrawing the page will discard the current data. Do you want to continue?</label>