| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -436,6 +436,8 @@ |
| 437 | 437 | 'createaccounterror', |
| 438 | 438 | 'nocookiesnew', |
| 439 | 439 | 'nocookieslogin', |
| | 440 | + 'nocookiesfornew', |
| | 441 | + 'nocookiesforlogin', |
| 440 | 442 | 'noname', |
| 441 | 443 | 'loginsuccesstitle', |
| 442 | 444 | 'loginsuccess', |
| Index: trunk/phase3/maintenance/language/messageTypes.inc |
| — | — | @@ -381,6 +381,7 @@ |
| 382 | 382 | 'usermessage-template', |
| 383 | 383 | 'revisionmove-backlink', |
| 384 | 384 | 'filepage.css', |
| | 385 | + 'nocookiesforlogin', |
| 385 | 386 | ); |
| 386 | 387 | |
| 387 | 388 | /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -274,7 +274,7 @@ |
| 275 | 275 | # Request forgery checks. |
| 276 | 276 | if ( !self::getCreateaccountToken() ) { |
| 277 | 277 | self::setCreateaccountToken(); |
| 278 | | - $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array( 'parseinline' ) ) ); |
| | 278 | + $this->mainLoginForm( wfMsgExt( 'nocookiesfornew', array( 'parseinline' ) ) ); |
| 279 | 279 | return false; |
| 280 | 280 | } |
| 281 | 281 | |
| — | — | @@ -659,7 +659,7 @@ |
| 660 | 660 | break; |
| 661 | 661 | |
| 662 | 662 | case self::NEED_TOKEN: |
| 663 | | - $this->mainLoginForm( wfMsgExt( 'nocookieslogin', array( 'parseinline' ) ) ); |
| | 663 | + $this->mainLoginForm( wfMsgExt( 'nocookiesforlogin', array( 'parseinline' ) ) ); |
| 664 | 664 | break; |
| 665 | 665 | case self::WRONG_TOKEN: |
| 666 | 666 | $this->mainLoginForm( wfMsg( 'sessionfailure' ) ); |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -654,7 +654,9 @@ |
| 655 | 655 | 'createaccounterror' => 'Parameters: |
| 656 | 656 | * $1 is an error message', |
| 657 | 657 | 'nocookiesnew' => "This message is displayed when a new account was successfully created, but the browser doesn't accept cookies.", |
| | 658 | +'nocookiesfornew' => "This message is displayed when the user tried to create a new account, but it failed the CSRF check. It could be blocking an attack, but most likely, the browser isn't accepting cookies.", |
| 658 | 659 | 'nocookieslogin' => "This message is displayed when someone tried to login, but the browser doesn't accept cookies.", |
| | 660 | +'nocookiesforlogin' => "This message is displayed when someone tried to login and the CSRF failed (most likely, the browser doesn't accept cookies). Defaults to nocookieslogin", |
| 659 | 661 | 'loginsuccesstitle' => 'The title of the page saying that you are logged in. The content of the page is the message "[[MediaWiki:Loginsuccess/{{SUBPAGENAME}}]]".', |
| 660 | 662 | 'loginsuccess' => 'The content of the page saying that you are logged in. The title of the page is "[[MediaWiki:Loginsuccesstitle/{{SUBPAGENAME}}|{{int:loginsuccesstitle}}]]". $1 is the name of the logged in user. |
| 661 | 663 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1070,9 +1070,12 @@ |
| 1071 | 1071 | {{SITENAME}} uses cookies to log in users. |
| 1072 | 1072 | You have cookies disabled. |
| 1073 | 1073 | Please enable them, then log in with your new username and password.', |
| | 1074 | +'nocookiesfornew' => 'The user account wasn\'t created, as we couldn\'t confirm its source. |
| | 1075 | +Ensure you have cookies enabled, reload this page and try again.', |
| 1074 | 1076 | 'nocookieslogin' => '{{SITENAME}} uses cookies to log in users. |
| 1075 | 1077 | You have cookies disabled. |
| 1076 | 1078 | Please enable them and try again.', |
| | 1079 | +'nocookiesforlogin' => '{{int:nocookieslogin}}', |
| 1077 | 1080 | 'noname' => 'You have not specified a valid username.', |
| 1078 | 1081 | 'loginsuccesstitle' => 'Login successful', |
| 1079 | 1082 | 'loginsuccess' => "'''You are now logged in to {{SITENAME}} as \"\$1\".'''", |