The branch, master has been updated
via 95465b848906e6f9c74d29ef86ae3e127ae0cc92 (commit)
via 8ccc854095bc1a1242501cd76da81e207501c8d5 (commit)
from 0a782293e698b2fb31043b90b76bc4714598ffb6 (commit)
- Log -----------------------------------------------------------------
commit 95465b848906e6f9c74d29ef86ae3e127ae0cc92
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 12:03:54 2011 +0200
We care only about PHP 5
commit 8ccc854095bc1a1242501cd76da81e207501c8d5
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 12:03:37 2011 +0200
Localize some more error messages.
-----------------------------------------------------------------------
Summary of changes:
libraries/File.class.php | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/libraries/File.class.php b/libraries/File.class.php
index 8ae0262..031a266 100644
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@@ -207,7 +207,6 @@ class PMA_File
}
/**
- * @todo replace error message with localized string
* @access public
* @param string name of file uploaded
* @return boolean success
@@ -218,7 +217,7 @@ class PMA_File
if (! $this->isUploaded()) {
$this->setName(null);
- $this->_error_message = 'not an uploaded file';
+ $this->_error_message = __('File was not an uploaded file.');
return false;
}
@@ -318,7 +317,6 @@ class PMA_File
* $file['error'] = [value]
* </code>
*
- * @todo re-check if requirements changes to PHP >= 4.2.0
* @access public
* @static
* @param array $file the array
@@ -482,7 +480,6 @@ class PMA_File
* before opening it. The FAQ 1.11 explains how to create the "./tmp"
* directory - if needed
*
- * @todo replace error message with localized string
* @todo move check of $cfg['TempDir'] into PMA_Config?
* @access public
* @return boolean whether uploaded fiel is fine or not
@@ -507,7 +504,7 @@ class PMA_File
$move_uploaded_file_result = move_uploaded_file($this->getName(),
$new_file_to_upload);
ob_end_clean();
if (! $move_uploaded_file_result) {
- $this->_error_message = 'error while moving uploaded file';
+ $this->_error_message = __('Error while moving uploaded file.');
return false;
}
@@ -515,7 +512,7 @@ class PMA_File
$this->isTemp(true);
if (! $this->isReadable()) {
- $this->_error_message = 'cannot read (moved) upload file';
+ $this->_error_message = __('Cannot read (moved) upload file.');
return false;
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
