| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1059,7 +1059,7 @@ |
| 1060 | 1060 | ), |
| 1061 | 1061 | 'watchlist' => array( |
| 1062 | 1062 | 'watchlist', |
| 1063 | | - 'mywatchlist', |
| | 1063 | + 'my-watchlist', |
| 1064 | 1064 | 'watchlistfor', |
| 1065 | 1065 | 'nowatchlist', |
| 1066 | 1066 | 'watchlistanontext', |
| Index: trunk/phase3/includes/SpecialContributions.php |
| — | — | @@ -191,11 +191,22 @@ |
| 192 | 192 | function wfSpecialContributions( $par = null ) { |
| 193 | 193 | global $wgUser, $wgOut, $wgLang, $wgRequest; |
| 194 | 194 | |
| 195 | | - $target = isset( $par ) ? $par : $wgRequest->getVal( 'target' ); |
| 196 | | - $radiobox = $wgRequest->getVal( 'newbie' ); |
| | 195 | + $options = array(); |
| | 196 | + |
| | 197 | + if ( isset( $par ) && $par == 'newbies' ) { |
| | 198 | + $target = 'newbies'; |
| | 199 | + $options['contribs'] = 'newbie'; |
| | 200 | + } elseif ( isset( $par ) ) { |
| | 201 | + $target = $par; |
| | 202 | + } else { |
| | 203 | + $target = ucfirst( $wgRequest->getVal( 'target' ) ); |
| | 204 | + } |
| 197 | 205 | |
| 198 | | - // check for radiobox |
| 199 | | - if ( $radiobox == 'contribs-newbie' ) $target = 'newbies'; |
| | 206 | + // check for radiobox |
| | 207 | + if ( $wgRequest->getVal( 'contribs' ) == 'newbie' ) { |
| | 208 | + $target = 'newbies'; |
| | 209 | + $options['contribs'] = 'newbie'; |
| | 210 | + } |
| 200 | 211 | |
| 201 | 212 | if ( !strlen( $target ) ) { |
| 202 | 213 | $wgOut->addHTML( contributionsForm( '' ) ); |
| — | — | @@ -208,8 +219,6 @@ |
| 209 | 220 | return; |
| 210 | 221 | } |
| 211 | 222 | |
| 212 | | - $options = array(); |
| 213 | | - |
| 214 | 223 | list( $options['limit'], $options['offset']) = wfCheckLimits(); |
| 215 | 224 | $options['offset'] = $wgRequest->getVal( 'offset' ); |
| 216 | 225 | /* Offset must be an integral. */ |
| — | — | @@ -382,22 +391,35 @@ |
| 383 | 392 | global $wgScript, $wgTitle, $wgRequest; |
| 384 | 393 | |
| 385 | 394 | $options['title'] = $wgTitle->getPrefixedText(); |
| 386 | | - if (!isset($options['target'])) |
| | 395 | + if ( !isset( $options['target'] ) ) { |
| 387 | 396 | $options['target'] = ''; |
| 388 | | - if (!isset($options['namespace'])) |
| | 397 | + } else { |
| | 398 | + $options['target'] = str_replace( '_' , ' ' , $options['target'] ); |
| | 399 | + } |
| | 400 | + |
| | 401 | + if ( !isset( $options['namespace'] ) ) { |
| 389 | 402 | $options['namespace'] = 0; |
| | 403 | + } |
| 390 | 404 | |
| | 405 | + if ( !isset( $options['contribs'] ) ) { |
| | 406 | + $options['contribs'] = 'user'; |
| | 407 | + } |
| | 408 | + |
| | 409 | + if ( $options['contribs'] == 'newbie' ) { |
| | 410 | + $options['target'] = ''; |
| | 411 | + } |
| | 412 | + |
| 391 | 413 | $f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ); |
| 392 | 414 | |
| 393 | 415 | foreach ( $options as $name => $value ) { |
| 394 | | - if( $name === 'namespace') continue; |
| | 416 | + if( $name === 'namespace' || $name === 'target' || $name === 'contribs' ) continue; |
| 395 | 417 | $f .= "\t" . Xml::hidden( $name, $value ) . "\n"; |
| 396 | 418 | } |
| 397 | 419 | |
| 398 | 420 | $f .= '<fieldset>' . |
| 399 | 421 | Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) . |
| 400 | | - Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parseinline' ) ), 'newbie' , 'contribs-newbie' , 'contribs-newbie', 'contribs-newbie' ) . '<br />' . |
| 401 | | - Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parseinline' ) ), 'newbie' , 'contribs-all', 'contribs-all', 'contribs-all' ) . ' ' . |
| | 422 | + Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parseinline' ) ), 'contribs' , 'newbie' , 'newbie', $options['contribs'] == 'newbie' ? true : false ) . '<br />' . |
| | 423 | + Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parseinline' ) ), 'contribs' , 'user', 'user', $options['contribs'] == 'user' ? true : false ) . ' ' . |
| 402 | 424 | Xml::input( 'target', 20, $options['target']) . ' '. |
| 403 | 425 | Xml::label( wfMsg( 'namespace' ), 'namespace' ) . |
| 404 | 426 | Xml::namespaceSelector( $options['namespace'], '' ) . |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -1265,8 +1265,7 @@ |
| 1266 | 1266 | |
| 1267 | 1267 | # Watchlist |
| 1268 | 1268 | 'watchlist' => 'Beobachtungsliste', |
| 1269 | | -'my-watchlist' => 'Beobachtungsliste', |
| 1270 | | -'mywatchlist' => 'Beobachtungsliste', |
| | 1269 | +'my-watchlist' => 'Beobachtungsliste', |
| 1271 | 1270 | 'watchlistfor' => "(für '''$1''')", |
| 1272 | 1271 | 'nowatchlist' => 'Sie haben keine Einträge auf Ihrer Beobachtungsliste.', |
| 1273 | 1272 | 'watchlistanontext' => 'Sie müssen sich $1, um Ihre Beobachtungsliste zu sehen oder Einträge auf ihr zu bearbeiten.', |