X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialRecentchanges.php;h=bb384d415d41a9ff8682daf4c3c719377ed6a7e1;hb=127befb1786c6a4279de2f27066a84b3560e9bbd;hp=5a6f93cb47565e2889cf9fa5de1a681cec1d28cb;hpb=eac38f23a305244db9787ccedd2d3a1007330592;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 5a6f93cb47..bb384d415d 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -73,9 +73,7 @@ class SpecialRecentChanges extends IncludableSpecialPage { public function setup( $parameters ) { $opts = $this->getDefaultOptions(); - $this->customFilters = array(); - wfRunHooks( 'SpecialRecentChangesFilters', array( $this, &$this->customFilters ) ); - foreach( $this->customFilters as $key => $params ) { + foreach( $this->getCustomFilters() as $key => $params ) { $opts->add( $key, $params['default'] ); } @@ -90,6 +88,19 @@ class SpecialRecentChanges extends IncludableSpecialPage { return $opts; } + /** + * Get custom show/hide filters + * + * @return Array Map of filter URL param names to properties (msg/default) + */ + protected function getCustomFilters() { + if ( $this->customFilters === null ) { + $this->customFilters = array(); + wfRunHooks( 'SpecialRecentChangesFilters', array( $this, &$this->customFilters ) ); + } + return $this->customFilters; + } + /** * Create a FormOptions object specific for feed requests and return it * @@ -179,8 +190,8 @@ class SpecialRecentChanges extends IncludableSpecialPage { public function getFeedObject( $feedFormat ){ $changesFeed = new ChangesFeed( $feedFormat, 'rcfeed' ); $formatter = $changesFeed->getFeedObject( - wfMsgForContent( 'recentchanges' ), - wfMsgForContent( 'recentchanges-feed-description' ), + $this->msg( 'recentchanges' )->inContentLanguage()->text(), + $this->msg( 'recentchanges-feed-description' )->inContentLanguage()->text(), $this->getTitle()->getFullURL() ); return array( $changesFeed, $formatter ); @@ -355,7 +366,7 @@ class SpecialRecentChanges extends IncludableSpecialPage { * * @param $conds Array * @param $opts FormOptions - * @return database result or false (for Recentchangeslinked only) + * @return bool|ResultWrapper result or false (for Recentchangeslinked only) */ public function doMainQuery( $conds, $opts ) { $tables = array( 'recentchanges' ); @@ -523,6 +534,7 @@ class SpecialRecentChanges extends IncludableSpecialPage { /** * Get the query string to append to feed link URLs. * This is overridden by RCL to add the target parameter + * @return bool */ public function getFeedQuery() { return false; @@ -553,17 +565,17 @@ class SpecialRecentChanges extends IncludableSpecialPage { $extraOpts = $this->getExtraOptions( $opts ); $extraOptsCount = count( $extraOpts ); $count = 0; - $submit = ' ' . Xml::submitbutton( wfMsg( 'allpagessubmit' ) ); + $submit = ' ' . Xml::submitbutton( $this->msg( 'allpagessubmit' )->text() ); $out = Xml::openElement( 'table', array( 'class' => 'mw-recentchanges-table' ) ); - foreach( $extraOpts as $optionRow ) { + foreach( $extraOpts as $name => $optionRow ) { # Add submit button to the last row only ++$count; - $addSubmit = $count === $extraOptsCount ? $submit : ''; + $addSubmit = ( $count === $extraOptsCount ) ? $submit : ''; $out .= Xml::openElement( 'tr' ); if( is_array( $optionRow ) ) { - $out .= Xml::tags( 'td', array( 'class' => 'mw-label' ), $optionRow[0] ); + $out .= Xml::tags( 'td', array( 'class' => 'mw-label mw-' . $name . '-label' ), $optionRow[0] ); $out .= Xml::tags( 'td', array( 'class' => 'mw-input' ), $optionRow[1] . $addSubmit ); } else { $out .= Xml::tags( 'td', array( 'class' => 'mw-input', 'colspan' => 2 ), $optionRow . $addSubmit ); @@ -584,7 +596,7 @@ class SpecialRecentChanges extends IncludableSpecialPage { $panelString = implode( "\n", $panel ); $this->getOutput()->addHTML( - Xml::fieldset( wfMsg( 'recentchanges-legend' ), $panelString, array( 'class' => 'rcoptions' ) ) + Xml::fieldset( $this->msg( 'recentchanges-legend' )->text(), $panelString, array( 'class' => 'rcoptions' ) ) ); $this->setBottomText( $opts ); @@ -621,11 +633,18 @@ class SpecialRecentChanges extends IncludableSpecialPage { */ function setTopText( FormOptions $opts ) { global $wgContLang; - $this->getOutput()->addWikiText( - Html::rawElement( 'p', - array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ), - "\n" . wfMsgForContentNoTrans( 'recentchangestext' ) . "\n" - ), false ); + + $message = $this->msg( 'recentchangestext' )->inContentLanguage(); + if ( !$message->isDisabled() ) { + $this->getOutput()->addWikiText( + Html::rawElement( 'p', + array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ), + "\n" . $message->plain() . "\n" + ), + /* $lineStart */ false, + /* $interface */ false + ); + } } /** @@ -644,17 +663,20 @@ class SpecialRecentChanges extends IncludableSpecialPage { * @return String */ protected function namespaceFilterForm( FormOptions $opts ) { - $nsSelect = Xml::namespaceSelector( $opts['namespace'], '' ); - $nsLabel = Xml::label( wfMsg( 'namespace' ), 'namespace' ); + $nsSelect = Html::namespaceSelector( + array( 'selected' => $opts['namespace'], 'all' => '' ), + array( 'name' => 'namespace', 'id' => 'namespace' ) + ); + $nsLabel = Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ); $invert = Xml::checkLabel( - wfMsg( 'invert' ), 'invert', 'nsinvert', + $this->msg( 'invert' )->text(), 'invert', 'nsinvert', $opts['invert'], - array( 'title' => wfMsg( 'tooltip-invert' ) ) + array( 'title' => $this->msg( 'tooltip-invert' )->text() ) ); $associated = Xml::checkLabel( - wfMsg( 'namespace_association' ), 'associated', 'nsassociated', + $this->msg( 'namespace_association' )->text(), 'associated', 'nsassociated', $opts['associated'], - array( 'title' => wfMsg( 'tooltip-namespace_association' ) ) + array( 'title' => $this->msg( 'tooltip-namespace_association' )->text() ) ); return array( $nsLabel, "$nsSelect $invert $associated" ); } @@ -666,10 +688,10 @@ class SpecialRecentChanges extends IncludableSpecialPage { * @return Array */ protected function categoryFilterForm( FormOptions $opts ) { - list( $label, $input ) = Xml::inputLabelSep( wfMsg( 'rc_categories' ), + list( $label, $input ) = Xml::inputLabelSep( $this->msg( 'rc_categories' )->text(), 'categories', 'mw-categories', false, $opts['categories'] ); - $input .= ' ' . Xml::checkLabel( wfMsg( 'rc_categories_any' ), + $input .= ' ' . Xml::checkLabel( $this->msg( 'rc_categories_any' )->text(), 'categories_any', 'mw-categories_any', $opts['categories_any'] ); return array( $label, $input ); @@ -746,6 +768,7 @@ class SpecialRecentChanges extends IncludableSpecialPage { * @param $override Array: options to override * @param $options Array: current options * @param $active Boolean: whether to show the link in bold + * @return string */ function makeOptionsLink( $title, $override, $options, $active = false ) { $params = $override + $options; @@ -761,6 +784,7 @@ class SpecialRecentChanges extends IncludableSpecialPage { * * @param $defaults Array * @param $nondefaults Array + * @return string */ function optionsPanel( $defaults, $nondefaults ) { global $wgRCLinkLimits, $wgRCLinkDays; @@ -768,16 +792,18 @@ class SpecialRecentChanges extends IncludableSpecialPage { $options = $nondefaults + $defaults; $note = ''; - if( !wfEmptyMsg( 'rclegend' ) ) { - $note .= '