i18n for no server message

diff --git a/lang/english.php b/lang/english.php
index 8c1a56377b1a21db47b5c79c69d0e334b0d288fd..c30362e6a6b5004f101fe2d7564adb947990b266 100755 (executable)
--- a/lang/english.php
+++ b/lang/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.210 2007/05/14 17:59:32 soranzo Exp $
+        * $Id: english.php,v 1.211 2007/07/18 20:54:34 xzilla Exp $
         */
 
        // Language and character set
@@ -169,6 +169,7 @@
        $lang['strimporterrorline-badcolumnnum'] = 'Import error on line %s: Line does not possess the correct number of columns.';
        $lang['strimporterror-uploadedfile'] = 'Import error: File could not be uploaded to the server';
        $lang['strcannotdumponwindows'] = 'Dumping of complex table and schema names on Windows is not supported.';
+       $lang['strnoserversupplied'] = 'No server supplied!';
 
        // Tables
        $lang['strtable'] = 'Table';

diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index f5bacc5f2fb011d7992a5a2d5e51dce903ba6d87..16bd968e08f08571cd9f4758713db86215eb4901 100644 (file)
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.162 2007/05/14 17:59:32 soranzo Exp $
+        * $Id: english.php,v 1.163 2007/07/18 20:54:34 xzilla Exp $
         */
 
        // Language and character set
@@ -169,6 +169,7 @@
        $lang['strimporterrorline-badcolumnnum'] = 'Import error on line %s: Line does not possess the correct number of columns.';
        $lang['strimporterror-uploadedfile'] = 'Import error: File could not be uploaded to the server';
        $lang['strcannotdumponwindows'] = 'Dumping of complex table and schema names on Windows is not supported.';
+       $lang['strnoserversupplied'] = 'No server supplied!';
 
        // Tables
        $lang['strtable'] = 'Table';

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index 5d90cab62c1d944ebcc215f9b90f829052b9dfa1..d8416c074e420d07bceb39fb38f34f4e4bc968d6 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.118 2007/07/12 19:26:23 xzilla Exp $
+        * $Id: lib.inc.php,v 1.119 2007/07/18 20:54:34 xzilla Exp $
         */
 
        include_once('./libraries/decorator.inc.php');
@@ -152,9 +152,9 @@
        // Create data accessor object, if necessary
        if (!isset($_no_db_connection)) {
                if (!isset($_REQUEST['server'])) {
-                       die('No server supplied!');
-                       # TODO: nice error
-               }
+                        echo $lang['strnoserversupplied'];
+                        exit;
+               }
                $_server_info = $misc->getServerInfo();
 
                // Redirect to the login form if not logged in