Wikinaut has uploaded a new change for review. https://gerrit.wikimedia.org/r/80295
Change subject: i18n fix follow up to https://gerrit.wikimedia.org/r/#/c/78529/ ...................................................................... i18n fix follow up to https://gerrit.wikimedia.org/r/#/c/78529/ Change-Id: I5d6f35d060533ffb3fdfe6d2bd3303f8db21070e --- M CHANGES M OpenID.i18n.php M OpenID.php 3 files changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID refs/changes/95/80295/5 diff --git a/CHANGES b/CHANGES index bc40376..cfde6be 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,6 @@ CHANGES ======= - +3.341 20130821 fix of an i18n problem 3.34 20130810 bug 44821 OpenID Consumer wiki stalls with blank page for certain OpenID Provider verification error cases (consumer fails to show the provider response message) diff --git a/OpenID.i18n.php b/OpenID.i18n.php index 5cc7007..a15416a 100644 --- a/OpenID.i18n.php +++ b/OpenID.i18n.php @@ -46,6 +46,10 @@ 'openidconvert' => 'OpenID converter', 'openiderror' => 'Verification error', 'openiderrortext' => 'An error occurred during verification of the OpenID URL.', + 'openid-error-no-auth' => 'An unspecified authentication response/request error occurred during the verification of the OpenID URL $1.', + 'openid-error-server-response' => "An error occurred during the verification of the OpenID URL $1. + +The server response was: ''$2''", 'openid-error-request-forgery' => 'An error occurred: an invalid token was found.', 'openidconfigerror' => 'OpenID configuration error', 'openidconfigerrortext' => 'The OpenID storage configuration for this wiki is invalid. @@ -229,10 +233,23 @@ * {{msg-mw|openidclientonlytext}} * {{msg-mw|openiddeleteerrornopassword}} * {{msg-mw|openiddeleteerroropenidonly}} -* {{msg-mw|openiderrortext}}', +* {{msg-mw|openiderrortext}} +* {{msg-mw|openid-error-no-auth}} +* {{msg-mw|openid-error-server-response}} +* {{msg-mw|openid-error-request-forgery}}', 'openiderrortext' => 'Used as error message. The title for this error message is {{msg-mw|Openiderror}}.', + 'openid-error-no-auth' => 'The error message when an unspecified authentication response/request error occurred during the verification of an OpenID. + +Parameter: +* $1 - an OpenID URL', + 'openid-error-server-response' => 'The error message when a verification error occurred. + +Parameters: +* $1 - an OpenID URL +* $2 - the OpenID Provider server response text', + 'openid-error-request-forgery' => 'The error message when an invalid token was found.', 'openidconfigerror' => 'Used as error title for the following error message: * {{msg-mw|Openidconfigerrortext}}', 'openidconfigerrortext' => 'Used as error message. diff --git a/OpenID.php b/OpenID.php index 77b206f..961a7c7 100644 --- a/OpenID.php +++ b/OpenID.php @@ -29,7 +29,7 @@ exit( 1 ); } -define( 'MEDIAWIKI_OPENID_VERSION', '3.34 20130810' ); +define( 'MEDIAWIKI_OPENID_VERSION', '3.341 20130821' ); $path = dirname( __FILE__ ); set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR . get_include_path() ); -- To view, visit https://gerrit.wikimedia.org/r/80295 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d6f35d060533ffb3fdfe6d2bd3303f8db21070e Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/OpenID Gerrit-Branch: master Gerrit-Owner: Wikinaut <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
