Fixed bug #15049: "Fileextension" is not an English word
authorDmitry Dulepov <dmitry.dulepov@gmail.com>
Thu, 8 Jul 2010 15:05:30 +0000 (15:05 +0000)
committerDmitry Dulepov <dmitry.dulepov@gmail.com>
Thu, 8 Jul 2010 15:05:30 +0000 (15:05 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8134 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_extfilefunc.php
t3lib/class.t3lib_tcemain.php
typo3/sysext/belog/mod/locallang.xml

index 873ad56..c1eee97 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-08  Dmitry Dulepov  <dmitry@typo3.org>
+
+       * Fixed bug #15049: "Fileextension" is not an English word
+
 2010-07-08  Francois Suter  <francois@typo3.org>
 
        * Code cleanup #15036: Indexed search: Remove indexer CLI script which does nothing
@@ -66,7 +70,7 @@
 
 2010-06-29  Ernesto Baschny  <ernst@cron-it.de>
 
-       * Fixed bug #14810: Follow-up to bug #13670: Export module does not keep pagetree configuration (exports only the page tree) (Thanks to Thomas Juhnke) 
+       * Fixed bug #14810: Follow-up to bug #13670: Export module does not keep pagetree configuration (exports only the page tree) (Thanks to Thomas Juhnke)
 
 2010-06-29  Stanislas Rolland  <typo3@sjbr.ca>
 
@@ -75,7 +79,7 @@
 2010-06-29  Steffen Kamper  <info@sk-typo3.de>
 
        * Follow-up to #14553: topFrameH configuration option doesn't work anymore
-       
+
 2010-06-28  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #14830: htmlArea RTE: Entering line breaks with Safari not possible
 
 2010-06-20  Susanne Moog  <typo3@susanne-moog.de>
 
-       * Followup to #14636: Improvements to new Backend skin - Install tool login shadow fixed 
+       * Followup to #14636: Improvements to new Backend skin - Install tool login shadow fixed
        * Fixed bug #14516: Strip background gradients - smaller image size and no wrong colors in browsers with color profile capability (Thanks to Helmut Hummel)
        * Followup to #14465: Make use of the new Sprite API - help in backend access lists (Thanks to Steffen Ritter)
        * Followup to #14465: Make use of the new Sprite API - delete icon in QuickEdit (Thanks to Steffen Gebert)
index 35d7fe1..6123cb8 100644 (file)
@@ -735,7 +735,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                                                        $this->writelog(8,0,1,'File created: "%s"',Array($fI['file']));
                                                                                        return $theNewFile;
                                                                                } else $this->writelog(8,1,100,'File "%s" was not created! Write-permission problem in "%s"?',Array($fI['file'], $theTarget));
-                                                                       } else $this->writelog(8,1,107,'Fileextension "%s" is not a textfile format! (%s)',Array($fI['fileext'], $extList));
+                                                                       } else $this->writelog(8,1,107,'File extension "%s" is not a textfile format! (%s)',Array($fI['fileext'], $extList));
                                                                } else $this->writelog(8,1,106,'Extension of file name "%s" was not allowed!',Array($fI['file']));
                                                        } else $this->writelog(8,1,101,'File "%s" existed already!',Array($theNewFile));
                                                } else $this->writelog(8,1,102,'Destination path "%s" was not within your mountpoints!',Array($theTarget.'/'));
@@ -770,7 +770,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                                $this->writelog(9,0,1,'File saved to "%s", bytes: %s, MD5: %s ',Array($fileInfo['file'],@filesize($theTarget),md5($content)));
                                                                return TRUE;
                                                        } else $this->writelog(9,1,100,'File "%s" was not saved! Write-permission problem in "%s"?',Array($theTarget,$fileInfo['path']));
-                                               } else $this->writelog(9,1,102,'Fileextension "%s" is not a textfile format! (%s)',Array($fI['fileext'], $extList));
+                                               } else $this->writelog(9,1,102,'File extension "%s" is not a textfile format! (%s)',Array($fI['fileext'], $extList));
                                        } else $this->writelog(9,1,103,'Extension of file name "%s" was not allowed!',Array($fI['file']));
                                } else $this->writelog(9,1,104,'You are not allowed to edit files!','');
                        } else $this->writelog(9,1,121,'Destination path "%s" was not within your mountpoints!',Array($fileInfo['path']));
@@ -844,7 +844,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                                return TRUE;
                                                        } else $this->writelog(7,1,100,'File "%s" or destination "%s" was not within your mountpoints!',Array($theFile,$theDest));
                                                } else $this->writelog(7,1,101,'You don\'t have full access to the destination directory "%s"!',Array($theDest));
-                                       } else $this->writelog(7,1,102,'Fileextension is not "zip"','');
+                                       } else $this->writelog(7,1,102,'File extension is not "zip"','');
                                } else $this->writelog(7,1,103,'You are not allowed to unzip files','');
                        } else $this->writelog(7,2,104,'Destination "%s" was not a directory',Array($cmds['target']));
                } else $this->writelog(7,2,105,'The file "%s" did not exist!',Array($theFile));
index 56dbef0..9ada91f 100644 (file)
@@ -1695,7 +1695,7 @@ class t3lib_TCEmain       {
                                                                                clearstatcache();
                                                                                if (!@is_file($theDestFile))    $this->log($table,$id,5,0,1,"Copying file '%s' failed!: The destination path (%s) may be write protected. Please make it write enabled!. (%s)",16,array($theFile, dirname($theDestFile), $recFID),$propArr['event_pid']);
                                                                        } else $this->log($table,$id,5,0,1,"Copying file '%s' failed!: No destination file (%s) possible!. (%s)",11,array($theFile, $theDestFile, $recFID),$propArr['event_pid']);
-                                                               } else $this->log($table,$id,5,0,1,"Fileextension '%s' not allowed. (%s)",12,array($fI['fileext'], $recFID),$propArr['event_pid']);
+                                                               } else $this->log($table,$id,5,0,1,"File extension '%s' not allowed. (%s)",12,array($fI['fileext'], $recFID),$propArr['event_pid']);
                                                        } else $this->log($table,$id,5,0,1,"Filesize (%s) of file '%s' exceeds limit (%s). (%s)",13,array(t3lib_div::formatSize($fileSize),$theFile,t3lib_div::formatSize($maxSize*1024),$recFID),$propArr['event_pid']);
                                                } else $this->log($table,$id,5,0,1,'The destination (%s) or the source file (%s) does not exist. (%s)',14,array($dest, $theFile, $recFID),$propArr['event_pid']);
 
@@ -1779,7 +1779,7 @@ class t3lib_TCEmain       {
                                                                                        clearstatcache();
                                                                                        if (!@is_file($theDestFile)) $this->log($table, $id, 5, 0, 1, "Copying file '%s' failed!: The destination path (%s) may be write protected. Please make it write enabled!. (%s)", 16, array($theFile, dirname($theDestFile), $recFID), $propArr['event_pid']);
                                                                                } else $this->log($table, $id, 5, 0, 1, "Copying file '%s' failed!: No destination file (%s) possible!. (%s)", 11, array($theFile, $theDestFile, $recFID), $propArr['event_pid']);
-                                                                       } else $this->log($table, $id, 5, 0, 1, "Fileextension '%s' not allowed. (%s)", 12, array($fI['fileext'], $recFID), $propArr['event_pid']);
+                                                                       } else $this->log($table, $id, 5, 0, 1, "File extension '%s' not allowed. (%s)", 12, array($fI['fileext'], $recFID), $propArr['event_pid']);
                                                                } else $this->log($table, $id, 5, 0, 1, "Filesize (%s) of file '%s' exceeds limit (%s). (%s)", 13, array(t3lib_div::formatSize($fileSize), $theFile,t3lib_div::formatSize($maxSize * 1024),$recFID), $propArr['event_pid']);
 
                                                                        // If the destination file was created, we will set the new filename in the value array, otherwise unset the entry in the value array!
index 7ca7c60..614b0de 100755 (executable)
@@ -77,8 +77,8 @@
                        <label index="msg_1_5_3">Too few items in the list of values. (%s)</label>
                        <label index="msg_1_5_10">Could not delete file '%s' (does not exist). (%s)</label>
                        <label index="msg_1_5_11">Copying file '%s' failed!: No destination file (%s) possible!. (%s)</label>
-                       <label index="msg_1_5_12">Fileextension '%s' not allowed. (%s)</label>
-                       <label index="msg_1_5_13">Filesize (%s) of file '%s' exceeds limit (%s). (%s)</label>
+                       <label index="msg_1_5_12">File extension '%s' is not allowed. (%s)</label>
+                       <label index="msg_1_5_13">File size (%s) of file '%s' exceeds limit (%s). (%s)</label>
                        <label index="msg_1_5_14">The destination (%s) or the source file (%s) does not exist. (%s)</label>
                        <label index="msg_1_5_15">Copying to file '%s' failed! (%s)</label>
                        <label index="msg_1_5_16">Copying file '%s' failed!: The destination path (%s) may be write protected. Please make it write enabled!. (%s)</label>