fixes #7226 - moved language report to location reports

plugins/Provider/Provider.php

@@ -65,8 +65,7 @@ class Provider extends \Piwik\Plugin
 
     public static function footerUserCountry(&$out)
     {
-        $out = '<div>
-			<h2>' . Piwik::translate('Provider_WidgetProviders') . '</h2>';
+        $out .= '<div><h2>' . Piwik::translate('Provider_WidgetProviders') . '</h2>';
         $out .= FrontController::getInstance()->fetchDispatch('Provider', 'getProvider');
         $out .= '</div>';
     }

plugins/UserLanguage/UserLanguage.php

@@ -7,10 +7,23 @@
  *
  */
 namespace Piwik\Plugins\UserLanguage;
+use Piwik\Piwik;
+use Piwik\FrontController;
 
 /**
  *
  */
 class UserLanguage extends \Piwik\Plugin
 {
+    public function postLoad()
+    {
+        Piwik::addAction('Template.footerUserCountry', array('Piwik\Plugins\UserLanguage\UserLanguage', 'footerUserCountry'));
+    }
+
+    public static function footerUserCountry(&$out)
+    {
+        $out .= '<div><h2>' . Piwik::translate('UserLanguage_BrowserLanguage') . '</h2>';
+        $out .= FrontController::getInstance()->fetchDispatch('UserLanguage', 'getLanguage');
+        $out .= '</div>';
+    }
 }
\ No newline at end of file

plugins/UserSettings/Controller.php

@@ -35,9 +35,6 @@ class Controller extends \Piwik\Plugin\Controller
             $view->dataTableConfiguration = $this->renderReport(new GetConfiguration());
         }
 
-        if (PluginManager::getInstance()->isPluginActivated('UserLanguage')) {
-            $view->dataTableBrowserLanguage = $this->renderReport(new GetLanguage());
-        }
         return $view->render();
     }
 }

plugins/UserSettings/templates/index.twig

@@ -3,11 +3,6 @@
     <h2 piwik-enriched-headline>{{ 'General_Plugins'|translate }}</h2>
     {{ dataTablePlugin|raw }}
     {% endif %}
-
-    {% if dataTableBrowserLanguage|default is not empty %}
-    <h2 piwik-enriched-headline>{{ 'UserLanguage_BrowserLanguage'|translate }}</h2>
-    {{ dataTableBrowserLanguage|raw }}
-    {% endif %}
 </div>
 
 <div id='rightcolumn'>