diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php index f8c19bd1591c49ff2869297051e363fa34bd3196..bf6035a2890dabfa5a667d92ed29e3cae198c55e 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 c931663c3afbff2810123af5cef1746241dc2e3f..c6ccb198287f10d8e59eb0e6136488909461ea97 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 bd0445ace4ac4a9d13cf34e0cdb07ec558ce41ac..5082ee47cbd0a0cfcc9cae17d9740a90f56afcc3 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 3c3dad80dd08defa0a7e575f1520300308567cf2..55113957fbccd7cff9a56cfd4fa20d73c0ed073e 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 b3307d87fc90f2787a0c64d644ca008b979850b4..a4372ac2da6183f2ca6ec32fa6cf53682f38d214 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 9a178bb62c489aa066fb9637ffd44abfd85bf549..a8ada70560daff33705c44b7946fccb90a630e25 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 f119db53266b9c6ebc102199ceaf01dac0a4bef0..badc0350886a422b1bc5561bf427118436b81a70 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 38a2a0d82a664f86b695ba42c7637573d8e9a2cb..a7d87391dd501e7da87e848f26183b659b466cbd 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 dca93f48f6f4583e88e9c1bf5c01b7c61cd0a110..7695db25651134b0272931cdb9b14d4bf30de2fd 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 c488d13607553278d20c2829faa2796a73ea41e9..959e79beb6cc7e9796ea632c6fb17fcb65adbc59 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 4ed0ea7360b56fc8c1a8d1151b76f1e6958a5eaf..b9c560d0365b486d8ab353eefb1c0e1a3eee91be 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 5111c9c6917683b0acdfbfa76cad16d7cb82dddf..9d1f6f2eb61403487bec52c14f2b376fdc510204 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 a91cd230910fd87b7a1f09faf51874eadf56e0f6..d85f6b41750e9ae37347e745839a3bf8f96b60aa 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'); } }