X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSkinTemplate.php;h=1f78ee5e5660c4ae95c8f71232d2d32b6a3f6e38;hb=7665f7d7674dbdf785c71ddafce0721a2e130cf3;hp=08816add7f150c86ccb75ed0f0daf000cb2dc8c2;hpb=72a9e46632331a0976c10da23568b610f554aad6;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 08816add7f..1f78ee5e56 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -86,12 +86,6 @@ class SkinTemplate extends Skin { */ public $template = 'QuickTemplate'; - /** - * @var bool Whether this skin use OutputPage::headElement() to generate - * the "" tag. - */ - public $useHeadElement = false; - /** * Add specific styles for this skin * @@ -146,8 +140,16 @@ class SkinTemplate extends Skin { $ilLangName = Language::fetchLanguageName( $ilInterwikiCode ); if ( strval( $ilLangName ) === '' ) { - $ilLangName = $languageLinkText; + $ilDisplayTextMsg = wfMessage( "interlanguage-link-$ilInterwikiCode" ); + if ( !$ilDisplayTextMsg->isDisabled() ) { + // Use custom MW message for the display text + $ilLangName = $ilDisplayTextMsg->text(); + } else { + // Last resort: fallback to the language link target + $ilLangName = $languageLinkText; + } } else { + // Use the language autonym as display text $ilLangName = $this->formatLanguageName( $ilLangName ); } @@ -159,7 +161,29 @@ class SkinTemplate extends Skin { ); $languageLinkTitleText = $languageLinkTitle->getText(); - if ( $languageLinkTitleText === '' ) { + if ( $ilLangLocalName === '' ) { + $ilFriendlySiteName = wfMessage( "interlanguage-link-sitename-$ilInterwikiCode" ); + if ( !$ilFriendlySiteName->isDisabled() ) { + if ( $languageLinkTitleText === '' ) { + $ilTitle = wfMessage( + 'interlanguage-link-title-nonlangonly', + $ilFriendlySiteName->text() + )->text(); + } else { + $ilTitle = wfMessage( + 'interlanguage-link-title-nonlang', + $languageLinkTitleText, + $ilFriendlySiteName->text() + )->text(); + } + } else { + // we have nothing friendly to put in the title, so fall back to + // displaying the interlanguage link itself in the title text + // (similar to what is done in page content) + $ilTitle = $languageLinkTitle->getInterwiki() . + ":$languageLinkTitleText"; + } + } elseif ( $languageLinkTitleText === '' ) { $ilTitle = wfMessage( 'interlanguage-link-title-langonly', $ilLangLocalName @@ -290,26 +314,6 @@ class SkinTemplate extends Skin { $out = $this->getOutput(); $tpl = $this->setupTemplateForOutput(); - wfProfileIn( __METHOD__ . '-stuff-head' ); - if ( !$this->useHeadElement ) { - $tpl->set( 'pagecss', false ); - $tpl->set( 'usercss', false ); - - $tpl->set( 'userjs', false ); - $tpl->set( 'userjsprev', false ); - - $tpl->set( 'jsvarurl', false ); - - $tpl->set( 'xhtmldefaultnamespace', 'http://www.w3.org/1999/xhtml' ); - $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces ); - $tpl->set( 'html5version', $wgHtml5Version ); - $tpl->set( 'headlinks', $out->getHeadLinks() ); - $tpl->set( 'csslinks', $out->buildCssLinks() ); - $tpl->set( 'pageclass', $this->getPageClasses( $title ) ); - $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) ); - } - wfProfileOut( __METHOD__ . '-stuff-head' ); - wfProfileIn( __METHOD__ . '-stuff2' ); $tpl->set( 'title', $out->getPageTitle() ); $tpl->set( 'pagetitle', $out->getHTMLTitle() ); @@ -540,11 +544,7 @@ class SkinTemplate extends Skin { $tpl->set( 'nav_urls', $this->buildNavUrls() ); // Set the head scripts near the end, in case the above actions resulted in added scripts - if ( $this->useHeadElement ) { - $tpl->set( 'headelement', $out->headElement( $this ) ); - } else { - $tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() ); - } + $tpl->set( 'headelement', $out->headElement( $this ) ); $tpl->set( 'debug', '' ); $tpl->set( 'debughtml', $this->generateDebugHTML() );