From 57af9d44fce548e4157a8029beeec35017312e80 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Sat, 21 Feb 2015 13:45:38 +0100
Subject: [PATCH] fixes #7226 - moved language report to location reports
---
plugins/Provider/Provider.php | 3 +--
plugins/UserLanguage/UserLanguage.php | 13 +++++++++++++
plugins/UserSettings/Controller.php | 3 ---
plugins/UserSettings/templates/index.twig | 5 -----
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index 719029dc8b..1f2a5fc70d 100644
--- a/plugins/Provider/Provider.php
+++ b/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>';
}
diff --git a/plugins/UserLanguage/UserLanguage.php b/plugins/UserLanguage/UserLanguage.php
index f8bad84ba2..07d4fdb300 100644
--- a/plugins/UserLanguage/UserLanguage.php
+++ b/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
diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php
index ba18becf5b..948f2c5a25 100644
--- a/plugins/UserSettings/Controller.php
+++ b/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();
}
}
diff --git a/plugins/UserSettings/templates/index.twig b/plugins/UserSettings/templates/index.twig
index e64d8e52a8..eadf2f09f2 100644
--- a/plugins/UserSettings/templates/index.twig
+++ b/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'>
--
GitLab