generate pages instead of implementing them in each controller

3 files changed, 7 insertions, 6 deletions

diff --git a/plugins/UserLanguage/Reports/Base.php b/plugins/UserLanguage/Reports/Base.php
index 366521b16a..68e8a91b4b 100644
--- a/plugins/UserLanguage/Reports/Base.php
+++ b/plugins/UserLanguage/Reports/Base.php
@@ -15,6 +15,7 @@ abstract class Base extends \Piwik\Plugin\Report
 {
     protected function init()
     {
-        $this->category = 'General_VisitorSettings';
+        $this->categoryId = 'General_Visitors';
+        $this->subcategoryId = 'UserCountry_SubmenuLocations';
     }
 }
diff --git a/plugins/UserLanguage/Reports/GetLanguage.php b/plugins/UserLanguage/Reports/GetLanguage.php
index f5babd65b8..8db3629134 100644
--- a/plugins/UserLanguage/Reports/GetLanguage.php
+++ b/plugins/UserLanguage/Reports/GetLanguage.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\UserLanguage\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\UserLanguage\Columns\Language;
+use Piwik\Plugin\Reports;
 
 class GetLanguage extends Base
 {
@@ -20,8 +21,7 @@ class GetLanguage extends Base
         $this->dimension     = new Language();
         $this->name          = Piwik::translate('UserLanguage_BrowserLanguage');
         $this->documentation = ''; // TODO
-        $this->order = 10;
-        $this->widgetTitle  = 'UserLanguage_BrowserLanguage';
+        $this->order = 8;
     }
 
     public function configureView(ViewDataTable $view)
@@ -37,7 +37,7 @@ class GetLanguage extends Base
 
     public function getRelatedReports() {
         return array(
-            self::factory('UserLanguage', 'getLanguageCode'),
+            Reports::factory('UserLanguage', 'getLanguageCode'),
         );
     }
 
diff --git a/plugins/UserLanguage/Reports/GetLanguageCode.php b/plugins/UserLanguage/Reports/GetLanguageCode.php
index 0ca2c64bb2..9d9a46f201 100644
--- a/plugins/UserLanguage/Reports/GetLanguageCode.php
+++ b/plugins/UserLanguage/Reports/GetLanguageCode.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\UserLanguage\Reports;
 
 use Piwik\Piwik;
 use Piwik\Plugins\UserLanguage\Columns\Language;
+use Piwik\Plugin\Reports;
 
 class GetLanguageCode extends GetLanguage
 {
@@ -20,13 +21,12 @@ class GetLanguageCode extends GetLanguage
         $this->name          = Piwik::translate('UserLanguage_LanguageCode');
         $this->documentation = '';
         $this->order = 11;
-        $this->widgetTitle  = 'UserLanguage_LanguageCode';
     }
 
     public function getRelatedReports()
     {
         return array(
-            self::factory('UserLanguage', 'getLanguage'),
+            Reports::factory('UserLanguage', 'getLanguage'),
         );
     }