| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -1440,7 +1440,7 @@ |
| 1441 | 1441 | } else { |
| 1442 | 1442 | global $wgLang; |
| 1443 | 1443 | $stxt = wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $size ) ); |
| 1444 | | - $stxt = "($stxt)"; |
| | 1444 | + $stxt = wfMessage( 'parentheses' )->rawParams( $stxt ); |
| 1445 | 1445 | } |
| 1446 | 1446 | $stxt = htmlspecialchars( $stxt ); |
| 1447 | 1447 | return "<span class=\"history-size\">$stxt</span>"; |
| — | — | @@ -1869,7 +1869,7 @@ |
| 1870 | 1870 | $html = $delete ? wfMsgHtml( 'rev-delundel' ) : wfMsgHtml( 'rev-showdeleted' ); |
| 1871 | 1871 | $tag = $restricted ? 'strong' : 'span'; |
| 1872 | 1872 | $link = self::link( $sp, $html, array(), $query, array( 'known', 'noclasses' ) ); |
| 1873 | | - return Xml::tags( $tag, array( 'class' => 'mw-revdelundel-link' ), "($link)" ); |
| | 1873 | + return Xml::tags( $tag, array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $link ) ); |
| 1874 | 1874 | } |
| 1875 | 1875 | |
| 1876 | 1876 | /** |
| — | — | @@ -1882,7 +1882,7 @@ |
| 1883 | 1883 | */ |
| 1884 | 1884 | public static function revDeleteLinkDisabled( $delete = true ) { |
| 1885 | 1885 | $html = $delete ? wfMsgHtml( 'rev-delundel' ) : wfMsgHtml( 'rev-showdeleted' ); |
| 1886 | | - return Xml::tags( 'span', array( 'class' => 'mw-revdelundel-link' ), "($html)" ); |
| | 1886 | + return Xml::tags( 'span', array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $html ) ); |
| 1887 | 1887 | } |
| 1888 | 1888 | |
| 1889 | 1889 | /* Deprecated methods */ |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -251,9 +251,11 @@ |
| 252 | 252 | // languages that want to put the "for" bit right after $user but before |
| 253 | 253 | // $links. If 'contribsub' is around, use it for reverse compatibility, |
| 254 | 254 | // otherwise use 'contribsub2'. |
| | 255 | + // @todo Should this be removed at some point? |
| 255 | 256 | $oldMsg = $this->msg( 'contribsub' ); |
| 256 | 257 | if ( $oldMsg->exists() ) { |
| 257 | | - return $oldMsg->rawParams( "$user ($links)" ); |
| | 258 | + $linksWithParentheses = $this->msg( 'parenteses' )->rawParams( $links ); |
| | 259 | + return $oldMsg->rawParams( "$user $linksWithParentheses" ); |
| 258 | 260 | } else { |
| 259 | 261 | return $this->msg( 'contribsub2' )->rawParams( $user, $links ); |
| 260 | 262 | } |
| — | — | @@ -837,7 +839,7 @@ |
| 838 | 840 | $del .= ' '; |
| 839 | 841 | } |
| 840 | 842 | |
| 841 | | - $diffHistLinks = '(' . $difftext . $this->messages['pipe-separator'] . $histlink . ')'; |
| | 843 | + $diffHistLinks = $this->msg( 'parentheses' )->rawParams( $difftext . $this->messages['pipe-separator'] . $histlink ); |
| 842 | 844 | $ret = "{$del}{$d} {$diffHistLinks}{$chardiff}{$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}"; |
| 843 | 845 | |
| 844 | 846 | # Denote if username is redacted for this edit |
| Index: trunk/phase3/includes/Pager.php |
| — | — | @@ -769,15 +769,17 @@ |
| 770 | 770 | $pagingLinks = $this->getPagingLinks( $linkTexts ); |
| 771 | 771 | $limitLinks = $this->getLimitLinks(); |
| 772 | 772 | $limits = $this->getLanguage()->pipeList( $limitLinks ); |
| | 773 | + $firstLastLinks = wfMessage( 'parentheses' )->rawParams( "{$pagingLinks['first']}" . |
| | 774 | + wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . |
| | 775 | + "{$pagingLinks['last']}" ); |
| 773 | 776 | |
| 774 | | - $this->mNavigationBar = "({$pagingLinks['first']}" . |
| 775 | | - wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . |
| 776 | | - "{$pagingLinks['last']}) " . |
| | 777 | + $this->mNavigationBar = $firstLastLinks . ' ' . |
| 777 | 778 | wfMsgHTML( |
| 778 | 779 | 'viewprevnext', |
| 779 | 780 | $pagingLinks['prev'], $pagingLinks['next'], |
| 780 | 781 | $limits |
| 781 | 782 | ); |
| | 783 | + |
| 782 | 784 | return $this->mNavigationBar; |
| 783 | 785 | } |
| 784 | 786 | |
| Index: trunk/phase3/RELEASE-NOTES-1.20 |
| — | — | @@ -34,6 +34,7 @@ |
| 35 | 35 | copy/paste on supporting browsers |
| 36 | 36 | * (bug 34428) Fixed incorrect hash mismatch errors in the DiffHistoryBlob |
| 37 | 37 | history compression method. |
| | 38 | +* (bug 34702) Special:Contributions now uses localised parentheses. |
| 38 | 39 | |
| 39 | 40 | === API changes in 1.20 === |
| 40 | 41 | * (bug 34316) Add ability to retrieve maximum upload size from MediaWiki API. |