| Index: trunk/extensions/OpenID/OpenID.i18n.php |
| — | — | @@ -49,7 +49,11 @@ |
| 50 | 50 | 'openidfailure' => 'Verification failed', |
| 51 | 51 | 'openidfailuretext' => 'Verification of the OpenID URL failed. Error message: "$1"', |
| 52 | 52 | 'openidsuccess' => 'Verification succeeded', |
| 53 | | - 'openidsuccesstext' => 'Verification of the OpenID URL succeeded.', |
| | 53 | + 'openidsuccesstext' => "'''Successful verification and log in as user $1'''. |
| | 54 | + |
| | 55 | +Your OpenID is $2 . |
| | 56 | + |
| | 57 | +This and further OpenIDs, and an optional account password, can be managed in your [[Special:Preferences|preferences]].", |
| 54 | 58 | 'openidusernameprefix' => 'OpenIDUser', |
| 55 | 59 | 'openidserverlogininstructions' => '$3 requests that you enter your password for your user $2 page $1 (this is your OpenID URL)', |
| 56 | 60 | 'openidtrustinstructions' => 'Check if you want to share data with $1.', |
| — | — | @@ -80,9 +84,10 @@ |
| 81 | 85 | 'openidconvertsuccesstext' => 'You have successfully converted your OpenID to $1.', |
| 82 | 86 | 'openidconvertyourstext' => 'That is already your OpenID.', |
| 83 | 87 | 'openidconvertothertext' => 'That is someone else\'s OpenID.', |
| 84 | | - 'openidalreadyloggedin' => "'''You are already logged in, $1!''' |
| | 88 | + 'openidalreadyloggedin' => 'You are already logged in.', |
| | 89 | + 'openidalreadyloggedintext' => "'''You are already logged in, $1!''' |
| 85 | 90 | |
| 86 | | -If you want to use OpenID to log in in the future, you can [[Special:OpenIDConvert|convert your account to use OpenID]].", |
| | 91 | +You can manage (view, delete, add further) OpenIDs in the OpenID tab of your [[Special:Preferences#preftab-8|preferences]].", |
| 87 | 92 | 'openidnousername' => 'No username specified.', |
| 88 | 93 | 'openidbadusername' => 'Bad username specified.', |
| 89 | 94 | 'openidautosubmit' => 'This page includes a form that should be automatically submitted if you have JavaScript enabled. |
| Index: trunk/extensions/OpenID/SpecialOpenIDLogin.body.php |
| — | — | @@ -79,15 +79,15 @@ |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
| 83 | | - * Displays an error message saying that the user is already logged-in |
| | 83 | + * Displays an info message saying that the user is already logged-in |
| 84 | 84 | */ |
| 85 | 85 | function alreadyLoggedIn() { |
| 86 | 86 | global $wgUser, $wgOut; |
| 87 | 87 | |
| 88 | | - $wgOut->setPageTitle( wfMsg( 'openiderror' ) ); |
| | 88 | + $wgOut->setPageTitle( wfMsg( 'openidalreadyloggedin' ) ); |
| 89 | 89 | $wgOut->setRobotPolicy( 'noindex,nofollow' ); |
| 90 | 90 | $wgOut->setArticleRelated( false ); |
| 91 | | - $wgOut->addWikiMsg( 'openidalreadyloggedin', $wgUser->getName() ); |
| | 91 | + $wgOut->addWikiMsg( 'openidalreadyloggedintext', $wgUser->getName() ); |
| 92 | 92 | list( $returnto, $returntoquery ) = $this->returnTo(); |
| 93 | 93 | $wgOut->returnToMain( false, $returnto, $returntoquery ); |
| 94 | 94 | } |
| — | — | @@ -596,7 +596,7 @@ |
| 597 | 597 | $wgOut->setPageTitle( wfMsg( 'openidsuccess' ) ); |
| 598 | 598 | $wgOut->setRobotPolicy( 'noindex,nofollow' ); |
| 599 | 599 | $wgOut->setArticleRelated( false ); |
| 600 | | - $wgOut->addWikiMsg( 'openidsuccess', $wgUser->getName(), $openid ); |
| | 600 | + $wgOut->addWikiMsg( 'openidsuccesstext', $wgUser->getName(), $openid ); |
| 601 | 601 | $wgOut->addHtml( $inject_html ); |
| 602 | 602 | list( $returnto, $returntoquery ) = $this->returnTo(); |
| 603 | 603 | $wgOut->returnToMain( false, $returnto, $returntoquery ); |