| Index: trunk/extensions/FeaturedFeeds/FeaturedFeeds.body.php |
| — | — | @@ -82,15 +82,14 @@ |
| 83 | 83 | foreach ( $feedDefs as $name => $opts ) { |
| 84 | 84 | $feed = array( 'name' => $name ); |
| 85 | 85 | |
| 86 | | - $pageMsg = wfMessage( $opts['page'] )->inContentLanguage(); |
| | 86 | + $feed['inUserLanguage'] = $opts['inUserLanguage']; |
| | 87 | + $lang = $opts['inUserLanguage'] ? $requestedLang : $wgContLang; |
| | 88 | + $feed['language'] = $lang->getCode(); |
| | 89 | + $pageMsg = wfMessage( $opts['page'] )->inLanguage( $lang ); |
| 87 | 90 | if ( $pageMsg->isDisabled() ) { |
| 88 | 91 | continue; |
| 89 | 92 | } |
| 90 | 93 | $page = $pageMsg->plain(); |
| 91 | | - |
| 92 | | - $feed['inUserLanguage'] = $opts['inUserLanguage']; |
| 93 | | - $lang = $opts['inUserLanguage'] ? $requestedLang : $wgContLang; |
| 94 | | - $feed['language'] = $lang->getCode(); |
| 95 | 94 | $feed['title'] = wfMessage( $opts['title'] )->inLanguage( $lang )->text(); |
| 96 | 95 | $feed['description'] = wfMessage( $opts['description'] )->inLanguage( $lang )->text(); |
| 97 | 96 | $entryName = wfMessage( $opts['entryName'] )->inLanguage( $lang )->plain(); |