From: L10n-bot Date: Sun, 27 Nov 2016 21:08:38 +0000 (+0000) Subject: Merge "Localisation updates from https://translatewiki.net." X-Git-Tag: 1.31.0-rc.0~4754 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=4de420469fb3dd340df196156f90451c5e15bebb;hp=5953bac8c08c5c0ecb9e02ab62b5c6c593594a8c Merge "Localisation updates from https://translatewiki.net." --- diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index e3035be630..bfabd51bcc 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -668,12 +668,20 @@ class ChangeTags { * @param string $selected Tag to select by default * @param bool $ooui Use an OOUI TextInputWidget as selector instead of a non-OOUI input field * You need to call OutputPage::enableOOUI() yourself. + * @param IContextSource|null $context + * @note Even though it takes null as a valid argument, an IContextSource is preferred + * in a new code, as the null value can change in the future * @return array an array of (label, selector) */ - public static function buildTagFilterSelector( $selected = '', $ooui = false ) { - global $wgUseTagFilter; + public static function buildTagFilterSelector( + $selected = '', $ooui = false, IContextSource $context = null + ) { + if ( !$context ) { + $context = RequestContext::getMain(); + } - if ( !$wgUseTagFilter || !count( self::listDefinedTags() ) ) { + $config = $context->getConfig(); + if ( !$config->get( 'UseTagFilter' ) || !count( self::listDefinedTags() ) ) { return []; } @@ -681,7 +689,7 @@ class ChangeTags { Html::rawElement( 'label', [ 'for' => 'tagfilter' ], - wfMessage( 'tag-filter' )->parse() + $context->msg( 'tag-filter' )->parse() ) ]; diff --git a/languages/messages/MessagesOlo.php b/languages/messages/MessagesOlo.php index 14f5b6f771..63c1e8010e 100644 --- a/languages/messages/MessagesOlo.php +++ b/languages/messages/MessagesOlo.php @@ -8,7 +8,7 @@ * */ -$fallback = 'ru'; +$fallback = 'fi'; // T146744#2678472 $namespaceNames = [ NS_MEDIA => 'Medii',