fixed some more tests

3 files changed, 51 insertions, 17 deletions

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());