| Index: branches/wmf/1.17wmf1/maintenance/language/messages.inc |
| — | — | @@ -444,8 +444,10 @@ |
| 445 | 445 | 'throttled-mailpassword', |
| 446 | 446 | 'loginstart', |
| 447 | 447 | 'loginend', |
| | 448 | + 'loginend-https', |
| 448 | 449 | 'signupstart', |
| 449 | 450 | 'signupend', |
| | 451 | + 'signupend-https', |
| 450 | 452 | 'mailerror', |
| 451 | 453 | 'acct_creation_throttle_hit', |
| 452 | 454 | 'emailauthenticated', |
| Index: branches/wmf/1.17wmf1/maintenance/language/messageTypes.inc |
| — | — | @@ -89,6 +89,7 @@ |
| 90 | 90 | 'history_copyright', |
| 91 | 91 | 'licenses', |
| 92 | 92 | 'loginstart', |
| | 93 | + 'loginend-https', |
| 93 | 94 | 'loginend', |
| 94 | 95 | 'loginlanguagelinks', |
| 95 | 96 | 'pear-mail-error', |
| — | — | @@ -111,6 +112,7 @@ |
| 112 | 113 | 'signature-anon', |
| 113 | 114 | 'signupstart', |
| 114 | 115 | 'signupend', |
| | 116 | + 'signupend-https', |
| 115 | 117 | 'sitenotice', |
| 116 | 118 | 'sitesubtitle', |
| 117 | 119 | 'sitetitle', |
| Index: branches/wmf/1.17wmf1/includes/specials/SpecialUserlogin.php |
| — | — | @@ -1073,13 +1073,21 @@ |
| 1074 | 1074 | $template->set( 'uselang', $this->mLanguage ); |
| 1075 | 1075 | } |
| 1076 | 1076 | |
| 1077 | | - // Use loginend-https for HTTPS requests if it exists, loginend otherwise |
| 1078 | | - $httpsMsg = wfMessage( 'loginend-https' ); |
| 1079 | | - if ( WebRequest::detectProtocol() == 'https' && $httpsMsg->exists() ) { |
| 1080 | | - $template->set( 'loginend', $httpsMsg->parse() ); |
| | 1077 | + // Use loginend-https for HTTPS requests if it's not blank, loginend otherwise |
| | 1078 | + // Ditto for signupend |
| | 1079 | + $usingHTTPS = WebRequest::detectProtocol(); |
| | 1080 | + $loginendHTTPS = wfMessage( 'loginend-https' ); |
| | 1081 | + $signupendHTTPS = wfMessage( 'signupend-https' ); |
| | 1082 | + if ( $usingHTTPS && !$loginendHTTPS->isBlank() ) { |
| | 1083 | + $template->set( 'loginend', $loginendHTTPS->parse() ); |
| 1081 | 1084 | } else { |
| 1082 | 1085 | $template->set( 'loginend', wfMessage( 'loginend' )->parse() ); |
| 1083 | 1086 | } |
| | 1087 | + if ( $usingHTTPS && !$signupendHTTPS->isBlank() ) { |
| | 1088 | + $template->set( 'signupend', $signupendHTTPS->parse() ); |
| | 1089 | + } else { |
| | 1090 | + $template->set( 'signupend', wfMessage( 'signupend' )->parse() ); |
| | 1091 | + } |
| 1084 | 1092 | |
| 1085 | 1093 | // Give authentication and captcha plugins a chance to modify the form |
| 1086 | 1094 | $wgAuth->modifyUITemplate( $template, $this->mType ); |
| Index: branches/wmf/1.17wmf1/includes/templates/Userlogin.php |
| — | — | @@ -365,7 +365,7 @@ |
| 366 | 366 | <?php if( @$this->haveData( 'token' ) ) { ?><input type="hidden" name="wpCreateaccountToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?> |
| 367 | 367 | </form> |
| 368 | 368 | </div> |
| 369 | | -<div id="signupend"><?php $this->msgWiki( 'signupend' ); ?></div> |
| | 369 | +<div id="signupend"><?php $this->html( 'signupend' ); ?></div> |
| 370 | 370 | <?php |
| 371 | 371 | |
| 372 | 372 | } |
| Index: branches/wmf/1.17wmf1/languages/messages/MessagesEn.php |
| — | — | @@ -1113,8 +1113,10 @@ |
| 1114 | 1114 | To prevent abuse, only one password reminder will be sent per {{PLURAL:$1|hour|$1 hours}}.', |
| 1115 | 1115 | 'loginstart' => '', # do not translate or duplicate this message to other languages |
| 1116 | 1116 | 'loginend' => '', # do not translate or duplicate this message to other languages |
| | 1117 | +'loginend-https' => '', # do not translate or duplicate this message to other languages |
| 1117 | 1118 | 'signupstart' => '{{int:loginstart}}', # do not translate or duplicate this message to other languages |
| 1118 | 1119 | 'signupend' => '{{int:loginend}}', # do not translate or duplicate this message to other languages |
| | 1120 | +'signupend-https' => '', # do not translate or duplicate this message to other languages |
| 1119 | 1121 | 'mailerror' => 'Error sending mail: $1', |
| 1120 | 1122 | 'acct_creation_throttle_hit' => 'Visitors to this wiki using your IP address have created {{PLURAL:$1|1 account|$1 accounts}} in the last day, which is the maximum allowed in this time period. |
| 1121 | 1123 | As a result, visitors using this IP address cannot create any more accounts at the moment.', |
| Property changes on: branches/wmf/1.17wmf1/languages/messages/MessagesEn.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1122 | 1124 | Merged /trunk/phase3/languages/messages/MessagesEn.php:r98713,98716,98718-98720 |