http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97807
Revision: 97807
Author: reedy
Date: 2011-09-22 11:06:48 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Fix mixed tabs and spaces from r97793
Couple of minor style tweaks also
Modified Paths:
--------------
trunk/phase3/languages/Language.php
Modified: trunk/phase3/languages/Language.php
===================================================================
--- trunk/phase3/languages/Language.php 2011-09-22 11:04:30 UTC (rev 97806)
+++ trunk/phase3/languages/Language.php 2011-09-22 11:06:48 UTC (rev 97807)
@@ -2612,12 +2612,11 @@
*/
function commafy( $_ ) {
$digitGroupingPattern = $this->digitGroupingPattern();
-
+
if ( !$digitGroupingPattern || $digitGroupingPattern ===
"###,###,###" ) {
//default grouping is at thousands, use the same for
###,###,### pattern too.
return strrev( (string)preg_replace(
'/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) );
- }
- else {
+ } else {
// Ref:
http://cldr.unicode.org/translation/number-patterns
$numberpart = array();
$decimalpart = array();
@@ -2625,28 +2624,27 @@
preg_match( "/\d+/", $_, $numberpart );
preg_match( "/\.\d*/", $_, $decimalpart );
$groupedNumber = ( count( $decimalpart ) > 0 ) ?
$decimalpart[0]:"";
- if ( $groupedNumber === $_){
- //the string does not have any number part. Eg:
.12345
- return $groupedNumber;
+ if ( $groupedNumber === $_ ){
+ //the string does not have any number part. Eg:
.12345
+ return $groupedNumber;
}
$start = $end = strlen( $numberpart[0] );
- while ( $start > 0 )
- {
- $match = $matches[0][$numMatches -1] ;
- $matchLen = strlen( $match );
- $start = $end - $matchLen;
- if ( $start < 0 ) {
- $start = 0;
- }
- $groupedNumber = substr( $_ , $start, $end -$start
) . $groupedNumber ;
- $end = $start;
- if ( $numMatches > 1 ) {
- // use the last pattern for the rest of the
number
- $numMatches--;
- }
- if ( $start > 0 ) {
- $groupedNumber = "," . $groupedNumber;
- }
+ while ( $start > 0 ) {
+ $match = $matches[0][$numMatches -1] ;
+ $matchLen = strlen( $match );
+ $start = $end - $matchLen;
+ if ( $start < 0 ) {
+ $start = 0;
+ }
+ $groupedNumber = substr( $_ , $start, $end
-$start ) . $groupedNumber ;
+ $end = $start;
+ if ( $numMatches > 1 ) {
+ // use the last pattern for the rest of
the number
+ $numMatches--;
+ }
+ if ( $start > 0 ) {
+ $groupedNumber = "," . $groupedNumber;
+ }
}
return $groupedNumber;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
