function doAfterContent() { return "</div></div>"; }
function pageTitleLinks() {
- global $wgOut, $wgTitle, $wgUser, $wgRequest;
+ global $wgOut, $wgTitle, $wgUser, $wgRequest, $wgLang;
$oldid = $wgRequest->getVal( 'oldid' );
$diff = $wgRequest->getVal( 'diff' );
$action = $wgRequest->getText( 'action' );
- $s = $this->printableLink();
+ $s[] = $this->printableLink();
$disclaimer = $this->disclaimerLink(); # may be empty
if( $disclaimer ) {
- $s .= ' | ' . $disclaimer;
+ $s[] = $disclaimer;
}
$privacy = $this->privacyLink(); # may be empty too
if( $privacy ) {
- $s .= ' | ' . $privacy;
+ $s[] = $privacy;
}
if ( $wgOut->isArticleRelated() ) {
if( $image ) {
$link = htmlspecialchars( $image->getURL() );
$style = $this->getInternalLinkAttributes( $link, $name );
- $s .= " | <a href=\"{$link}\"{$style}>{$name}</a>";
+ $s[] = "<a href=\"{$link}\"{$style}>{$name}</a>";
}
}
}
if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
- $s .= ' | ' . $this->makeKnownLinkObj( $wgTitle,
+ $s[] .= $this->makeKnownLinkObj( $wgTitle,
wfMsg( 'currentrev' ) );
}
if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) {
$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
$dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
- $s.= ' | <strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
+ $s[] = '<strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
# disable caching
$wgOut->setSquidMaxage(0);
$wgOut->enableClientCache(false);
$undelete = $this->getUndeleteLink();
if( !empty( $undelete ) ) {
- $s .= ' | '.$undelete;
+ $s[] = $undelete;
}
- return $s;
+ return $wgLang->pipeList( $s );
}
function getUndeleteLink() {
}
function printableLink() {
- global $wgOut, $wgFeedClasses, $wgRequest;
+ global $wgOut, $wgFeedClasses, $wgRequest, $wgLang;
$printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
- $s = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
+ $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
if( $wgOut->isSyndicated() ) {
foreach( $wgFeedClasses as $format => $class ) {
$feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
- $s .= " | <a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\" class=\"feedlink\">{$format}</a>";
+ $s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\" class=\"feedlink\">{$format}</a>";
}
}
- return $s;
+ return $wgLang->pipeList( $s );
}
function pageTitle() {
$getlink = $this->makeKnownLinkObj( $linkObj, htmlspecialchars( $display ) );
$c++;
if ($c>1) {
- $subpages .= ' | ';
+ $subpages .= wfMsgExt( 'pipe-separator' , 'escapenoentities' );
} else {
$subpages .= '< ';
}
$ret .= $this->link( $wgUser->getUserPage(),
htmlspecialchars( $wgUser->getName() ) );
$ret .= " ($talkLink)<br />";
- $ret .= $this->link(
- SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
- array(), array( 'returnto' => $returnTo )
- );
- $ret .= ' | ' . $this->specialLink( 'preferences' );
- }
- $ret .= ' | ' . $this->link(
- Title::newFromText( wfMsgForContent( 'helppage' ) ),
- wfMsg( 'help' )
- );
+ $ret .= $wgLang->pipeList( array(
+ $this->link(
+ SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
+ array(), array( 'returnto' => $returnTo )
+ ),
+ $this->specialLink( 'preferences' ),
+ ) );
+ }
+ $ret = $wgLang->pipeList( array(
+ $ret,
+ $this->link(
+ Title::newFromText( wfMsgForContent( 'helppage' ) ),
+ wfMsg( 'help' )
+ ),
+ ) );
return $ret;
}
function topLinks() {
global $wgOut;
- $sep = " |\n";
- $s = $this->mainPageLink() . $sep
- . $this->specialLink( 'recentchanges' );
+ $s = array(
+ $this->mainPageLink(),
+ $this->specialLink( 'recentchanges' )
+ );
if ( $wgOut->isArticleRelated() ) {
- $s .= $sep . $this->editThisPage()
- . $sep . $this->historyLink();
+ $s[] = $this->editThisPage();
+ $s[] = $this->historyLink();
}
# Many people don't like this dropdown box
- #$s .= $sep . $this->specialPagesList();
+ #$s[] = $this->specialPagesList();
- $s .= $this->variantLinks();
+ if( $this->variantLinks() ) {
+ $s = $this->variantLinks();
+ }
- $s .= $this->extensionTabLinks();
+ if( $this->extensionTabLinks() ) {
+ $s[] = $this->extensionTabLinks();
+ }
- return $s;
+ // FIXME: Is using Language::pipeList impossible here? Do not quite understand the use of the newline
+ return implode( $s, wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . "\n" );
}
/**
*/
function extensionTabLinks() {
$tabs = array();
- $s = '';
+ $out = '';
+ $s = array();
wfRunHooks( 'SkinTemplateTabs', array( $this, &$tabs ) );
foreach( $tabs as $tab ) {
- $s .= ' | ' . Xml::element( 'a',
+ $s[] = Xml::element( 'a',
array( 'href' => $tab['href'] ),
$tab['text'] );
}
- return $s;
+
+ if( count( $s ) ) {
+ global $wgLang;
+
+ $out = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
+ $out .= $wgLang->pipeList( $s );
+ }
+
+ return $out;
}
/**
function variantLinks() {
$s = '';
/* show links to different language variants */
- global $wgDisableLangConversion, $wgContLang, $wgTitle;
+ global $wgDisableLangConversion, $wgLang, $wgContLang, $wgTitle;
$variants = $wgContLang->getVariants();
if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
foreach( $variants as $code ) {
$varname = $wgContLang->getVariantname( $code );
if( $varname == 'disable' )
continue;
- $s .= ' | <a href="' . $wgTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>';
+ $s = $wgLang->pipeList( array( $s, '<a href="' . $wgTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>' ) );
}
}
return $s;
function bottomLinks() {
global $wgOut, $wgUser, $wgTitle, $wgUseTrackbacks;
- $sep = " |\n";
+ $sep = wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . "\n";
$s = '';
if ( $wgOut->isArticleRelated() ) {
- $s .= '<strong>' . $this->editThisPage() . '</strong>';
+ $element[] = '<strong>' . $this->editThisPage() . '</strong>';
if ( $wgUser->isLoggedIn() ) {
- $s .= $sep . $this->watchThisPage();
+ $element[] = $this->watchThisPage();
}
- $s .= $sep . $this->talkLink()
- . $sep . $this->historyLink()
- . $sep . $this->whatLinksHere()
- . $sep . $this->watchPageLinksLink();
+ $element[] = $this->talkLink();
+ $element[] = $this->historyLink();
+ $element[] = $this->whatLinksHere();
+ $element[] = $this->watchPageLinksLink();
if ($wgUseTrackbacks)
- $s .= $sep . $this->trackbackLink();
+ $element[] = $this->trackbackLink();
if ( $wgTitle->getNamespace() == NS_USER
|| $wgTitle->getNamespace() == NS_USER_TALK )
$ip=User::isIP($wgTitle->getText());
if($id || $ip) { # both anons and non-anons have contri list
- $s .= $sep . $this->userContribsLink();
+ $element[] = $this->userContribsLink();
}
if( $this->showEmailUser( $id ) ) {
- $s .= $sep . $this->emailUserLink();
+ $element[] = $this->emailUserLink();
}
}
+
+ $s = implode( $element, $sep );
+
if ( $wgTitle->getArticleId() ) {
$s .= "\n<br />";
if($wgUser->isAllowed('delete')) { $s .= $this->deleteThisPage(); }
}
$s .= "<br />\n" . $this->otherLanguages();
}
+
return $s;
}
$first = true;
if($wgContLang->isRTL()) $s .= '<span dir="LTR">';
foreach( $a as $l ) {
- if ( ! $first ) { $s .= ' | '; }
+ if ( ! $first ) { $s .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ); }
$first = false;
$nt = Title::newFromText( $l );
function doAfterContent()
{
- global $wgOut;
+ global $wgOut, $wgLang;
$s = "\n</div><br clear='all' />\n";
$s .= "<td class='bottom' align='center' valign='top'>";
$s .= $this->bottomLinks();
- $s .= "\n<br />" . $this->makeKnownLinkObj( Title::newMainPage() ) . " | "
- . $this->aboutLink() . " | "
- . $this->searchForm( wfMsg( "qbfind" ) );
+ $s .= $wgLang->pipeList( array(
+ "\n<br />" . $this->makeKnownLinkObj( Title::newMainPage() ),
+ $this->aboutLink(),
+ $this->searchForm( wfMsg( "qbfind" ) )
+ ) );
$s .= "\n<br />" . $this->pageStats();
}
function sysLinks() {
- global $wgUser, $wgContLang, $wgTitle;
+ global $wgUser, $wgLang, $wgContLang, $wgTitle;
$li = $wgContLang->specialPage("Userlogin");
$lo = $wgContLang->specialPage("Userlogout");
$q = "returnto={$rt}";
}
- $s = "" .
- $this->mainPageLink()
- . " | " .
- $this->makeKnownLink( wfMsgForContent( "aboutpage" ), wfMsg( "about" ) )
- . " | " .
- $this->makeKnownLink( wfMsgForContent( "helppage" ), wfMsg( "help" ) )
- . " | " .
- $this->makeKnownLink( wfMsgForContent( "faqpage" ), wfMsg("faq") )
- . " | " .
- $this->specialLink( "specialpages" );
+ $s = array(
+ $this->mainPageLink(),
+ $this->makeKnownLink( wfMsgForContent( "aboutpage" ), wfMsg( "about" ) ),
+ $this->makeKnownLink( wfMsgForContent( "helppage" ), wfMsg( "help" ) ),
+ $this->makeKnownLink( wfMsgForContent( "faqpage" ), wfMsg("faq") ),
+ $this->specialLink( "specialpages" )
+ );
/* show links to different language variants */
- $s .= $this->variantLinks();
- $s .= $this->extensionTabLinks();
-
- $s .= " | ";
+ if( $this->variantLinks() ) {
+ $s[] = $this->variantLinks();
+ }
+ if( $this->extensionTabLinks() ) {
+ $s[] = $this->extensionTabLinks();
+ }
if ( $wgUser->isLoggedIn() ) {
- $s .= $this->makeKnownLink( $lo, wfMsg( "logout" ), $q );
+ $s[] = $this->makeKnownLink( $lo, wfMsg( "logout" ), $q );
} else {
- $s .= $this->makeKnownLink( $li, wfMsg( "login" ), $q );
+ $s[] = $this->makeKnownLink( $li, wfMsg( "login" ), $q );
}
- return $s;
+ return $wgLang->pipeList( $s );
}
/**