Index: install.mysql.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.mysql.inc,v retrieving revision 1.5 diff -u -r1.5 install.mysql.inc --- install.mysql.inc 6 Aug 2007 10:28:42 -0000 1.5 +++ install.mysql.inc 22 Oct 2007 12:55:55 -0000 @@ -41,13 +41,13 @@ // Test connecting to the database. $connection = @mysql_connect($url['host'], $url['user'], $url['pass'], TRUE, 2); if (!$connection) { - drupal_set_message(st('Failure to connect to your MySQL database server. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysql_error())), 'error'); + drupal_set_message(st('Failed to connect to your MySQL database server. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysql_error())), 'error'); return FALSE; } // Test selecting the database. if (!mysql_select_db(substr($url['path'], 1))) { - drupal_set_message(st('We were able to connect to the MySQL database server (which means your username and password are valid) but not able to select your database. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysql_error())), 'error'); + drupal_set_message(st('Failed to select your database on your MySQL database server, which means the connection username and password are valid, but there is a problem accessing your data. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysql_error())), 'error'); return FALSE; } @@ -57,7 +57,7 @@ $query = 'CREATE TABLE drupal_install_test (id int NULL)'; $result = mysql_query($query); if ($error = mysql_error()) { - drupal_set_message(st('We were unable to create a test table on your MySQL database server with the command %query. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to create a test table on your MySQL database server with the command %query. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error'); return FALSE; } $err = FALSE; @@ -68,7 +68,7 @@ $query = 'INSERT INTO drupal_install_test (id) VALUES (1)'; $result = mysql_query($query); if ($error = mysql_error()) { - drupal_set_message(st('We were unable to insert a value into a test table on your MySQL database server. We tried inserting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to insert a value into a test table on your MySQL database server. We tried inserting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -79,7 +79,7 @@ $query = 'UPDATE drupal_install_test SET id = 2'; $result = mysql_query($query); if ($error = mysql_error()) { - drupal_set_message(st('We were unable to update a value in a test table on your MySQL database server. We tried updating a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to update a value in a test table on your MySQL database server. We tried updating a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -90,7 +90,7 @@ $query = 'LOCK TABLES drupal_install_test WRITE'; $result = mysql_query($query); if ($error = mysql_error()) { - drupal_set_message(st('We were unable to lock a test table on your MySQL database server. We tried locking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to lock a test table on your MySQL database server. We tried locking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -101,7 +101,7 @@ $query = 'UNLOCK TABLES'; $result = mysql_query($query); if ($error = mysql_error()) { - drupal_set_message(st('We were unable to unlock a test table on your MySQL database server. We tried unlocking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to unlock a test table on your MySQL database server. We tried unlocking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -112,7 +112,7 @@ $query = 'DELETE FROM drupal_install_test'; $result = mysql_query($query); if ($error = mysql_error()) { - drupal_set_message(st('We were unable to delete a value from a test table on your MySQL database server. We tried deleting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to delete a value from a test table on your MySQL database server. We tried deleting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -123,7 +123,7 @@ $query = 'DROP TABLE drupal_install_test'; $result = mysql_query($query); if ($error = mysql_error()) { - drupal_set_message(st('We were unable to drop a test table from your MySQL database server. We tried dropping a table with the command %query and MySQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to drop a test table from your MySQL database server. We tried dropping a table with the command %query and MySQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { Index: install.mysqli.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.mysqli.inc,v retrieving revision 1.8 diff -u -r1.8 install.mysqli.inc --- install.mysqli.inc 2 Sep 2007 12:50:55 -0000 1.8 +++ install.mysqli.inc 22 Oct 2007 12:57:17 -0000 @@ -36,13 +36,13 @@ $connection = mysqli_init(); @mysqli_real_connect($connection, $url['host'], $url['user'], $url['pass'], substr($url['path'], 1), $url['port'], NULL, MYSQLI_CLIENT_FOUND_ROWS); if (mysqli_connect_errno() >= 2000 || mysqli_connect_errno() == 1045) { - drupal_set_message(st('Failure to connect to your MySQL database server. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_connect_error())), 'error'); + drupal_set_message(st('Failed to connect to your MySQL database server. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_connect_error())), 'error'); return FALSE; } // Test selecting the database. if (mysqli_connect_errno() > 0) { - drupal_set_message(st('We were able to connect to the MySQL database server (which means your username and password are valid) but not able to select your database. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_connect_error())), 'error'); + drupal_set_message(st('Failed to select your database on your MySQL database server, which means the connection username and password are valid, but there is a problem accessing your data. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_connect_error())), 'error'); return FALSE; } @@ -52,7 +52,7 @@ $query = 'CREATE TABLE drupal_install_test (id int NULL)'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to create a test table on your MySQL database server with the command %query. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to create a test table on your MySQL database server with the command %query. MySQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error'); return FALSE; } $err = FALSE; @@ -63,7 +63,7 @@ $query = 'INSERT INTO drupal_install_test (id) VALUES (1)'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to insert a value into a test table on your MySQL database server. We tried inserting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to insert a value into a test table on your MySQL database server. We tried inserting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -74,7 +74,7 @@ $query = 'UPDATE drupal_install_test SET id = 2'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to update a value in a test table on your MySQL database server. We tried updating a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to update a value in a test table on your MySQL database server. We tried updating a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -85,7 +85,7 @@ $query = 'LOCK TABLES drupal_install_test WRITE'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to lock a test table on your MySQL database server. We tried locking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to lock a test table on your MySQL database server. We tried locking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -96,7 +96,7 @@ $query = 'UNLOCK TABLES'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to unlock a test table on your MySQL database server. We tried unlocking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to unlock a test table on your MySQL database server. We tried unlocking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -107,7 +107,7 @@ $query = 'DELETE FROM drupal_install_test'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to delete a value from a test table on your MySQL database server. We tried deleting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to delete a value from a test table on your MySQL database server. We tried deleting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -118,7 +118,7 @@ $query = 'DROP TABLE drupal_install_test'; $result = mysqli_query($connection, $query); if ($error = mysqli_error($connection)) { - drupal_set_message(st('We were unable to drop a test table from your MySQL database server. We tried dropping a table with the command %query and MySQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to drop a test table from your MySQL database server. We tried dropping a table with the command %query and MySQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { Index: install.pgsql.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.pgsql.inc,v retrieving revision 1.5 diff -u -r1.5 install.pgsql.inc --- install.pgsql.inc 19 Oct 2007 15:02:15 -0000 1.5 +++ install.pgsql.inc 22 Oct 2007 12:58:30 -0000 @@ -48,7 +48,7 @@ // Test connecting to the database. $connection = @pg_connect($conn_string); if (!$connection) { - drupal_set_message(st('Failure to connect to your PostgreSQL database server. PostgreSQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => 'Connection failed. See log file for failure reason')), 'error'); + drupal_set_message(st('Failed to connect to your PostgreSQL database server. PostgreSQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => 'Connection failed. See log file for failure reason')), 'error'); return FALSE; } @@ -58,7 +58,7 @@ $query = 'CREATE TABLE drupal_install_test (id integer NOT NULL)'; $result = pg_query($connection, $query); if ($error = pg_result_error($result)) { - drupal_set_message(st('We were unable to create a test table on your PostgreSQL database server with the command %query. PostgreSQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to create a test table on your PostgreSQL database server with the command %query. PostgreSQL reports the following message: %error.For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error'); return FALSE; } $err = FALSE; @@ -69,7 +69,7 @@ $query = 'INSERT INTO drupal_install_test (id) VALUES (1)'; $result = pg_query($connection, $query); if ($error = pg_result_error($result)) { - drupal_set_message(st('We were unable to insert a value into a test table on your PostgreSQL database server. We tried inserting a value with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to insert a value into a test table on your PostgreSQL database server. We tried inserting a value with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -80,7 +80,7 @@ $query = 'UPDATE drupal_install_test SET id = 2'; $result = pg_query($connection, $query); if ($error = pg_result_error($result)) { - drupal_set_message(st('We were unable to update a value in a test table on your PostgreSQL database server. We tried updating a value with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to update a value in a test table on your PostgreSQL database server. We tried updating a value with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -91,7 +91,7 @@ $query = 'BEGIN; LOCK drupal_install_test IN SHARE ROW EXCLUSIVE MODE'; $result = pg_query($connection, $query); if ($error = pg_result_error($result)) { - drupal_set_message(st('We were unable to lock a test table on your PostgreSQL database server. We tried locking a table with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to lock a test table on your PostgreSQL database server. We tried locking a table with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -102,7 +102,7 @@ $query = 'COMMIT'; $result = pg_query($connection, $query); if ($error = pg_result_error()) { - drupal_set_message(st('We were unable to unlock a test table on your PostgreSQL database server. We tried unlocking a table with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to unlock a test table on your PostgreSQL database server. We tried unlocking a table with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -113,7 +113,7 @@ $query = 'DELETE FROM drupal_install_test'; $result = pg_query($connection, $query); if ($error = pg_result_error()) { - drupal_set_message(st('We were unable to delete a value from a test table on your PostgreSQL database server. We tried deleting a value with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to delete a value from a test table on your PostgreSQL database server. We tried deleting a value with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else { @@ -124,7 +124,7 @@ $query = 'DROP TABLE drupal_install_test'; $result = pg_query($connection, $query); if ($error = pg_result_error()) { - drupal_set_message(st('We were unable to drop a test table from your PostgreSQL database server. We tried dropping a table with the command %query and PostgreSQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error'); + drupal_set_message(st('Failed to drop a test table from your PostgreSQL database server. We tried dropping a table with the command %query and PostgreSQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error'); $err = TRUE; } else {