diff options
Diffstat (limited to 'core')
| -rwxr-xr-x | core/DataTable/Filter/CalculateEvolutionFilter.php | 5 | ||||
| -rw-r--r-- | core/Metrics/Formatter.php | 3 | ||||
| -rw-r--r-- | core/Plugin/Controller.php | 4 | ||||
| -rwxr-xr-x | core/Twig.php | 9 |
4 files changed, 18 insertions, 3 deletions
diff --git a/core/DataTable/Filter/CalculateEvolutionFilter.php b/core/DataTable/Filter/CalculateEvolutionFilter.php index 5af658bad6..73274c537d 100755 --- a/core/DataTable/Filter/CalculateEvolutionFilter.php +++ b/core/DataTable/Filter/CalculateEvolutionFilter.php @@ -11,6 +11,7 @@ namespace Piwik\DataTable\Filter; use Piwik\Common; use Piwik\DataTable; use Piwik\DataTable\Row; +use Piwik\NumberFormatter; use Piwik\Site; /** @@ -157,10 +158,10 @@ class CalculateEvolutionFilter extends ColumnCallbackAddColumnPercentage { $number = self::getPercentageValue($currentValue - $pastValue, $pastValue, $quotientPrecision); if ($appendPercentSign) { - $number = self::appendPercentSign($number); + return NumberFormatter::getInstance()->formatPercent($number, $quotientPrecision); } - return $number; + return NumberFormatter::getInstance()->format($number, $quotientPrecision); } public static function appendPercentSign($number) diff --git a/core/Metrics/Formatter.php b/core/Metrics/Formatter.php index 69d32bc628..8fbe5cbb89 100644 --- a/core/Metrics/Formatter.php +++ b/core/Metrics/Formatter.php @@ -11,6 +11,7 @@ use Piwik\Common; use Piwik\Container\StaticContainer; use Piwik\DataTable; use Piwik\Intl\Data\Provider\CurrencyDataProvider; +use Piwik\NumberFormatter; use Piwik\Piwik; use Piwik\Plugin\Metric; use Piwik\Plugin\ProcessedMetric; @@ -98,7 +99,7 @@ class Formatter $seconds = $minusDaysAndHours - $minutes * 60; $precision = ($seconds > 0 && $seconds < 0.01 ? 3 : 2); - $seconds = round($seconds, $precision); + $seconds = NumberFormatter::getInstance()->formatNumber(round($seconds, $precision), $precision); if ($years > 0) { $return = sprintf(Piwik::translate('General_YearsDays'), $years, $days); diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php index be874c6224..cf38fbd570 100644 --- a/core/Plugin/Controller.php +++ b/core/Plugin/Controller.php @@ -24,6 +24,7 @@ use Piwik\Menu\MenuTop; use Piwik\Menu\MenuUser; use Piwik\NoAccessException; use Piwik\Notification\Manager as NotificationManager; +use Piwik\NumberFormatter; use Piwik\Period\Month; use Piwik\Period; use Piwik\Period\PeriodValidator; @@ -984,6 +985,9 @@ abstract class Controller $titleEvolutionPercent = '+' . $titleEvolutionPercent; } + $currentValue = NumberFormatter::getInstance()->format($currentValue); + $pastValue = NumberFormatter::getInstance()->format($pastValue); + $title = Piwik::translate('General_EvolutionSummaryGeneric', array( Piwik::translate('General_NVisits', $currentValue), $date, diff --git a/core/Twig.php b/core/Twig.php index 90b9643622..6d5b91a24c 100755 --- a/core/Twig.php +++ b/core/Twig.php @@ -85,6 +85,7 @@ class Twig $this->addFilter_truncate(); $this->addFilter_notification(); $this->addFilter_percentage(); + $this->addFilter_percent(); $this->addFilter_prettyDate(); $this->addFilter_safeDecodeRaw(); $this->addFilter_number(); @@ -279,6 +280,14 @@ class Twig $this->twig->addFilter($percentage); } + protected function addFilter_percent() + { + $percentage = new Twig_SimpleFilter('percent', function ($string, $precision = 1) { + return NumberFormatter::getInstance()->formatPercent($string, $precision); + }); + $this->twig->addFilter($percentage); + } + protected function addFilter_number() { $formatter = new Twig_SimpleFilter('number', function ($string, $minFractionDigits = 0, $maxFractionDigits = 0) { |