From fa709f30c43fcef14836d0412f2e9dde54788265 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Thu, 12 Jun 2014 05:52:31 +0200
Subject: [PATCH] fixed some more tests
---
core/Plugin/Report.php | 2 ++
plugins/Actions/Reports/Base.php | 2 +-
plugins/Actions/Reports/GetPageTitles.php | 33 +++++++++++++++++------
plugins/Actions/Reports/GetPageUrls.php | 33 +++++++++++++++++------
plugins/CustomVariables/Reports/Base.php | 4 ++-
plugins/DevicesDetection/Reports/Base.php | 2 +-
plugins/Events/Reports/Base.php | 2 +-
plugins/MultiSites/Reports/Base.php | 2 +-
plugins/Referrers/Reports/Base.php | 4 ++-
plugins/UserCountry/Reports/Base.php | 2 +-
plugins/UserSettings/Reports/Base.php | 2 +-
plugins/VisitTime/Reports/Base.php | 3 ++-
plugins/VisitorInterest/Reports/Base.php | 4 ++-
13 files changed, 69 insertions(+), 26 deletions(-)
diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php
index f8c19bd159..bf6035a289 100644
--- a/core/Plugin/Report.php
+++ b/core/Plugin/Report.php
@@ -116,6 +116,7 @@ class Report
protected function getMetrics()
{
+ // TODO cache this
$translations = Metrics::getDefaultMetricTranslations();
$metrics = array();
@@ -132,6 +133,7 @@ class Report
protected function getMetricsDocumentation()
{
+ // TODO cache this
$translations = Metrics::getDefaultMetricsDocumentation();
$documentation = array();
diff --git a/plugins/Actions/Reports/Base.php b/plugins/Actions/Reports/Base.php
index c931663c3a..c6ccb19828 100644
--- a/plugins/Actions/Reports/Base.php
+++ b/plugins/Actions/Reports/Base.php
@@ -20,7 +20,7 @@ abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'General_Actions';
+ $this->category = Piwik::translate('General_Actions');
$this->processedMetrics = false;
}
diff --git a/plugins/Actions/Reports/GetPageTitles.php b/plugins/Actions/Reports/GetPageTitles.php
index bd0445ace4..5082ee47cb 100644
--- a/plugins/Actions/Reports/GetPageTitles.php
+++ b/plugins/Actions/Reports/GetPageTitles.php
@@ -27,14 +27,7 @@ class GetPageTitles extends Base
array('<br />', htmlentities('<title>')));
$this->order = 5;
- $this->metrics = array(
- 'nb_hits',
- 'nb_visits',
- 'bounce_rate',
- 'avg_time_on_page',
- 'exit_rate',
- 'avg_time_generation'
- );
+ $this->metrics = array_keys($this->getMetrics());
$this->actionToLoadSubTables = $this->action;
@@ -42,6 +35,30 @@ class GetPageTitles extends Base
$this->widgetTitle = 'Actions_WidgetPageTitles';
}
+ protected function getMetrics()
+ {
+ return array(
+ 'nb_hits' => Piwik::translate('General_ColumnPageviews'),
+ 'nb_visits' => Piwik::translate('General_ColumnUniquePageviews'),
+ 'bounce_rate' => Piwik::translate('General_ColumnBounceRate'),
+ 'avg_time_on_page' => Piwik::translate('General_ColumnAverageTimeOnPage'),
+ 'exit_rate' => Piwik::translate('General_ColumnExitRate'),
+ 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTime')
+ );
+ }
+
+ protected function getMetricsDocumentation()
+ {
+ return array(
+ 'nb_hits' => Piwik::translate('General_ColumnPageviewsDocumentation'),
+ 'nb_visits' => Piwik::translate('General_ColumnUniquePageviewsDocumentation'),
+ 'bounce_rate' => Piwik::translate('General_ColumnPageBounceRateDocumentation'),
+ 'avg_time_on_page' => Piwik::translate('General_ColumnAverageTimeOnPageDocumentation'),
+ 'exit_rate' => Piwik::translate('General_ColumnExitRateDocumentation'),
+ 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTimeDocumentation'),
+ );
+ }
+
public function configureView(ViewDataTable $view)
{
// link to the page, not just the report, but only if not a widget
diff --git a/plugins/Actions/Reports/GetPageUrls.php b/plugins/Actions/Reports/GetPageUrls.php
index 3c3dad80dd..55113957fb 100644
--- a/plugins/Actions/Reports/GetPageUrls.php
+++ b/plugins/Actions/Reports/GetPageUrls.php
@@ -26,14 +26,7 @@ class GetPageUrls extends Base
$this->actionToLoadSubTables = $this->action;
$this->order = 1;
- $this->metrics = array(
- 'nb_hits',
- 'nb_visits',
- 'bounce_rate',
- 'avg_time_on_page',
- 'exit_rate',
- 'avg_time_generation'
- );
+ $this->metrics = array_keys($this->getMetrics());
$this->segmentSql = 'log_visit.visit_entry_idaction_url';
@@ -41,6 +34,30 @@ class GetPageUrls extends Base
$this->widgetTitle = 'General_Pages';
}
+ protected function getMetrics()
+ {
+ return array(
+ 'nb_hits' => Piwik::translate('General_ColumnPageviews'),
+ 'nb_visits' => Piwik::translate('General_ColumnUniquePageviews'),
+ 'bounce_rate' => Piwik::translate('General_ColumnBounceRate'),
+ 'avg_time_on_page' => Piwik::translate('General_ColumnAverageTimeOnPage'),
+ 'exit_rate' => Piwik::translate('General_ColumnExitRate'),
+ 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTime')
+ );
+ }
+
+ protected function getMetricsDocumentation()
+ {
+ return array(
+ 'nb_hits' => Piwik::translate('General_ColumnPageviewsDocumentation'),
+ 'nb_visits' => Piwik::translate('General_ColumnUniquePageviewsDocumentation'),
+ 'bounce_rate' => Piwik::translate('General_ColumnPageBounceRateDocumentation'),
+ 'avg_time_on_page' => Piwik::translate('General_ColumnAverageTimeOnPageDocumentation'),
+ 'exit_rate' => Piwik::translate('General_ColumnExitRateDocumentation'),
+ 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTimeDocumentation'),
+ );
+ }
+
public function configureView(ViewDataTable $view)
{
$view->config->addTranslation('label', $this->dimension->getName());
diff --git a/plugins/CustomVariables/Reports/Base.php b/plugins/CustomVariables/Reports/Base.php
index b3307d87fc..a4372ac2da 100644
--- a/plugins/CustomVariables/Reports/Base.php
+++ b/plugins/CustomVariables/Reports/Base.php
@@ -8,11 +8,13 @@
*/
namespace Piwik\Plugins\CustomVariables\Reports;
+use Piwik\Piwik;
+
abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'General_Visitors';
+ $this->category = Piwik::translate('General_Visitors');
}
}
diff --git a/plugins/DevicesDetection/Reports/Base.php b/plugins/DevicesDetection/Reports/Base.php
index 9a178bb62c..a8ada70560 100644
--- a/plugins/DevicesDetection/Reports/Base.php
+++ b/plugins/DevicesDetection/Reports/Base.php
@@ -14,7 +14,7 @@ abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'DevicesDetection_DevicesDetection';
+ $this->category = Piwik::translate('DevicesDetection_DevicesDetection');
}
protected function getOsRelatedReports()
diff --git a/plugins/Events/Reports/Base.php b/plugins/Events/Reports/Base.php
index f119db5326..badc035088 100644
--- a/plugins/Events/Reports/Base.php
+++ b/plugins/Events/Reports/Base.php
@@ -17,7 +17,7 @@ abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'Events_Events';
+ $this->category = Piwik::translate('Events_Events');
$this->processedMetrics = false;
$this->widgetParams = array(
diff --git a/plugins/MultiSites/Reports/Base.php b/plugins/MultiSites/Reports/Base.php
index 38a2a0d82a..a7d87391dd 100644
--- a/plugins/MultiSites/Reports/Base.php
+++ b/plugins/MultiSites/Reports/Base.php
@@ -15,7 +15,7 @@ abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'General_MultiSitesSummary';
+ $this->category = Piwik::translate('General_MultiSitesSummary');
$metadataMetrics = array();
foreach (API::getApiMetrics($enhanced = true) as $metricName => $metricSettings) {
diff --git a/plugins/Referrers/Reports/Base.php b/plugins/Referrers/Reports/Base.php
index dca93f48f6..7695db2565 100644
--- a/plugins/Referrers/Reports/Base.php
+++ b/plugins/Referrers/Reports/Base.php
@@ -8,11 +8,13 @@
*/
namespace Piwik\Plugins\Referrers\Reports;
+use Piwik\Piwik;
+
abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'Referrers_Referrers';
+ $this->category = Piwik::translate('Referrers_Referrers');
}
}
diff --git a/plugins/UserCountry/Reports/Base.php b/plugins/UserCountry/Reports/Base.php
index c488d13607..959e79beb6 100644
--- a/plugins/UserCountry/Reports/Base.php
+++ b/plugins/UserCountry/Reports/Base.php
@@ -17,7 +17,7 @@ abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'General_Visitors';
+ $this->category = Piwik::translate('General_Visitors');
}
protected function getGeoIPReportDocSuffix()
diff --git a/plugins/UserSettings/Reports/Base.php b/plugins/UserSettings/Reports/Base.php
index 4ed0ea7360..b9c560d036 100644
--- a/plugins/UserSettings/Reports/Base.php
+++ b/plugins/UserSettings/Reports/Base.php
@@ -16,7 +16,7 @@ abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'UserSettings_VisitorSettings';
+ $this->category = Piwik::translate('UserSettings_VisitorSettings');
}
protected function getBasicUserSettingsDisplayProperties(ViewDataTable $view)
diff --git a/plugins/VisitTime/Reports/Base.php b/plugins/VisitTime/Reports/Base.php
index 5111c9c691..9d1f6f2eb6 100644
--- a/plugins/VisitTime/Reports/Base.php
+++ b/plugins/VisitTime/Reports/Base.php
@@ -8,6 +8,7 @@
*/
namespace Piwik\Plugins\VisitTime\Reports;
+use Piwik\Piwik;
use Piwik\Plugin\ViewDataTable;
use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Bar;
@@ -15,7 +16,7 @@ abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'VisitsSummary_VisitsSummary';
+ $this->category = Piwik::translate('VisitsSummary_VisitsSummary');
}
public function getDefaultTypeViewDataTable()
diff --git a/plugins/VisitorInterest/Reports/Base.php b/plugins/VisitorInterest/Reports/Base.php
index a91cd23091..d85f6b4175 100644
--- a/plugins/VisitorInterest/Reports/Base.php
+++ b/plugins/VisitorInterest/Reports/Base.php
@@ -8,11 +8,13 @@
*/
namespace Piwik\Plugins\VisitorInterest\Reports;
+use Piwik\Piwik;
+
abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'General_Visitors';
+ $this->category = Piwik::translate('General_Visitors');
}
}
--
GitLab