Skip to content
Extraits de code Groupes Projets
Valider b33917db rédigé par sgiehl's avatar sgiehl
Parcourir les fichiers

use number formats for row evolution popover

parent d19db820
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -82,7 +82,7 @@ class NumberFormatter extends Singleton
}
/**
* Formats a given number
* Formats a given number or percent value (if $value starts or ends with a %)
*
* @param string|int|float $value
* @param int $maximumFractionDigits
......@@ -91,15 +91,11 @@ class NumberFormatter extends Singleton
*/
public function format($value, $maximumFractionDigits=0, $minimumFractionDigits=0)
{
static $positivePattern, $negativePattern;
if (empty($positivePatter) || empty($negativePattern)) {
list($positivePattern, $negativePattern) = $this->parsePattern($this->patternNumber);
if (trim($value, '%') != $value) {
return $this->formatPercent($value);
}
$negative = (bccomp('0', $value, 12) == 1);
$pattern = $negative ? $negativePattern : $positivePattern;
return $this->formatNumberWithPattern($pattern, $value, $maximumFractionDigits, $minimumFractionDigits);
return $this->formatNumber($value, $maximumFractionDigits, $minimumFractionDigits);
}
/**
......@@ -114,7 +110,16 @@ class NumberFormatter extends Singleton
*/
public function formatNumber($value, $maximumFractionDigits=0, $minimumFractionDigits=0)
{
return $this->format($value, $maximumFractionDigits, $minimumFractionDigits);
static $positivePattern, $negativePattern;
if (empty($positivePatter) || empty($negativePattern)) {
list($positivePattern, $negativePattern) = $this->parsePattern($this->patternNumber);
}
$negative = (bccomp('0', $value, 12) == 1);
$pattern = $negative ? $negativePattern : $positivePattern;
return $this->formatNumberWithPattern($pattern, $value, $maximumFractionDigits, $minimumFractionDigits);
}
/**
......
......@@ -15,6 +15,7 @@ use Piwik\Common;
use Piwik\DataTable;
use Piwik\Date;
use Piwik\Metrics;
use Piwik\NumberFormatter;
use Piwik\Period\Factory as PeriodFactory;
use Piwik\Piwik;
use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution as EvolutionViz;
......@@ -231,7 +232,10 @@ class RowEvolution
$change = isset($metricData['change']) ? $metricData['change'] : false;
list($first, $last) = $this->getFirstAndLastDataPointsForMetric($metric);
$details = Piwik::translate('RowEvolution_MetricBetweenText', array($first, $last));
$details = Piwik::translate('RowEvolution_MetricBetweenText', array(
NumberFormatter::getInstance()->format($first),
NumberFormatter::getInstance()->format($last)
));
if ($change !== false) {
$lowerIsBetter = Metrics::isLowerValueBetter($metric);
......@@ -258,7 +262,11 @@ class RowEvolution
$min = isset($metricData['min']) ? $metricData['min'] : 0;
$min .= $unit;
$max .= $unit;
$minmax = Piwik::translate('RowEvolution_MetricMinMax', array($metricData['name'], $min, $max));
$minmax = Piwik::translate('RowEvolution_MetricMinMax', array(
$metricData['name'],
NumberFormatter::getInstance()->formatNumber($min),
NumberFormatter::getInstance()->formatNumber($max)
));
$newMetric = array(
'label' => $metricData['name'],
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter