| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -3579,7 +3579,7 @@ |
| 3580 | 3580 | 'comma-separator' => ', ', # only translate this message to other languages if you have to change it |
| 3581 | 3581 | 'colon-separator' => ': ', # only translate this message to other languages if you have to change it |
| 3582 | 3582 | 'autocomment-prefix' => '- ', # only translate this message to other languages if you have to change it |
| 3583 | | -'pipe-separator' => '|', # only translate this message to other languages if you have to change it |
| | 3583 | +'pipe-separator' => ' | ', # only translate this message to other languages if you have to change it |
| 3584 | 3584 | 'word-separator' => ' ', # only translate this message to other languages if you have to change it |
| 3585 | 3585 | 'ellipsis' => '…', # only translate this message to other languages if you have to change it |
| 3586 | 3586 | |
| Index: trunk/phase3/languages/messages/MessagesOc.php |
| — | — | @@ -2912,7 +2912,7 @@ |
| 2913 | 2913 | # Separators for various lists, etc. |
| 2914 | 2914 | 'colon-separator' => ' : ', |
| 2915 | 2915 | 'autocomment-prefix' => '-', |
| 2916 | | -'pipe-separator' => '•', |
| | 2916 | +'pipe-separator' => ' • ', |
| 2917 | 2917 | |
| 2918 | 2918 | # Multipage image navigation |
| 2919 | 2919 | 'imgmultipageprev' => '← pagina precedenta', |
| Index: trunk/phase3/includes/Pager.php |
| — | — | @@ -530,7 +530,7 @@ |
| 531 | 531 | |
| 532 | 532 | $pagingLinks = $this->getPagingLinks( $linkTexts ); |
| 533 | 533 | $limitLinks = $this->getLimitLinks(); |
| 534 | | - $limits = implode( ' | ', $limitLinks ); |
| | 534 | + $limits = $wgLang->pipeList( $limitLinks ); |
| 535 | 535 | |
| 536 | 536 | $this->mNavigationBar = |
| 537 | 537 | "({$pagingLinks['first']} | {$pagingLinks['last']}) " . |
| — | — | @@ -549,7 +549,7 @@ |
| 550 | 550 | if( $first ) { |
| 551 | 551 | $first = false; |
| 552 | 552 | } else { |
| 553 | | - $extra .= ' | '; |
| | 553 | + $extra .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ); |
| 554 | 554 | } |
| 555 | 555 | |
| 556 | 556 | if( $order == $this->mOrderType ) { |
| — | — | @@ -610,9 +610,9 @@ |
| 611 | 611 | |
| 612 | 612 | $pagingLinks = $this->getPagingLinks( $linkTexts ); |
| 613 | 613 | $limitLinks = $this->getLimitLinks(); |
| 614 | | - $limits = implode( ' | ', $limitLinks ); |
| | 614 | + $limits = $wgLang->pipeList( $limitLinks ); |
| 615 | 615 | |
| 616 | | - $this->mNavigationBar = "({$pagingLinks['first']} | {$pagingLinks['last']}) " . |
| | 616 | + $this->mNavigationBar = "({$pagingLinks['first']}" . wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . "{$pagingLinks['last']}) " . |
| 617 | 617 | wfMsgHtml("viewprevnext", $pagingLinks['prev'], $pagingLinks['next'], $limits); |
| 618 | 618 | return $this->mNavigationBar; |
| 619 | 619 | } |
| Index: trunk/phase3/includes/specials/SpecialIpblocklist.php |
| — | — | @@ -306,7 +306,7 @@ |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | function searchForm() { |
| 310 | | - global $wgTitle, $wgScript, $wgRequest; |
| | 310 | + global $wgTitle, $wgScript, $wgRequest, $wgLang; |
| 311 | 311 | |
| 312 | 312 | $showhide = array( wfMsg( 'show' ), wfMsg( 'hide' ) ); |
| 313 | 313 | $nondefaults = array(); |
| — | — | @@ -330,7 +330,7 @@ |
| 331 | 331 | $links[] = wfMsgHtml( 'ipblocklist-sh-userblocks', $ubLink ); |
| 332 | 332 | $links[] = wfMsgHtml( 'ipblocklist-sh-tempblocks', $tbLink ); |
| 333 | 333 | $links[] = wfMsgHtml( 'ipblocklist-sh-addressblocks', $sipbLink ); |
| 334 | | - $hl = implode( ' ' . wfMsg( 'pipe-separator' ) . ' ', $links ); |
| | 334 | + $hl = $wgLang->pipeList( $links ); |
| 335 | 335 | |
| 336 | 336 | return |
| 337 | 337 | Xml::tags( 'form', array( 'action' => $wgScript ), |
| — | — | @@ -418,7 +418,7 @@ |
| 419 | 419 | $properties[] = $msg['blocklist-nousertalk']; |
| 420 | 420 | } |
| 421 | 421 | |
| 422 | | - $properties = implode( ', ', $properties ); |
| | 422 | + $properties = $wgLang->commaList( $properties ); |
| 423 | 423 | |
| 424 | 424 | $line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $blocker, $target, $properties ) ); |
| 425 | 425 | |
| — | — | @@ -434,7 +434,7 @@ |
| 435 | 435 | |
| 436 | 436 | # Create changeblocklink for all blocks with exception of autoblocks |
| 437 | 437 | if( !$block->mAuto ) { |
| 438 | | - $changeblocklink = ' ' . wfMsg( 'pipe-separator' ) . ' ' . |
| | 438 | + $changeblocklink = wfMsg( 'pipe-separator' ) . |
| 439 | 439 | $sk->link( SpecialPage::getTitleFor( 'Blockip', $block->mAddress ), |
| 440 | 440 | $msg['change-blocklink'], |
| 441 | 441 | array(), array(), 'known' ); |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -1053,7 +1053,7 @@ |
| 1054 | 1054 | * @return string |
| 1055 | 1055 | */ |
| 1056 | 1056 | public function userToolLinks( $userId, $userText, $redContribsWhenNoEdits = false, $flags = 0, $edits=null ) { |
| 1057 | | - global $wgUser, $wgDisableAnonTalk, $wgSysopUserBans; |
| | 1057 | + global $wgUser, $wgDisableAnonTalk, $wgSysopUserBans, $wgLang; |
| 1058 | 1058 | $talkable = !( $wgDisableAnonTalk && 0 == $userId ); |
| 1059 | 1059 | $blockable = ( $wgSysopUserBans || 0 == $userId ) && !$flags & self::TOOL_LINKS_NOBLOCK; |
| 1060 | 1060 | |
| — | — | @@ -1079,7 +1079,7 @@ |
| 1080 | 1080 | } |
| 1081 | 1081 | |
| 1082 | 1082 | if( $items ) { |
| 1083 | | - return ' <span class="mw-usertoollinks">(' . implode( ' | ', $items ) . ')</span>'; |
| | 1083 | + return ' <span class="mw-usertoollinks">(' . $wgLang->pipeList( $items ) . ')</span>'; |
| 1084 | 1084 | } else { |
| 1085 | 1085 | return ''; |
| 1086 | 1086 | } |
| Index: trunk/phase3/includes/PageHistory.php |
| — | — | @@ -358,7 +358,7 @@ |
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | if( $tools ) { |
| 362 | | - $s .= ' (' . implode( ' | ', $tools ) . ')'; |
| | 362 | + $s .= ' (' . $wgLang->pipeList( $tools ) . ')'; |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | # Tags |
| Index: trunk/phase3/includes/LogEventsList.php |
| — | — | @@ -280,7 +280,7 @@ |
| 281 | 281 | array(), |
| 282 | 282 | array( 'action' => 'unblock', 'ip' => $row->log_title ), |
| 283 | 283 | 'known' ) |
| 284 | | - . ' ' . $this->message['pipe-separator'] . ' ' . |
| | 284 | + . $this->message['pipe-separator'] . |
| 285 | 285 | $this->skin->link( SpecialPage::getTitleFor( 'Blockip', $row->log_title ), |
| 286 | 286 | $this->message['change-blocklink'], |
| 287 | 287 | array(), array(), 'known' ) . |
| — | — | @@ -293,7 +293,7 @@ |
| 294 | 294 | array(), |
| 295 | 295 | array( 'action' => 'history', 'offset' => $row->log_timestamp ) ); |
| 296 | 296 | if( $wgUser->isAllowed( 'protect' ) ) { |
| 297 | | - $revert .= ' ' . $this->message['pipe-separator'] . ' ' . |
| | 297 | + $revert .= $this->message['pipe-separator'] . |
| 298 | 298 | $this->skin->link( $title, |
| 299 | 299 | $this->message['protect_change'], |
| 300 | 300 | array(), |
| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -986,11 +986,11 @@ |
| 987 | 987 | } else { |
| 988 | 988 | $nlink = '<a href="' . $title->escapeLocalUrl( $q ) . "\" class=\"mw-nextlink\">{$next}</a>"; |
| 989 | 989 | } |
| 990 | | - $nums = wfNumLink( $offset, 20, $title, $query ) . ' | ' . |
| 991 | | - wfNumLink( $offset, 50, $title, $query ) . ' | ' . |
| 992 | | - wfNumLink( $offset, 100, $title, $query ) . ' | ' . |
| 993 | | - wfNumLink( $offset, 250, $title, $query ) . ' | ' . |
| 994 | | - wfNumLink( $offset, 500, $title, $query ); |
| | 990 | + $nums = $wgLang->pipeList( wfNumLink( $offset, 20, $title, $query ), |
| | 991 | + wfNumLink( $offset, 50, $title, $query ), |
| | 992 | + wfNumLink( $offset, 100, $title, $query ), |
| | 993 | + wfNumLink( $offset, 250, $title, $query ), |
| | 994 | + wfNumLink( $offset, 500, $title, $query ) ); |
| 995 | 995 | |
| 996 | 996 | return wfMsg( 'viewprevnext', $plink, $nlink, $nums ); |
| 997 | 997 | } |