jenkins-bot has submitted this change and it was merged.
Change subject: Use a more generic DB Error wording
......................................................................
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
---
M includes/db/DatabaseError.php
M languages/i18n/en.json
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php
index 2dfec41..2393bbb 100644
--- a/includes/db/DatabaseError.php
+++ b/includes/db/DatabaseError.php
@@ -168,12 +168,12 @@
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
--- 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.",
--
To view, visit https://gerrit.wikimedia.org/r/176630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I502d5894acb855ac51c6f45ea91e5446b4b3aeb3
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
