| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1271,6 +1271,7 @@ |
| 1272 | 1272 | |
| 1273 | 1273 | $cancel = $sk->makeKnownLink( $wgTitle->getPrefixedText(), |
| 1274 | 1274 | wfMsgExt('cancel', array('parseinline')) ); |
| | 1275 | + $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); |
| 1275 | 1276 | $edithelpurl = Skin::makeInternalOrExternalUrl( wfMsgForContent( 'edithelppage' )); |
| 1276 | 1277 | $edithelp = '<a target="helpwindow" href="'.$edithelpurl.'">'. |
| 1277 | 1278 | htmlspecialchars( wfMsg( 'edithelp' ) ).'</a> '. |
| — | — | @@ -1445,7 +1446,7 @@ |
| 1446 | 1447 | $wgOut->addHTML( |
| 1447 | 1448 | "<div class='editButtons'> |
| 1448 | 1449 | {$buttonshtml} |
| 1449 | | - <span class='editHelp'>{$cancel} | {$edithelp}</span> |
| | 1450 | + <span class='editHelp'>{$cancel}{$separator}{$edithelp}</span> |
| 1450 | 1451 | </div><!-- editButtons --> |
| 1451 | 1452 | </div><!-- editOptions -->"); |
| 1452 | 1453 | |
| Index: trunk/phase3/includes/LogEventsList.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | private function getFilterLinks( $logType, $filter ) { |
| 97 | | - global $wgTitle; |
| | 97 | + global $wgTitle, $wgLang; |
| 98 | 98 | // show/hide links |
| 99 | 99 | $messages = array( wfMsgHtml( 'show' ), wfMsgHtml( 'hide' ) ); |
| 100 | 100 | // Option value -> message mapping |
| — | — | @@ -106,7 +106,7 @@ |
| 107 | 107 | $links[$type] = wfMsgHtml( "log-show-hide-{$type}", $link ); |
| 108 | 108 | } |
| 109 | 109 | // Build links |
| 110 | | - return implode( ' | ', $links ); |
| | 110 | + return $wgLang->pipeList( $links ); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | private function getDefaultQuery() { |
| Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php |
| — | — | @@ -62,6 +62,8 @@ |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | function getNavigationBar() { |
| | 66 | + global $wgLang; |
| | 67 | + |
| 66 | 68 | if ( isset( $this->mNavigationBar ) ) { |
| 67 | 69 | return $this->mNavigationBar; |
| 68 | 70 | } |
| — | — | @@ -74,9 +76,9 @@ |
| 75 | 77 | |
| 76 | 78 | $pagingLinks = $this->getPagingLinks( $linkTexts ); |
| 77 | 79 | $limitLinks = $this->getLimitLinks(); |
| 78 | | - $limits = implode( ' | ', $limitLinks ); |
| | 80 | + $limits = $wgLang->pipeList( $limitLinks ); |
| 79 | 81 | |
| 80 | | - $this->mNavigationBar = "({$pagingLinks['first']} | {$pagingLinks['last']}) " . |
| | 82 | + $this->mNavigationBar = "(" . $wgLang->pipeList( array( $pagingLinks['first'], $pagingLinks['last'] ) ) . ") " . |
| 81 | 83 | wfMsgExt( 'viewprevnext', array( 'parsemag' ), $pagingLinks['prev'], $pagingLinks['next'], $limits ); |
| 82 | 84 | return $this->mNavigationBar; |
| 83 | 85 | } |
| — | — | @@ -308,7 +310,7 @@ |
| 309 | 311 | |
| 310 | 312 | wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) ); |
| 311 | 313 | |
| 312 | | - $links = implode( ' | ', $tools ); |
| | 314 | + $links = $wgLang->pipeList( $tools ); |
| 313 | 315 | } |
| 314 | 316 | |
| 315 | 317 | // Old message 'contribsub' had one parameter, but that doesn't work for |