Moving piwik settings specific getters to SettingsPiwik class

Adding MetricsFormatter class which knows how to format/display metrics (time, money, size, etc)

2 files changed, 7 insertions, 7 deletions

diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php
index 941b095f81..890fd1d71c 100644
--- a/plugins/DBStats/Controller.php
+++ b/plugins/DBStats/Controller.php
@@ -10,10 +10,10 @@
  */
 namespace Piwik\Plugins\DBStats;
 
+use Piwik\MetricsFormatter;
 use Piwik\Piwik;
-use Piwik\Plugins\DBStats\API;
-use Piwik\ViewDataTable;
 use Piwik\View;
+use Piwik\ViewDataTable;
 
 /**
  * @package DBStats
@@ -40,9 +40,9 @@ class Controller extends \Piwik\Controller\Admin
         $view->adminDataSummary = $this->getAdminDataSummary(true);
 
         list($siteCount, $userCount, $totalSpaceUsed) = API::getInstance()->getGeneralInformation();
-        $view->siteCount = Piwik::getPrettyNumber($siteCount);
-        $view->userCount = Piwik::getPrettyNumber($userCount);
-        $view->totalSpaceUsed = Piwik::getPrettySizeFromBytes($totalSpaceUsed);
+        $view->siteCount = MetricsFormatter::getPrettyNumber($siteCount);
+        $view->userCount = MetricsFormatter::getPrettyNumber($userCount);
+        $view->totalSpaceUsed = MetricsFormatter::getPrettySizeFromBytes($totalSpaceUsed);
 
         echo $view->render();
     }
diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php
index 22e767f360..ba1dca5fbe 100644
--- a/plugins/DBStats/DBStats.php
+++ b/plugins/DBStats/DBStats.php
@@ -332,7 +332,7 @@ class DBStats extends \Piwik\Plugin
             }
         }
 
-        $getPrettySize = array('\Piwik\Piwik', 'getPrettySizeFromBytes');
+        $getPrettySize = array('\Piwik\MetricsFormatter', 'getPrettySizeFromBytes');
         $params = !isset($fixedMemoryUnit) ? array() : array($fixedMemoryUnit);
         $properties['filters'][] = array(
             'ColumnCallbackReplace', array($sizeColumns, $getPrettySize, $params), $runPrettySizeFilterBeforeGeneric);
@@ -346,7 +346,7 @@ class DBStats extends \Piwik\Plugin
             $properties['filters'][] = array('ColumnCallbackReplace', array($sizeColumns, $replaceSpaces));
         }
 
-        $getPrettyNumber = array('\Piwik\Piwik', 'getPrettyNumber');
+        $getPrettyNumber = array('\Piwik\MetricsFormatter', 'getPrettyNumber');
         $properties['filters'][] = array('ColumnCallbackReplace', array('row_count', $getPrettyNumber));
 
         return $viewDataTable;