apparently the action reports all overwrite the default metric translations. looks like a hack to me... need to make this use case easier

11 files changed, 181 insertions, 10 deletions

diff --git a/plugins/Actions/Reports/GetDownloads.php b/plugins/Actions/Reports/GetDownloads.php
index adb5d2db67..1722142083 100644
--- a/plugins/Actions/Reports/GetDownloads.php
+++ b/plugins/Actions/Reports/GetDownloads.php
@@ -21,7 +21,7 @@ class GetDownloads extends Base
         $this->dimension     = new DownloadUrl();
         $this->name          = Piwik::translate('General_Downloads');
         $this->documentation = Piwik::translate('Actions_DownloadsReportDocumentation', '<br />');
-        $this->metrics       = array('nb_visits', 'nb_hits');
+        $this->metrics       = array_keys($this->getMetrics());
 
         $this->actionToLoadSubTables = $this->action;
         $this->order = 9;
@@ -30,6 +30,22 @@ class GetDownloads extends Base
         $this->widgetTitle  = 'General_Downloads';
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'nb_visits' => Piwik::translate('Actions_ColumnUniqueDownloads'),
+            'nb_hits'   => Piwik::translate('General_Downloads')
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'nb_visits' => Piwik::translate('Actions_ColumnUniqueClicksDocumentation'),
+            'nb_hits'   => Piwik::translate('Actions_ColumnClicksDocumentation')
+        );
+    }
+
     public function configureView(ViewDataTable $view)
     {
         $view->config->addTranslations(array(
diff --git a/plugins/Actions/Reports/GetEntryPageTitles.php b/plugins/Actions/Reports/GetEntryPageTitles.php
index 0ec60a7ce8..e6f9ebc7f4 100644
--- a/plugins/Actions/Reports/GetEntryPageTitles.php
+++ b/plugins/Actions/Reports/GetEntryPageTitles.php
@@ -26,13 +26,31 @@ class GetEntryPageTitles extends Base
         $this->name          = Piwik::translate('Actions_EntryPageTitles');
         $this->documentation = Piwik::translate('Actions_ExitPageTitlesReportDocumentation', '<br />')
                              . ' ' . Piwik::translate('General_UsePlusMinusIconsDocumentation');
-        $this->metrics = array('entry_nb_visits', 'entry_bounce_count', 'bounce_rate');
+        $this->metrics = array_keys($this->getMetrics());
         $this->order   = 6;
         $this->actionToLoadSubTables = $this->action;
 
         $this->widgetTitle = 'Actions_WidgetEntryPageTitles';
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'entry_nb_visits'    => Piwik::translate('General_ColumnEntrances'),
+            'entry_bounce_count' => Piwik::translate('General_ColumnBounces'),
+            'bounce_rate'        => Piwik::translate('General_ColumnBounceRate'),
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'entry_nb_visits'    => Piwik::translate('General_ColumnEntrancesDocumentation'),
+            'entry_bounce_count' => Piwik::translate('General_ColumnBouncesDocumentation'),
+            'bounce_rate'        => Piwik::translate('General_ColumnBounceRateForPageDocumentation')
+        );
+    }
+
     public function configureView(ViewDataTable $view)
     {
         $entryPageUrlAction =
diff --git a/plugins/Actions/Reports/GetEntryPageUrls.php b/plugins/Actions/Reports/GetEntryPageUrls.php
index 6e51e446f5..64d7c4034e 100644
--- a/plugins/Actions/Reports/GetEntryPageUrls.php
+++ b/plugins/Actions/Reports/GetEntryPageUrls.php
@@ -36,6 +36,24 @@ class GetEntryPageUrls extends Base
         $this->widgetTitle = 'Actions_WidgetPagesEntry';
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'entry_nb_visits'    => Piwik::translate('General_ColumnEntrances'),
+            'entry_bounce_count' => Piwik::translate('General_ColumnBounces'),
+            'bounce_rate'        => Piwik::translate('General_ColumnBounceRate'),
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'entry_nb_visits'    => Piwik::translate('General_ColumnEntrancesDocumentation'),
+            'entry_bounce_count' => Piwik::translate('General_ColumnBouncesDocumentation'),
+            'bounce_rate'        => Piwik::translate('General_ColumnBounceRateForPageDocumentation')
+        );
+    }
+
     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/GetExitPageTitles.php b/plugins/Actions/Reports/GetExitPageTitles.php
index 88db0cc8ac..1fd2a0c07d 100644
--- a/plugins/Actions/Reports/GetExitPageTitles.php
+++ b/plugins/Actions/Reports/GetExitPageTitles.php
@@ -27,7 +27,7 @@ class GetExitPageTitles extends Base
         $this->documentation = Piwik::translate('Actions_EntryPageTitlesReportDocumentation', '<br />')
                              . ' ' . Piwik::translate('General_UsePlusMinusIconsDocumentation');
 
-        $this->metrics = array('exit_nb_visits', 'nb_visits', 'exit_rate');
+        $this->metrics = array_keys($this->getMetrics());
         $this->order   = 7;
 
         $this->actionToLoadSubTables = $this->action;
@@ -35,6 +35,24 @@ class GetExitPageTitles extends Base
         $this->widgetTitle = 'Actions_WidgetExitPageTitles';
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'exit_nb_visits' => Piwik::translate('General_ColumnExits'),
+            'nb_visits'      => Piwik::translate('General_ColumnUniquePageviews'),
+            'exit_rate'      => Piwik::translate('General_ColumnExitRate')
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'exit_nb_visits' => Piwik::translate('General_ColumnExitsDocumentation'),
+            'nb_visits'      => Piwik::translate('General_ColumnUniquePageviewsDocumentation'),
+            'exit_rate'      => Piwik::translate('General_ColumnExitRateDocumentation')
+        );
+    }
+
     public function configureView(ViewDataTable $view)
     {
         $exitPageUrlAction =
diff --git a/plugins/Actions/Reports/GetExitPageUrls.php b/plugins/Actions/Reports/GetExitPageUrls.php
index 96f010931d..93d858f5a2 100644
--- a/plugins/Actions/Reports/GetExitPageUrls.php
+++ b/plugins/Actions/Reports/GetExitPageUrls.php
@@ -27,7 +27,7 @@ class GetExitPageUrls extends Base
         $this->documentation = Piwik::translate('Actions_ExitPagesReportDocumentation', '<br />')
                              . '<br />' . Piwik::translate('General_UsePlusMinusIconsDocumentation');
 
-        $this->metrics = array('exit_nb_visits', 'nb_visits', 'exit_rate');
+        $this->metrics = array_keys($this->getMetrics());
         $this->actionToLoadSubTables = $this->action;
 
         $this->order = 4;
@@ -36,6 +36,24 @@ class GetExitPageUrls extends Base
         $this->widgetTitle = 'Actions_WidgetPagesExit';
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'exit_nb_visits' => Piwik::translate('General_ColumnExits'),
+            'nb_visits'      => Piwik::translate('General_ColumnUniquePageviews'),
+            'exit_rate'      => Piwik::translate('General_ColumnExitRate')
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'exit_nb_visits' => Piwik::translate('General_ColumnExitsDocumentation'),
+            'nb_visits'      => Piwik::translate('General_ColumnUniquePageviewsDocumentation'),
+            'exit_rate'      => Piwik::translate('General_ColumnExitRateDocumentation')
+        );
+    }
+
     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/GetOutlinks.php b/plugins/Actions/Reports/GetOutlinks.php
index 53e97dbff4..e7abcd4f52 100644
--- a/plugins/Actions/Reports/GetOutlinks.php
+++ b/plugins/Actions/Reports/GetOutlinks.php
@@ -28,7 +28,7 @@ class GetOutlinks extends Base
                              . Piwik::translate('Actions_OutlinkDocumentation') . '<br />'
                              . Piwik::translate('General_UsePlusMinusIconsDocumentation');
 
-        $this->metrics = array('nb_visits', 'nb_hits');
+        $this->metrics = array_keys($this->getMetrics());
         $this->order   = 8;
 
         $this->actionToLoadSubTables = $this->action;
@@ -37,6 +37,22 @@ class GetOutlinks extends Base
         $this->widgetTitle = 'General_Outlinks';
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'nb_visits' => Piwik::translate('Actions_ColumnUniqueClicks'),
+            'nb_hits'   => Piwik::translate('Actions_ColumnClicks')
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'nb_visits' => Piwik::translate('Actions_ColumnUniqueClicksDocumentation'),
+            'nb_hits'   => Piwik::translate('Actions_ColumnClicksDocumentation')
+        );
+    }
+
     public function configureView(ViewDataTable $view)
     {
         $view->config->addTranslations(array(
diff --git a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
index ace2964042..e69d558fc0 100644
--- a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
+++ b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
@@ -20,7 +20,7 @@ class GetPageTitlesFollowingSiteSearch extends SiteSearchBase
         $this->dimension     = new DestinationPage();
         $this->name          = Piwik::translate('Actions_WidgetPageTitlesFollowingSearch');
         $this->documentation = Piwik::translate('Actions_SiteSearchFollowingPagesDoc') . '<br/>' . Piwik::translate('General_UsePlusMinusIconsDocumentation');
-        $this->metrics       = array('nb_hits_following_search', 'nb_hits');
+        $this->metrics       = array_keys($this->getMetrics());
         $this->order = 19;
         $this->widgetTitle  = 'Actions_WidgetPageTitlesFollowingSearch';
     }
@@ -32,6 +32,22 @@ class GetPageTitlesFollowingSiteSearch extends SiteSearchBase
         $this->configureViewForUrlAndTitle($view, $title);
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'nb_hits_following_search' => Piwik::translate('General_ColumnViewedAfterSearch'),
+            'nb_hits'                  => Piwik::translate('General_ColumnTotalPageviews'),
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'nb_hits_following_search' => Piwik::translate('General_ColumnViewedAfterSearchDocumentation'),
+            'nb_hits'                  => Piwik::translate('General_ColumnPageviewsDocumentation'),
+        );
+    }
+
     protected function configureViewForUrlAndTitle(ViewDataTable $view, $title)
     {
         $relatedReports = array(
diff --git a/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php b/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php
index 8956061d5c..d41380d788 100644
--- a/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php
+++ b/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php
@@ -20,7 +20,6 @@ class GetPageUrlsFollowingSiteSearch extends GetPageTitlesFollowingSiteSearch
         $this->dimension     = new DestinationPage();
         $this->name          = Piwik::translate('Actions_WidgetPageUrlsFollowingSearch');
         $this->documentation = Piwik::translate('Actions_SiteSearchFollowingPagesDoc') . '<br/>' . Piwik::translate('General_UsePlusMinusIconsDocumentation');
-        $this->metrics       = array('nb_hits_following_search', 'nb_hits');
         $this->order = 18;
         $this->widgetTitle  = 'Actions_WidgetPageUrlsFollowingSearch';
     }
diff --git a/plugins/Actions/Reports/GetSiteSearchCategories.php b/plugins/Actions/Reports/GetSiteSearchCategories.php
index 10241c98bf..404457b505 100644
--- a/plugins/Actions/Reports/GetSiteSearchCategories.php
+++ b/plugins/Actions/Reports/GetSiteSearchCategories.php
@@ -22,7 +22,7 @@ class GetSiteSearchCategories extends SiteSearchBase
         $this->dimension     = new SearchCategory();
         $this->name          = Piwik::translate('Actions_WidgetSearchCategories');
         $this->documentation = Piwik::translate('Actions_SiteSearchCategories1') . '<br/>' . Piwik::translate('Actions_SiteSearchCategories2');
-        $this->metrics       = array('nb_visits', 'nb_pages_per_search', 'exit_rate');
+        $this->metrics       = array_keys($this->getMetrics());
         $this->order = 17;
         $this->widgetTitle  = 'Actions_WidgetSearchCategories';
     }
@@ -32,6 +32,24 @@ class GetSiteSearchCategories extends SiteSearchBase
         return parent::isEnabled() && Actions::isCustomVariablesPluginsEnabled();
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'nb_visits'           => Piwik::translate('Actions_ColumnSearches'),
+            'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearch'),
+            'exit_rate'           => Piwik::translate('Actions_ColumnSearchExits'),
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'nb_visits'           => Piwik::translate('Actions_ColumnSearchesDocumentation'),
+            'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearchDocumentation'),
+            'exit_rate'           => Piwik::translate('Actions_ColumnSearchExitsDocumentation'),
+        );
+    }
+
     public function configureView(ViewDataTable $view)
     {
         $view->config->addTranslations(array(
diff --git a/plugins/Actions/Reports/GetSiteSearchKeywords.php b/plugins/Actions/Reports/GetSiteSearchKeywords.php
index 1d217f7177..a3fa93dc1d 100644
--- a/plugins/Actions/Reports/GetSiteSearchKeywords.php
+++ b/plugins/Actions/Reports/GetSiteSearchKeywords.php
@@ -21,11 +21,29 @@ class GetSiteSearchKeywords extends SiteSearchBase
         $this->name          = Piwik::translate('Actions_WidgetSearchKeywords');
         $this->documentation = Piwik::translate('Actions_SiteSearchKeywordsDocumentation') . '<br/><br/>' . Piwik::translate('Actions_SiteSearchIntro') . '<br/><br/>'
                              . '<a href="http://piwik.org/docs/site-search/" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>';
-        $this->metrics       = array('nb_visits', 'nb_pages_per_search', 'exit_rate');
+        $this->metrics       = array_keys($this->getMetrics());
         $this->order = 15;
         $this->widgetTitle  = 'Actions_WidgetSearchKeywords';
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'nb_visits'           => Piwik::translate('Actions_ColumnSearches'),
+            'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearch'),
+            'exit_rate'           => Piwik::translate('Actions_ColumnSearchExits'),
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'nb_visits'           => Piwik::translate('Actions_ColumnSearchesDocumentation'),
+            'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearchDocumentation'),
+            'exit_rate'           => Piwik::translate('Actions_ColumnSearchExitsDocumentation'),
+        );
+    }
+
     public function configureView(ViewDataTable $view)
     {
         $view->config->addTranslation('label', $this->dimension->getName());
diff --git a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
index fbc0ec5676..df86791703 100644
--- a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
+++ b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
@@ -20,11 +20,27 @@ class GetSiteSearchNoResultKeywords extends SiteSearchBase
         $this->dimension     = new KeywordwithNoSearchResult();
         $this->name          = Piwik::translate('Actions_WidgetSearchNoResultKeywords');
         $this->documentation = Piwik::translate('Actions_SiteSearchIntro') . '<br /><br />' . Piwik::translate('Actions_SiteSearchKeywordsNoResultDocumentation');
-        $this->metrics       = array('nb_visits', 'exit_rate');
+        $this->metrics       = array_keys($this->getMetrics());
         $this->order = 16;
         $this->widgetTitle  = 'Actions_WidgetSearchNoResultKeywords';
     }
 
+    protected function getMetrics()
+    {
+        return array(
+            'nb_visits' => Piwik::translate('Actions_ColumnSearches'),
+            'exit_rate' => Piwik::translate('Actions_ColumnSearchExits'),
+        );
+    }
+
+    protected function getMetricsDocumentation()
+    {
+        return array(
+            'nb_visits' => Piwik::translate('Actions_ColumnSearchesDocumentation'),
+            'exit_rate' => Piwik::translate('Actions_ColumnSearchExitsDocumentation'),
+        );
+    }
+
     public function configureView(ViewDataTable $view)
     {
         $view->config->addTranslation('label', $this->dimension->getName());