The branch, master has been updated
       via  0a782293e698b2fb31043b90b76bc4714598ffb6 (commit)
      from  7a3c021e854fe81494a08a9b449d8dd8db9bb919 (commit)


- Log -----------------------------------------------------------------
commit 0a782293e698b2fb31043b90b76bc4714598ffb6
Author: Michal Čihař <[email protected]>
Date:   Thu Jul 21 11:59:47 2011 +0200

    Proper internationalised messages

-----------------------------------------------------------------------

Summary of changes:
 libraries/File.class.php |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/File.class.php b/libraries/File.class.php
index 553cc2d..8ae0262 100644
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@@ -8,7 +8,6 @@
 
 /**
  *
- * @todo replace error messages with localized string
  * @todo when uploading a file into a blob field, should we also consider using
  *       chunks like in import? UPDATE `table` SET `field` = `field` + [chunk]
  * @package phpMyAdmin
@@ -258,7 +257,7 @@ class PMA_File
             }
 
             if (! $bs_db || ! $bs_table) {
-                $this->_error_message = $GLOBALS['strUploadErrorUnknown'];
+                $this->_error_message = __('Unknown error while uploading.');
                 return false;
             }
             $blob_url =  PMA_BS_UpLoadFile($bs_db, $bs_table, $tmp_file_type, 
$tmp_filename);
@@ -388,7 +387,7 @@ class PMA_File
                 }
 
                 if (! $bs_db || !$bs_table) {
-                    $this->_error_message = $GLOBALS['strUploadErrorUnknown'];
+                    $this->_error_message = __('Unknown error while 
uploading.');
                     return false;
                 }
                 $blob_url = PMA_BS_UpLoadFile($bs_db, $bs_table, 
$tmp_file_type, $tmp_filename);


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

Reply via email to