| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1290,7 +1290,6 @@ |
| 1291 | 1291 | 'uctop', |
| 1292 | 1292 | 'month', |
| 1293 | 1293 | 'year', |
| 1294 | | - 'year-month', |
| 1295 | 1294 | ), |
| 1296 | 1295 | 'sp-contributions' => array( |
| 1297 | 1296 | 'sp-contributions-newest', |
| — | — | @@ -2397,8 +2396,7 @@ |
| 2398 | 2397 | 'exif-orientation-6' => '0th row: right; 0th column: top', |
| 2399 | 2398 | 'exif-orientation-7' => '0th row: right; 0th column: bottom', |
| 2400 | 2399 | 'exif-orientation-8' => '0th row: left; 0th column: bottom', |
| 2401 | | - 'movepage-moved' => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.', |
| 2402 | | - 'year-month' => '$1 year, $2 month', |
| | 2400 | + 'movepage-moved' => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.' |
| 2403 | 2401 | ); |
| 2404 | 2402 | |
| 2405 | 2403 | /** Messages which contain dollar signs (which are not followed by numbers), and therefore should use a single apostrophe */ |
| Index: trunk/phase3/maintenance/language/messageTypes.inc |
| — | — | @@ -205,7 +205,6 @@ |
| 206 | 206 | 'filedelete-backlink', |
| 207 | 207 | 'pagetitle', |
| 208 | 208 | 'filename-prefix-blacklist', |
| 209 | | - 'year-month', |
| 210 | 209 | ); |
| 211 | 210 | |
| 212 | 211 | /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ |
| Index: trunk/phase3/includes/SpecialContributions.php |
| — | — | @@ -420,16 +420,8 @@ |
| 421 | 421 | } |
| 422 | 422 | $f .= "\t" . Xml::hidden( $name, $value ) . "\n"; |
| 423 | 423 | } |
| 424 | | - $inputMonth= '<span style="white-space: nowrap">' . |
| 425 | | - Xml::label( wfMsg( 'month' ), 'month' ) . ' '. |
| 426 | | - Xml::monthSelector( $options['month'], -1 ) . ' '. |
| 427 | | - '</span>'; |
| 428 | | - $inputYear = '<span style="white-space: nowrap">' . |
| 429 | | - Xml::label( wfMsg( 'year' ), 'year' ) . ' '. |
| 430 | | - Xml::input( 'year', 4, $options['year'], array('id' => 'year', 'maxlength' => 4 ) ) . |
| 431 | | - '</span>'; |
| 432 | 424 | |
| 433 | | - $f .= Xml::openElement( 'fieldset' ) . |
| | 425 | + $f .= '<fieldset>' . |
| 434 | 426 | Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) . |
| 435 | 427 | Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parseinline' ) ), 'contribs' , 'newbie' , 'newbie', $options['contribs'] == 'newbie' ? true : false ) . '<br />' . |
| 436 | 428 | Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parseinline' ) ), 'contribs' , 'user', 'user', $options['contribs'] == 'user' ? true : false ) . ' ' . |
| — | — | @@ -439,15 +431,23 @@ |
| 440 | 432 | Xml::namespaceSelector( $options['namespace'], '' ) . |
| 441 | 433 | '</span>' . |
| 442 | 434 | Xml::openElement( 'p' ) . |
| 443 | | - wfMsg( 'year-month', $inputYear, $inputMonth ) . ' ' . |
| | 435 | + '<span style="white-space: nowrap">' . |
| | 436 | + Xml::label( wfMsg( 'year' ), 'year' ) . ' '. |
| | 437 | + Xml::input( 'year', 4, $options['year'], array('id' => 'year', 'maxlength' => 4) ) . |
| | 438 | + '</span>' . |
| | 439 | + ' '. |
| | 440 | + '<span style="white-space: nowrap">' . |
| | 441 | + Xml::label( wfMsg( 'month' ), 'month' ) . ' '. |
| | 442 | + Xml::monthSelector( $options['month'], -1 ) . ' '. |
| | 443 | + '</span>' . |
| 444 | 444 | Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) . |
| 445 | 445 | Xml::closeElement( 'p' ); |
| 446 | | - |
| | 446 | + |
| 447 | 447 | $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' ); |
| 448 | 448 | if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) ) |
| 449 | 449 | $f .= "<p>{$explain}</p>"; |
| 450 | | - |
| 451 | | - $f .= Xml::closeElement( 'fieldset' ) . |
| | 450 | + |
| | 451 | + $f .= '</fieldset>' . |
| 452 | 452 | Xml::closeElement( 'form' ); |
| 453 | 453 | return $f; |
| 454 | 454 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1971,7 +1971,6 @@ |
| 1972 | 1972 | 'uctop' => ' (top)', |
| 1973 | 1973 | 'month' => 'From month (and earlier):', |
| 1974 | 1974 | 'year' => 'From year (and earlier):', |
| 1975 | | -'year-month' => '$1 $2', # $1 year, $2 month; only translate this message to other languages if you have to change it |
| 1976 | 1975 | |
| 1977 | 1976 | 'sp-contributions-newest' => 'Newest', |
| 1978 | 1977 | 'sp-contributions-oldest' => 'Oldest', |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -1569,10 +1569,9 @@ |
| 1570 | 1570 | 'nocontribs' => 'Es wurden keine Benutzerbeiträge mit diesen Kriterien gefunden.', |
| 1571 | 1571 | 'ucnote' => 'Dies sind die letzten <b>$1</b> Beiträge des Benutzers in den letzten <b>$2</b> Tagen.', |
| 1572 | 1572 | 'uclinks' => 'Zeige die letzten $1 Beiträge; zeige die letzten $2 Tage.', |
| 1573 | | -'uctop' => '(aktuell)', |
| 1574 | | -'month' => 'Bis Monat:', |
| 1575 | | -'year' => 'und Jahr:', |
| 1576 | | -'year-month' => '$2 $1', |
| | 1573 | +'uctop' => ' (aktuell)', |
| | 1574 | +'month' => 'und Monat:', |
| | 1575 | +'year' => 'bis Jahr:', |
| 1577 | 1576 | |
| 1578 | 1577 | 'sp-contributions-newest' => 'Jüngste', |
| 1579 | 1578 | 'sp-contributions-oldest' => 'Älteste', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -27,8 +27,6 @@ |
| 28 | 28 | * (bug 11136) If using Postgres, search path is explicitly set if wgDBmwschema is |
| 29 | 29 | not set to 'mediawiki', allowing multiple mediawiki instances per user. |
| 30 | 30 | * (bug 11151) Add descriptive <title> to revision history page |
| 31 | | -* Add message 'year-month' to enable swap of year and month in input form of |
| 32 | | - Special:Contributions |
| 33 | 31 | |
| 34 | 32 | === Bug fixes in 1.12 === |
| 35 | 33 | |