From d86e7d33c5f626856f8cb9692f6249d74b40d42b Mon Sep 17 00:00:00 2001 From: Florianschmidtwelzow Date: Mon, 1 Dec 2014 07:29:36 +0100 Subject: [PATCH] Use a more generic DB Error wording Not everytime there is a problem to _contact_ the database server (e.g. a false server), sometimes (e.g. a false password or username) it's a problem of the user credentials or that the database does not exist. So use a more generic wording, just saying, that the database could not be accessed. Bug: T76317 Change-Id: I502d5894acb855ac51c6f45ea91e5446b4b3aeb3 --- includes/db/DatabaseError.php | 4 ++-- languages/i18n/en.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php index 2dfec41dd7..2393bbbd47 100644 --- a/includes/db/DatabaseError.php +++ b/includes/db/DatabaseError.php @@ -168,12 +168,12 @@ class DBConnectionError extends DBExpectedError { if ( $wgShowHostnames || $wgShowSQLErrors ) { $info = str_replace( '$1', Html::element( 'span', array( 'dir' => 'ltr' ), $this->error ), - htmlspecialchars( $this->msg( 'dberr-info', '(Cannot contact the database server: $1)' ) ) + htmlspecialchars( $this->msg( 'dberr-info', '(Cannot access the database: $1)' ) ) ); } else { $info = htmlspecialchars( $this->msg( 'dberr-info-hidden', - '(Cannot contact the database server)' + '(Cannot access the database)' ) ); } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index b0751e38bc..14efc708ef 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -3371,8 +3371,8 @@ "compare-revision-not-exists": "The revision you specified does not exist.", "dberr-problems": "Sorry! This site is experiencing technical difficulties.", "dberr-again": "Try waiting a few minutes and reloading.", - "dberr-info": "(Cannot contact the database server: $1)", - "dberr-info-hidden": "(Cannot contact the database server)", + "dberr-info": "(Cannot access the database: $1)", + "dberr-info-hidden": "(Cannot access the database)", "dberr-usegoogle": "You can try searching via Google in the meantime.", "dberr-outofdate": "Note that their indexes of our content may be out of date.", "dberr-cachederror": "This is a cached copy of the requested page, and may not be up to date.", -- 2.20.1