added language and languageCode to visitor details; adjusted tests

3 files changed, 50 insertions, 1 deletions

diff --git a/plugins/UserLanguage/UserLanguage.php b/plugins/UserLanguage/UserLanguage.php
index 07d4fdb300..5e7d002989 100644
--- a/plugins/UserLanguage/UserLanguage.php
+++ b/plugins/UserLanguage/UserLanguage.php
@@ -7,6 +7,7 @@
  *
  */
 namespace Piwik\Plugins\UserLanguage;
+
 use Piwik\Piwik;
 use Piwik\FrontController;
 
@@ -15,6 +16,24 @@ use Piwik\FrontController;
  */
 class UserLanguage extends \Piwik\Plugin
 {
+    /**
+     * @see Piwik\Plugin::getListHooksRegistered
+     */
+    public function getListHooksRegistered()
+    {
+        return array(
+            'Live.getAllVisitorDetails'              => 'extendVisitorDetails'
+        );
+    }
+
+    public function extendVisitorDetails(&$visitor, $details)
+    {
+        $instance = new Visitor($details);
+
+        $visitor['languageCode'] = $instance->getLanguageCode();
+        $visitor['language']     = $instance->getLanguage();
+    }
+
     public function postLoad()
     {
         Piwik::addAction('Template.footerUserCountry', array('Piwik\Plugins\UserLanguage\UserLanguage', 'footerUserCountry'));
diff --git a/plugins/UserLanguage/Visitor.php b/plugins/UserLanguage/Visitor.php
new file mode 100644
index 0000000000..26e8a36ec8
--- /dev/null
+++ b/plugins/UserLanguage/Visitor.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserLanguage;
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/UserLanguage/functions.php';
+
+class Visitor
+{
+    private $details = array();
+
+    public function __construct($details)
+    {
+        $this->details = $details;
+    }
+
+    public function getLanguageCode()
+    {
+        return $this->details['location_browser_lang'];
+    }
+
+    public function getLanguage()
+    {
+        return languageTranslate($this->details['location_browser_lang']);
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/functions.php b/plugins/UserLanguage/functions.php
index bc8175c77a..732bf44aa1 100644
--- a/plugins/UserLanguage/functions.php
+++ b/plugins/UserLanguage/functions.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Plugins\UserLanguage;
 
-use Piwik\Container\StaticContainer;
 use Piwik\Piwik;
 
 /**