| Index: trunk/extensions/CentralAuth/CentralAuthHooks.php |
| — | — | @@ -99,9 +99,11 @@ |
| 100 | 100 | return true; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | | - // On other wikis |
| | 103 | + // On other domains |
| 104 | 104 | global $wgCentralAuthAutoLoginWikis; |
| 105 | 105 | if ( !$wgCentralAuthAutoLoginWikis ) { |
| | 106 | + wfLoadExtensionMessages( 'SpecialCentralAuth' ); |
| | 107 | + $inject_html .= wfMsgExt( 'centralauth-login-no-others', 'parse' ); |
| 106 | 108 | return true; |
| 107 | 109 | } |
| 108 | 110 | |
| — | — | @@ -216,9 +218,13 @@ |
| 217 | 219 | |
| 218 | 220 | static function onUserLogoutComplete( &$user, &$inject_html, $userName ) { |
| 219 | 221 | global $wgCentralAuthCookies, $wgCentralAuthAutoLoginWikis; |
| 220 | | - if( !$wgCentralAuthCookies || !$wgCentralAuthAutoLoginWikis ) { |
| | 222 | + if( !$wgCentralAuthCookies ) { |
| 221 | 223 | // Nothing to do. |
| 222 | 224 | return true; |
| | 225 | + } elseif ( !$wgCentralAuthAutoLoginWikis ) { |
| | 226 | + wfLoadExtensionMessages( 'SpecialCentralAuth' ); |
| | 227 | + $inject_html .= wfMsgExt( 'centralauth-logout-no-others', 'parse' ); |
| | 228 | + return true; |
| 223 | 229 | } |
| 224 | 230 | |
| 225 | 231 | $centralUser = CentralAuthUser::getInstance( $user ); |
| Index: trunk/extensions/CentralAuth/CentralAuth.i18n.php |
| — | — | @@ -217,8 +217,10 @@ |
| 218 | 218 | // Other messages |
| 219 | 219 | 'centralauth-invalid-wiki' => 'No such wiki database: $1', |
| 220 | 220 | 'centralauth-account-exists' => 'Cannot create account: the requested username is already taken in the unified login system.', |
| 221 | | - 'centralauth-login-progress' => 'Logging you in to projects of {{MediaWiki:Centralauth-groupname}}:', |
| 222 | | - 'centralauth-logout-progress' => 'Logging you out from other projects of {{MediaWiki:Centralauth-groupname}}:', |
| | 221 | + 'centralauth-login-progress' => 'Logging you in to projects of {{int:Centralauth-groupname}}:', |
| | 222 | + 'centralauth-logout-progress' => 'Logging you out from other projects of {{int:Centralauth-groupname}}:', |
| | 223 | + 'centralauth-login-no-others' => 'You have been automatically logged into other projects of {{int:Centralauth-groupname}}.', |
| | 224 | + 'centralauth-logout-no-others' => 'You have been automatically logged out of other projects of {{int:Centralauth-groupname}}.', |
| 223 | 225 | |
| 224 | 226 | // Logging |
| 225 | 227 | 'centralauth-log-name' => 'Global account log', |