wikimedia/mediawiki-extensions-Scribunto
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto synced 2024-11-15 03:35:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Show module doc with the correct direction formatting"

Browse source
This commit is contained in:
jenkins-bot 2014-05-08 19:14:25 +00:00 committed by Gerrit Code Review
parent bb0f10b751 a8a17a8bb0
commit e9fe95b451
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
common/ScribuntoContent.php
View file

@ -42,12 +42,31 @@ class ScribuntoContent extends TextContent {
$doc->exists() ? 'scribunto-doc-page-show' : 'scribunto-doc-page-does-not-exist', $doc->exists() ? 'scribunto-doc-page-show' : 'scribunto-doc-page-does-not-exist',
$doc->getPrefixedText() $doc->getPrefixedText()
)->inContentLanguage(); )->inContentLanguage();
if ( !$msg->isDisabled() ) { if ( !$msg->isDisabled() ) {
// We need the ParserOutput for categories and such, so we // We need the ParserOutput for categories and such, so we
// can't use $msg->parse(). // can't use $msg->parse().
$docViewLang = $doc->getPageViewLanguage(); $docViewLang = $doc->getPageViewLanguage();
$docWikitext = '<div lang="' . htmlspecialchars( $docViewLang->getHtmlCode() ) . '"' $dir = $docViewLang->getDir();
. ' dir="' . $docViewLang->getDir() . "\">\n" . $msg->plain() . "\n</div>";
// Code is forced to be ltr, but the documentation can be rtl.
// Correct direction class is needed for correct formatting.
// The possible classes are
// mw-content-ltr or mw-content-rtl
$dirClass = "mw-content-$dir";
$docWikitext = Html::rawElement(
'div',
array(
'lang' => $docViewLang->getHtmlCode(),
'dir' => $dir,
'class' => $dirClass,
),
// Line breaks are needed so that wikitext would be
// appropriately isolated for correct parsing. See Bug 60664.
"\n" . $msg->plain() . "\n"
);
if ( !$options ) { if ( !$options ) {
// NOTE: use canonical options per default to produce cacheable output // NOTE: use canonical options per default to produce cacheable output
$options = ContentHandler::getForTitle( $doc )->makeParserOptions( 'canonical' ); $options = ContentHandler::getForTitle( $doc )->makeParserOptions( 'canonical' );
@ -56,6 +75,7 @@ class ScribuntoContent extends TextContent {
$options->setTargetLanguage( $doc->getPageLanguage() ); $options->setTargetLanguage( $doc->getPageLanguage() );
} }
} }
$output = $wgParser->parse( $docWikitext, $title, $options, true, true, $revId ); $output = $wgParser->parse( $docWikitext, $title, $options, true, true, $revId );
} }