2 files changed, 9 insertions, 26 deletions

diff --git a/plugins/UserLanguage/UserLanguage.php b/plugins/UserLanguage/UserLanguage.php
index 3238ac11de..ea29eeb6d7 100644
--- a/plugins/UserLanguage/UserLanguage.php
+++ b/plugins/UserLanguage/UserLanguage.php
@@ -16,24 +16,6 @@ use Piwik\FrontController;
  */
 class UserLanguage extends \Piwik\Plugin
 {
-    /**
-     * @see Piwik\Plugin::registerEvents
-     */
-    public function registerEvents()
-    {
-        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/VisitorDetails.php
index 26e8a36ec8..ba9122030f 100644
--- a/plugins/UserLanguage/Visitor.php
+++ b/plugins/UserLanguage/VisitorDetails.php
@@ -2,29 +2,30 @@
 /**
  * Piwik - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
 namespace Piwik\Plugins\UserLanguage;
 
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserLanguage/functions.php';
 
-class Visitor
+class VisitorDetails extends VisitorDetailsAbstract
 {
-    private $details = array();
-
-    public function __construct($details)
+    public function extendVisitorDetails(&$visitor)
     {
-        $this->details = $details;
+        $visitor['languageCode'] = $this->getLanguageCode();
+        $visitor['language']     = $this->getLanguage();
     }
 
-    public function getLanguageCode()
+    protected function getLanguageCode()
     {
         return $this->details['location_browser_lang'];
     }
 
-    public function getLanguage()
+    protected function getLanguage()
     {
         return languageTranslate($this->details['location_browser_lang']);
     }