(bug 10530) Introduce optional "sp-contributions-explain" message for additional...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1c3aef7..915fda3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -134,7 +134,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Link to user logs in toolbox when viewing a user page
 * (bug 10508) Allow HTML attributes on <gallery>
 * (bug 1962) Allow HTML attributes on <math>
-
+* (bug 10530) Introduce optional "sp-contributions-explain" message for
+  additional explanation in Special:Contributions
 
 == Bugfixes since 1.10 ==
 

diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 6e883cd..ae51cde 100644 (file)
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -431,8 +431,13 @@ function contributionsForm( $options ) {
                Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
                Xml::monthSelector( $options['month'], -1 ) . ' '.
                Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
-               Xml::closeElement( 'p' ) .
-               '</fieldset>' .
+               Xml::closeElement( 'p' );
+       
+       $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
+       if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) )
+               $f .= "<p>{$explain}</p>";
+               
+       $f .= '</fieldset>' .
                Xml::closeElement( 'form' );
        return $f;
 }
\ No newline at end of file

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 235aeb2..6b6b0f3 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -193,6 +193,7 @@ $wgOptionalMessages = array(
        'exif-filesource-3',
        'booksources-isbn',
        'isbn',
+       'sp-contributions-explain',
 );
 
 /** 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 00c7a4a..d8e7a6d 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1248,6 +1248,7 @@ $wgMessageStructure = array(
                'sp-contributions-search',
                'sp-contributions-username',
                'sp-contributions-submit',
+               'sp-contributions-explain',
                'sp-contributions-footer',
                'sp-contributions-footer-anon',
        ),