Nikerabbit has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354645 )
Change subject: Avoid exceptions in ApiTranslateSandbox signup ...................................................................... Avoid exceptions in ApiTranslateSandbox signup The error message shown to the user is now just "invalid password" instead of "MWException gibberish biggerish password-name-match gibberish" Bug: T164912 Change-Id: I975193181e3b0331dfc9b57900c6cb246b79ffa9 --- M api/ApiTranslateSandbox.php M i18n/api/en.json M i18n/api/qqq.json 3 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/45/354645/1 diff --git a/api/ApiTranslateSandbox.php b/api/ApiTranslateSandbox.php index 6e25c56..4a990f4 100644 --- a/api/ApiTranslateSandbox.php +++ b/api/ApiTranslateSandbox.php @@ -72,9 +72,8 @@ } $password = $params['password']; - $status = $user->checkPasswordValidity( $password ); - if ( !$status->isGood() ) { - $this->dieStatus( $status ); + if ( !$user->isValidPassword( $password ) ) { + $this->dieWithError( 'apierror-translate-sandbox-invalidpassword', 'invalidpassword' ); } $email = $params['email']; diff --git a/i18n/api/en.json b/i18n/api/en.json index e65d6cc..0cc93c4 100644 --- a/i18n/api/en.json +++ b/i18n/api/en.json @@ -101,6 +101,7 @@ "apierror-translate-owntranslation": "Cannot review own translations", "apierror-translate-sandboxdisabled": "Sandbox feature is not in use", "apierror-translate-sandbox-invalidparam": "$1", + "apierror-translate-sandbox-invalidppassword": "Invalid password", "apierror-translate-unknownmessage": "Unknown message", "apiwarn-translate-alreadyreviewedbyyou": "Already marked as reviewed by you" } diff --git a/i18n/api/qqq.json b/i18n/api/qqq.json index 5e2af63..aa26be4 100644 --- a/i18n/api/qqq.json +++ b/i18n/api/qqq.json @@ -106,6 +106,7 @@ "apierror-translate-owntranslation": "{{doc-apierror}}", "apierror-translate-sandboxdisabled": "{{doc-apierror}}", "apierror-translate-sandbox-invalidparam": "{{doc-apierror}}\n\nParameters:\n* $1 - Exception message, probably in English", + "apierror-translate-sandbox-invalidppassword": "{{doc-apierror}}", "apierror-translate-unknownmessage": "{{doc-apierror}}", "apiwarn-translate-alreadyreviewedbyyou": "{{doc-apierror}}" } -- To view, visit https://gerrit.wikimedia.org/r/354645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I975193181e3b0331dfc9b57900c6cb246b79ffa9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits