diff options
-rw-r--r-- | lang/en.json | 1 | ||||
-rw-r--r-- | plugins/CoreHome/Columns/IdSite.php | 23 |
2 files changed, 17 insertions, 7 deletions
diff --git a/lang/en.json b/lang/en.json index 561070642a..099735796a 100644 --- a/lang/en.json +++ b/lang/en.json @@ -338,6 +338,7 @@ "ProductRevenue": "Product Revenue", "Measurable": "Measurable", "Measurables": "Measurables", + "MeasurableId": "Measurable ID", "PurchasedProducts": "Purchased Products", "Quantity": "Quantity", "RangeReports": "Custom date ranges", diff --git a/plugins/CoreHome/Columns/IdSite.php b/plugins/CoreHome/Columns/IdSite.php index f757b5bf1c..1192954b3b 100644 --- a/plugins/CoreHome/Columns/IdSite.php +++ b/plugins/CoreHome/Columns/IdSite.php @@ -8,8 +8,10 @@ */ namespace Piwik\Plugins\CoreHome\Columns; -use Piwik\Columns\Join\SiteNameJoin; +use Piwik\Metrics\Formatter; +use Piwik\Piwik; use Piwik\Plugin\Dimension\VisitDimension; +use Piwik\Site; use Piwik\Tracker\Action; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; @@ -23,13 +25,10 @@ class IdSite extends VisitDimension // INDEX(idsite, config_id, visit_last_action_time) and we maybe not be sure whether config_id already exists at // installing point (we do not know whether visit_last_action_time or idsite column would be added first). + protected $nameSingular = 'General_Measurable'; + protected $namePlural = 'General_Measurables'; protected $type = self::TYPE_TEXT; - public function getDbColumnJoin() - { - return new SiteNameJoin(); - } - /** * @param Request $request * @param Visitor $visitor @@ -51,4 +50,14 @@ class IdSite extends VisitDimension { return $request->getIdSite(); } -}
\ No newline at end of file + + public function formatValue($value, $idSite, Formatter $formatter) + { + try { + return Site::getNameFor($value); + } catch (\Exception $ex) { + $formatted = parent::formatValue($value, $idSite, $formatter); + return Piwik::translate('General_MeasurableId') . ': ' . $formatted; + } + } +} |