jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330419 )
Change subject: More error handling fixes
......................................................................
More error handling fixes
See T154565
Change-Id: I073aae149497342157503ad3f465b7d57aaad4fa
---
M ApiVisualEditor.php
M modules/ve-mw/i18n/en.json
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 48d650c..8924d48 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -113,12 +113,12 @@
} elseif ( $response['error'] !== '' ) {
$this->dieWithError(
[ 'apierror-visualeditor-docserver-http-error',
wfEscapeWikiText( $response['error'] ) ],
- $response['error']
+ 'apierror-visualeditor-docserver-http-error'
);
} else { // error null, code not 200
$this->dieWithError(
[ 'apierror-visualeditor-docserver-http',
$response['code'] ],
- (string) $response['code']
+ 'apierror-visualeditor-docserver-http'
);
}
return $response['body'];
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index bc04df4..9aa6c6b 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -54,8 +54,8 @@
"apierror-visualeditor-badcachekey": "No cached serialization found
with that key",
"apierror-visualeditor-difffailed": "Diff failed",
"apierror-visualeditor-docserver": "Error contacting the
Parsoid/RESTbase server",
- "apierror-visualeditor-docserver-http": "docserver-http: HTTP $1",
- "apierror-visualeditor-docserver-http-error": "docserver-http-error:
$1",
+ "apierror-visualeditor-docserver-http": "HTTP $1",
+ "apierror-visualeditor-docserver-http-error": "$1",
"apierror-visualeditor-invaliddeflate": "Content provided is not
properly deflated",
"apierror-visualeditor-latestnotfound": "Could not find latest revision
for title",
"tooltip-ca-createsource": "Create the source code of this page",
--
To view, visit https://gerrit.wikimedia.org/r/330419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I073aae149497342157503ad3f465b7d57aaad4fa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
