From 923abc794ce79d62fdf0a37923dc927193d87441 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 22 Oct 2007 15:22:39 +0000 Subject: - Patch #184867 by deekayen: better error messages. --- includes/install.pgsql.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'includes/install.pgsql.inc') diff --git a/includes/install.pgsql.inc b/includes/install.pgsql.inc index 55473f27d..f03159ebb 100644 --- a/includes/install.pgsql.inc +++ b/includes/install.pgsql.inc @@ -48,7 +48,7 @@ function drupal_test_pgsql($url, &$success) { // 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 @@ function drupal_test_pgsql($url, &$success) { $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 @@ function drupal_test_pgsql($url, &$success) { $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 @@ function drupal_test_pgsql($url, &$success) { $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 @@ function drupal_test_pgsql($url, &$success) { $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 @@ function drupal_test_pgsql($url, &$success) { $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 @@ function drupal_test_pgsql($url, &$success) { $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 @@ function drupal_test_pgsql($url, &$success) { $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 { -- cgit v1.2.3