Merge "Use a more generic DB Error wording"

diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php
index 2dfec41..2393bbb 100644 (file)
--- 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 b0751e3..14efc70 100644 (file)
--- 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.",