diff options
| author | Brad Jorsch <bjorsch@wikimedia.org> | 2016-10-19 12:54:25 -0400 |
|---|---|---|
| committer | Brad Jorsch <bjorsch@wikimedia.org> | 2016-12-06 10:20:48 -0500 |
| commit | 4e6810e4a2c1d821d8d108c7974ac16917561764 (patch) | |
| tree | ed65a338b8b66ceff4e0548894fd71ba3a425f9d /includes/api/ApiQuery.php | |
| parent | 8b0e022a8c543a0cb2e515ae5a2e3ff35fd96b6f (diff) | |
| download | mediawikicore-4e6810e4a2c1d821d8d108c7974ac16917561764.tar.gz mediawikicore-4e6810e4a2c1d821d8d108c7974ac16917561764.zip | |
API: i18n for warnings and errors
API warnings and error messages are currently hard-coded English
strings. This patch changes that.
With a few exceptions, this patch should be compatible with non-updated
extensions:
* The change to ApiBase::$messageMap will blow up anything trying to
mess with it.
* The changes to the 'ApiCheckCanExecute' hook will cause a wrong
(probably unparsed) error message to be emitted for extensions not
already using an ApiMessage. Unless they're currently broken like
Wikibase.
Bug: T37074
Bug: T47843
Depends-On: Ia2b66b57cd4eaddc30b3ffdd7b97d6ca3e02d898
Depends-On: I2e1bb975bb0045476c03ebe6cdec00259bae22ec
Depends-On: I53987bf87c48f6c00deec17a8e957d24fcc3eaa6
Depends-On: Ibf93a459eb62d30f7c70d20e91ec9faeb80d10ed
Depends-On: I3cf889811f44a15935e454dd42f081164d4a098c
Depends-On: Ieae527de86735ddcba34724730e8730fb277b99b
Depends-On: I535344c29d51521147c2a26c341dae38cec3e931
Change-Id: Iae0e2ce3bd42dd4776a9779664086119ac188412
Diffstat (limited to 'includes/api/ApiQuery.php')
| -rw-r--r-- | includes/api/ApiQuery.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php index 16bd725e3cb0..8196cfa2bbfd 100644 --- a/includes/api/ApiQuery.php +++ b/includes/api/ApiQuery.php @@ -310,7 +310,7 @@ class ApiQuery extends ApiBase { ApiBase::dieDebug( __METHOD__, 'Error instantiating module' ); } if ( !$wasPosted && $instance->mustBePosted() ) { - $this->dieUsageMsgOrDebug( [ 'mustbeposted', $moduleName ] ); + $this->dieWithErrorOrDebug( [ 'apierror-mustbeposted', $moduleName ] ); } // Ignore duplicates. TODO 2.0: die()? if ( !array_key_exists( $moduleName, $modules ) ) { @@ -415,11 +415,7 @@ class ApiQuery extends ApiBase { } if ( !$fit ) { - $this->dieUsage( - 'The value of $wgAPIMaxResultSize on this wiki is ' . - 'too small to hold basic result information', - 'badconfig' - ); + $this->dieWithError( 'apierror-badconfig-resulttoosmall', 'badconfig' ); } if ( $this->mParams['export'] ) { |