Revert r25958 and r25959 for now.

Even if we wanted to make the order of fields in a form language-dependent (which I'm not very comfortable with), this seems an odd way to do it. It introduces an unnecessary HTML message which could be broken in interesting ways and generally strikes me as odd.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 54dc243..5a58ca4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -27,8 +27,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11136) If using Postgres, search path is explicitly set if wgDBmwschema is 
   not set to 'mediawiki', allowing multiple mediawiki instances per user.
 * (bug 11151) Add descriptive <title> to revision history page
-* Add message 'year-month' to enable swap of year and month in input form of
-  Special:Contributions
 
 === Bug fixes in 1.12 ===
 

diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 2574a19..e85ec43 100644 (file)
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -420,16 +420,8 @@ function contributionsForm( $options ) {
                }
                $f .= "\t" . Xml::hidden( $name, $value ) . "\n";
        }
-       $inputMonth= '<span style="white-space: nowrap">' .
-               Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
-               Xml::monthSelector( $options['month'], -1 ) . ' '.
-               '</span>';
-       $inputYear = '<span style="white-space: nowrap">' .
-               Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
-               Xml::input( 'year', 4, $options['year'], array('id' => 'year', 'maxlength' => 4 ) ) .
-               '</span>';
 
-       $f .= Xml::openElement( 'fieldset' ) .
+       $f .= '<fieldset>' .
                Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) .
                Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parseinline' ) ), 'contribs' , 'newbie' , 'newbie', $options['contribs'] == 'newbie' ? true : false ) . '<br />' .
                Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parseinline' ) ), 'contribs' , 'user', 'user', $options['contribs'] == 'user' ? true : false ) . ' ' .
@@ -439,15 +431,23 @@ function contributionsForm( $options ) {
                Xml::namespaceSelector( $options['namespace'], '' ) .
                '</span>' .
                Xml::openElement( 'p' ) .
-               wfMsg( 'year-month', $inputYear, $inputMonth ) . ' ' .
+               '<span style="white-space: nowrap">' .
+               Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
+               Xml::input( 'year', 4, $options['year'], array('id' => 'year', 'maxlength' => 4) ) .
+               '</span>' .
+               ' '.
+               '<span style="white-space: nowrap">' .
+               Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
+               Xml::monthSelector( $options['month'], -1 ) . ' '.
+               '</span>' .
                Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
                Xml::closeElement( 'p' );
-
+       
        $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
        if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) )
                $f .= "<p>{$explain}</p>";
-
-       $f .= Xml::closeElement( 'fieldset' ) .
+               
+       $f .= '</fieldset>' .
                Xml::closeElement( 'form' );
        return $f;
 }

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index ca9266c..80b65ac 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1569,10 +1569,9 @@ $1',
 'nocontribs'    => 'Es wurden keine Benutzerbeiträge mit diesen Kriterien gefunden.',
 'ucnote'        => 'Dies sind die letzten <b>$1</b> Beiträge des Benutzers in den letzten <b>$2</b> Tagen.',
 'uclinks'       => 'Zeige die letzten $1 Beiträge; zeige die letzten $2 Tage.',
-'uctop'         => '(aktuell)',
-'month'         => 'Bis Monat:',
-'year'          => 'und Jahr:',
-'year-month'    => '$2 $1',
+'uctop'         => ' (aktuell)',
+'month'         => 'und Monat:',
+'year'          => 'bis Jahr:',
 
 'sp-contributions-newest'      => 'Jüngste',
 'sp-contributions-oldest'      => 'Älteste',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 85b7fed..7d874bb 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1971,7 +1971,6 @@ Consult the [[Special:Log/delete|deletion log]] for a record of recent deletions
 'uctop'         => ' (top)',
 'month'         => 'From month (and earlier):',
 'year'          => 'From year (and earlier):',
-'year-month'    => '$1 $2', # $1 year, $2 month; only translate this message to other languages if you have to change it
 
 'sp-contributions-newest'      => 'Newest',
 'sp-contributions-oldest'      => 'Oldest',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 87f6be9..e3376ca 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -205,7 +205,6 @@ $wgOptionalMessages = array(
        'filedelete-backlink',
        'pagetitle',
        'filename-prefix-blacklist',
-       'year-month',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 898812c..2a27f3f 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1290,7 +1290,6 @@ $wgMessageStructure = array(
                'uctop',
                'month',
                'year',
-               'year-month',
        ),
        'sp-contributions' => array(
                'sp-contributions-newest',
@@ -2397,8 +2396,7 @@ $wgMessageComments = array(
        'exif-orientation-6'          => '0th row: right; 0th column: top',
        'exif-orientation-7'          => '0th row: right; 0th column: bottom',
        'exif-orientation-8'          => '0th row: left; 0th column: bottom',
-       'movepage-moved'              => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.',
-       'year-month'                  => '$1 year, $2 month',
+       'movepage-moved'              => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.'
 );
 
 /** Messages which contain dollar signs (which are not followed by numbers), and therefore should use a single apostrophe */