Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319905
Change subject: Use more specific error messages
......................................................................
Use more specific error messages
Bug: T117872
Change-Id: Id670bc25480b9a96da5044f717451c919cf73db0
---
M gateway_common/gateway.adapter.php
1 file changed, 7 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/05/319905/1
diff --git a/gateway_common/gateway.adapter.php
b/gateway_common/gateway.adapter.php
index 624684f..9c827a0 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -599,14 +599,9 @@
$response_message = $this->getIdentifier() .
'_gateway-response-' . $code;
- $translatedMessage = WmfFramework::formatMessage(
$response_message );
-
- // FIXME: don't do this.
- // Check to see if an error message exists in translation
- if ( substr( $translatedMessage, 0, 3 ) !== '<' ) {
-
- // Message does not exist
- $translatedMessage = '';
+ $translatedMessage = '';
+ if ( WmfFramework::messageExists( $response_message ) ) {
+ $translatedMessage = WmfFramework::formatMessage(
$response_message );
}
if ( isset( $this->error_map[ $code ] ) ) {
@@ -621,7 +616,9 @@
$messageKey = 'donate_interface-processing-error';
}
- $translatedMessage = ( $options['translate'] && empty(
$translatedMessage ) ) ? WmfFramework::formatMessage( $messageKey ) :
$translatedMessage;
+ $translatedMessage = ( $options['translate'] && empty(
$translatedMessage ) )
+ ? WmfFramework::formatMessage( $messageKey )
+ : $translatedMessage;
// Check to see if we return the translated message.
$message = ( $options['translate'] ) ? $translatedMessage :
$messageKey;
@@ -1077,7 +1074,7 @@
$errCode = $ex->getErrorCode();
$retryVars = $ex->getRetryVars();
$this->transaction_response->addError(
$errCode, array(
- 'message' =>
$this->getErrorMapByCodeAndTranslate( 'internal-0001' ),
+ 'message' =>
$this->getErrorMapByCodeAndTranslate( $errCode ),
'debugInfo' => $ex->getMessage(),
'logLevel' => LogLevel::ERROR
) );
--
To view, visit https://gerrit.wikimedia.org/r/319905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id670bc25480b9a96da5044f717451c919cf73db0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
