| Index: trunk/phase3/CREDITS |
| — | — | @@ -184,6 +184,7 @@ |
| 185 | 185 | * Ville Stadista |
| 186 | 186 | * Vitaliy Filippov |
| 187 | 187 | * William Demchick |
| | 188 | +* Yusuke Matsubara |
| 188 | 189 | * Yuvaraj Pandian T |
| 189 | 190 | * Zachary Hauri |
| 190 | 191 | |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -995,7 +995,7 @@ |
| 996 | 996 | wfRunHooks( 'UserToolLinksEdit', array( $userId, $userText, &$items ) ); |
| 997 | 997 | |
| 998 | 998 | if ( $items ) { |
| 999 | | - return ' <span class="mw-usertoollinks">(' . $wgLang->pipeList( $items ) . ')</span>'; |
| | 999 | + return ' <span class="mw-usertoollinks">' . wfMessage( 'parentheses' )->rawParams( $wgLang->pipeList( $items ) )->escaped() . '</span>'; |
| 1000 | 1000 | } else { |
| 1001 | 1001 | return ''; |
| 1002 | 1002 | } |
| Index: trunk/phase3/includes/actions/HistoryAction.php |
| — | — | @@ -523,7 +523,7 @@ |
| 524 | 524 | $histLinks = Html::rawElement( |
| 525 | 525 | 'span', |
| 526 | 526 | array( 'class' => 'mw-history-histlinks' ), |
| 527 | | - '(' . $curlink . $this->historyPage->message['pipe-separator'] . $lastlink . ') ' |
| | 527 | + $this->msg( 'parentheses' )->rawParams( $curlink . $this->historyPage->message['pipe-separator'] . $lastlink )->escaped() |
| 528 | 528 | ); |
| 529 | 529 | $s = $histLinks . $diffButtons; |
| 530 | 530 | |
| — | — | @@ -619,7 +619,7 @@ |
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | if ( $tools ) { |
| 623 | | - $s .= ' (' . $lang->pipeList( $tools ) . ')'; |
| | 623 | + $s .= $this->msg( 'parentheses' )->rawParams( $lang->pipeList( $tools ) )->escaped(); |
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | # Tags |
| Index: trunk/phase3/includes/ChangesList.php |
| — | — | @@ -252,7 +252,7 @@ |
| 253 | 253 | public function insertLog( &$s, $title, $logtype ) { |
| 254 | 254 | $page = new LogPage( $logtype ); |
| 255 | 255 | $logname = $page->getName()->escaped(); |
| 256 | | - $s .= '(' . Linker::linkKnown( $title, $logname ) . ')'; |
| | 256 | + $s .= $this->msg( 'parentheses' )->rawParams( Linker::linkKnown( $title, $logname ) )->escaped(); |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | /** |
| — | — | @@ -284,9 +284,9 @@ |
| 285 | 285 | $query |
| 286 | 286 | ); |
| 287 | 287 | } |
| 288 | | - $s .= '(' . $diffLink . $this->message['pipe-separator']; |
| | 288 | + $diffhist = $diffLink . $this->message['pipe-separator']; |
| 289 | 289 | # History link |
| 290 | | - $s .= Linker::linkKnown( |
| | 290 | + $diffhist .= Linker::linkKnown( |
| 291 | 291 | $rc->getTitle(), |
| 292 | 292 | $this->message['hist'], |
| 293 | 293 | array(), |
| — | — | @@ -295,7 +295,7 @@ |
| 296 | 296 | 'action' => 'history' |
| 297 | 297 | ) |
| 298 | 298 | ); |
| 299 | | - $s .= ') . . '; |
| | 299 | + $s .= $this->msg( 'parentheses' )->rawParams( $diffhist )->escaped() . ' . . '; |
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | /** |
| — | — | @@ -679,7 +679,7 @@ |
| 680 | 680 | $logtitle = SpecialPage::getTitleFor( 'Log', $logType ); |
| 681 | 681 | $logpage = new LogPage( $logType ); |
| 682 | 682 | $logname = $logpage->getName()->escaped(); |
| 683 | | - $clink = '(' . Linker::linkKnown( $logtitle, $logname ) . ')'; |
| | 683 | + $clink = $this->msg( 'parentheses' )->rawParams( Linker::linkKnown( $logtitle, $logname ) )->escaped(); |
| 684 | 684 | } else { |
| 685 | 685 | $clink = Linker::link( $rc->getTitle() ); |
| 686 | 686 | } |
| — | — | @@ -852,7 +852,7 @@ |
| 853 | 853 | $text = $userlink; |
| 854 | 854 | $text .= $this->getLanguage()->getDirMark(); |
| 855 | 855 | if( $count > 1 ) { |
| 856 | | - $text .= ' (' . $this->getLanguage()->formatNum( $count ) . '×)'; |
| | 856 | + $text .= ' ' . $this->msg( 'parentheses' )->rawParams( $this->getLanguage()->formatNum( $count ) . '×' )->escaped(); |
| 857 | 857 | } |
| 858 | 858 | array_push( $users, $text ); |
| 859 | 859 | } |
| — | — | @@ -894,18 +894,18 @@ |
| 895 | 895 | } |
| 896 | 896 | # Total change link |
| 897 | 897 | $r .= ' '; |
| | 898 | + $logtext = ''; |
| 898 | 899 | if( !$allLogs ) { |
| 899 | | - $r .= '('; |
| 900 | 900 | if( !ChangesList::userCan( $rcObj, Revision::DELETED_TEXT, $this->getUser() ) ) { |
| 901 | | - $r .= $nchanges[$n]; |
| | 901 | + $logtext .= $nchanges[$n]; |
| 902 | 902 | } elseif( $isnew ) { |
| 903 | | - $r .= $nchanges[$n]; |
| | 903 | + $logtext .= $nchanges[$n]; |
| 904 | 904 | } else { |
| 905 | 905 | $params = $queryParams; |
| 906 | 906 | $params['diff'] = $currentRevision; |
| 907 | 907 | $params['oldid'] = $oldid; |
| 908 | 908 | |
| 909 | | - $r .= Linker::link( |
| | 909 | + $logtext .= Linker::link( |
| 910 | 910 | $block[0]->getTitle(), |
| 911 | 911 | $nchanges[$n], |
| 912 | 912 | array(), |
| — | — | @@ -919,19 +919,24 @@ |
| 920 | 920 | if( $allLogs ) { |
| 921 | 921 | // don't show history link for logs |
| 922 | 922 | } elseif( $namehidden || !$block[0]->getTitle()->exists() ) { |
| 923 | | - $r .= $this->message['pipe-separator'] . $this->message['hist'] . ')'; |
| | 923 | + $logtext .= $this->message['pipe-separator'] . $this->message['hist']; |
| 924 | 924 | } else { |
| 925 | 925 | $params = $queryParams; |
| 926 | 926 | $params['action'] = 'history'; |
| 927 | 927 | |
| 928 | | - $r .= $this->message['pipe-separator'] . |
| | 928 | + $logtext .= $this->message['pipe-separator'] . |
| 929 | 929 | Linker::linkKnown( |
| 930 | 930 | $block[0]->getTitle(), |
| 931 | 931 | $this->message['hist'], |
| 932 | 932 | array(), |
| 933 | 933 | $params |
| 934 | | - ) . ')'; |
| | 934 | + ); |
| 935 | 935 | } |
| | 936 | + |
| | 937 | + if( $logtext != '' ) { |
| | 938 | + $r .= $this->msg( 'parentheses' )->rawParams( $logtext )->escaped(); |
| | 939 | + } |
| | 940 | + |
| 936 | 941 | $r .= ' . . '; |
| 937 | 942 | |
| 938 | 943 | # Character difference (does not apply if only log items) |
| — | — | @@ -1003,11 +1008,7 @@ |
| 1004 | 1009 | $r .= $link . '</span>'; |
| 1005 | 1010 | |
| 1006 | 1011 | if ( !$type == RC_LOG || $type == RC_NEW ) { |
| 1007 | | - $r .= ' ('; |
| 1008 | | - $r .= $rcObj->curlink; |
| 1009 | | - $r .= $this->message['pipe-separator']; |
| 1010 | | - $r .= $rcObj->lastlink; |
| 1011 | | - $r .= ')'; |
| | 1012 | + $r .= $this->msg( 'parentheses' )->rawParams( $rcObj->curlink . $this->message['pipe-separator'] . $rcObj->lastlink )->escaped(); |
| 1012 | 1013 | } |
| 1013 | 1014 | $r .= ' . . '; |
| 1014 | 1015 | |
| — | — | @@ -1126,20 +1127,19 @@ |
| 1127 | 1128 | if( $logType ) { |
| 1128 | 1129 | $logtitle = SpecialPage::getTitleFor( 'Log', $logType ); |
| 1129 | 1130 | $logname = LogPage::logName( $logType ); |
| 1130 | | - $r .= '(' . Linker::linkKnown( $logtitle, htmlspecialchars( $logname ) ) . ')'; |
| | 1131 | + $r .= $this->msg( 'parentheses' )->rawParams( Linker::linkKnown( $logtitle, htmlspecialchars( $logname ) ) )->escaped(); |
| 1131 | 1132 | } else { |
| 1132 | 1133 | $this->insertArticleLink( $r, $rcObj, $rcObj->unpatrolled, $rcObj->watched ); |
| 1133 | 1134 | } |
| 1134 | 1135 | # Diff and hist links |
| 1135 | 1136 | if ( $type != RC_LOG ) { |
| 1136 | | - $r .= ' ('. $rcObj->difflink . $this->message['pipe-separator']; |
| 1137 | 1137 | $query['action'] = 'history'; |
| 1138 | | - $r .= Linker::linkKnown( |
| | 1138 | + $r .= $this->msg( 'parentheses' )->rawParams( $rcObj->difflink . $this->message['pipe-separator'] . Linker::linkKnown( |
| 1139 | 1139 | $rcObj->getTitle(), |
| 1140 | 1140 | $this->message['hist'], |
| 1141 | 1141 | array(), |
| 1142 | 1142 | $query |
| 1143 | | - ) . ')'; |
| | 1143 | + ) )->escaped(); |
| 1144 | 1144 | } |
| 1145 | 1145 | $r .= ' . . '; |
| 1146 | 1146 | # Character diff |