remove 'Extended' from function names

3 files changed, 37 insertions, 31 deletions

diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php
index b54b79c635..79369084ec 100644
--- a/plugins/DevicesDetection/API.php
+++ b/plugins/DevicesDetection/API.php
@@ -97,8 +97,8 @@ class API extends \Piwik\Plugin\API
     public function getOsFamilies($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getDataTable('DevicesDetection_os', $idSite, $period, $date, $segment);
-        $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOSFamilyFullNameExtended'));
-        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsFamilyLogoExtended'));
+        $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOSFamilyFullName'));
+        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsFamilyLogo'));
         return $dataTable;
     }
 
@@ -113,9 +113,8 @@ class API extends \Piwik\Plugin\API
     public function getOsVersions($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getDataTable('DevicesDetection_osVersions', $idSite, $period, $date, $segment);
-        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsLogoExtended'));
-        $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getOsFullNameExtended'));
-
+        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsLogo'));
+        $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getOsFullName'));
         return $dataTable;
     }
 
@@ -130,8 +129,8 @@ class API extends \Piwik\Plugin\API
     public function getBrowserFamilies($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getDataTable('DevicesDetection_browsers', $idSite, $period, $date, $segment);
-        $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getBrowserFamilyFullNameExtended'));
-        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserFamilyLogoExtended'));
+        $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getBrowserFamilyFullName'));
+        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserFamilyLogo'));
         return $dataTable;
     }
 
@@ -146,8 +145,8 @@ class API extends \Piwik\Plugin\API
     public function getBrowserVersions($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getDataTable('DevicesDetection_browserVersions', $idSite, $period, $date, $segment);
-        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserLogoExtended'));
-        $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getBrowserNameExtended'));
+        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserLogo'));
+        $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getBrowserName'));
         return $dataTable;
     }
 
diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php
index 78ed29fa93..92e4f81aa3 100644
--- a/plugins/DevicesDetection/Controller.php
+++ b/plugins/DevicesDetection/Controller.php
@@ -53,14 +53,14 @@ class Controller extends \Piwik\Plugin\Controller
         $view->browser_name        = $uaParser->getClient('name');
         $view->browser_short_name  = $uaParser->getClient('short_name');
         $view->browser_version     = $uaParser->getClient('version');
-        $view->browser_logo        = getBrowserLogoExtended($uaParser->getClient('short_name'));
+        $view->browser_logo        = getBrowserLogo($uaParser->getClient('short_name'));
         $view->browser_family      = \DeviceDetector\Parser\Client\Browser::getBrowserFamily($uaParser->getClient('short_name'));
-        $view->browser_family_logo = getBrowserFamilyLogoExtended($view->browser_family);
+        $view->browser_family_logo = getBrowserFamilyLogo($view->browser_family);
         $view->os_name             = $uaParser->getOs('name');
-        $view->os_logo             = getOsLogoExtended($uaParser->getOs('short_name'));
+        $view->os_logo             = getOsLogo($uaParser->getOs('short_name'));
         $view->os_short_name       = $uaParser->getOs('short_name');
         $view->os_family           = \DeviceDetector\Parser\OperatingSystem::getOsFamily($uaParser->getOs('short_name'));
-        $view->os_family_logo      = getOsFamilyLogoExtended($view->os_family);
+        $view->os_family_logo      = getOsFamilyLogo($view->os_family);
         $view->os_version          = $uaParser->getOs('version');
         $view->device_type         = getDeviceTypeLabel($uaParser->getDeviceName());
         $view->device_type_logo    = getDeviceTypeLogo($uaParser->getDeviceName());
@@ -96,7 +96,7 @@ class Controller extends \Piwik\Plugin\Controller
                 $availableBrowsers = \DeviceDetector\Parser\Client\Browser::getAvailableBrowsers();
 
                 foreach ($availableBrowsers as $short => $name) {
-                    $list[$name] = getBrowserLogoExtended($short);
+                    $list[$name] = getBrowserLogo($short);
                 }
                 break;
 
@@ -104,7 +104,7 @@ class Controller extends \Piwik\Plugin\Controller
                 $availableBrowserFamilies = \DeviceDetector\Parser\Client\Browser::getAvailableBrowserFamilies();
 
                 foreach ($availableBrowserFamilies as $name => $browsers) {
-                    $list[$name] = getBrowserFamilyLogoExtended($name);
+                    $list[$name] = getBrowserFamilyLogo($name);
                 }
                 break;
 
@@ -112,7 +112,7 @@ class Controller extends \Piwik\Plugin\Controller
                 $availableOSs = \DeviceDetector\Parser\OperatingSystem::getAvailableOperatingSystems();
 
                 foreach ($availableOSs as $short => $name) {
-                    $list[$name] = getOsLogoExtended($short);
+                    $list[$name] = getOsLogo($short);
                 }
                 break;
 
@@ -120,7 +120,7 @@ class Controller extends \Piwik\Plugin\Controller
                 $osFamilies = \DeviceDetector\Parser\OperatingSystem::getAvailableOperatingSystemFamilies();
 
                 foreach ($osFamilies as $name => $oss) {
-                    $list[$name] = getOsFamilyLogoExtended($name);
+                    $list[$name] = getOsFamilyLogo($name);
                 }
                 break;
 
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index 12f18b19d1..cb4c109b22 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -25,7 +25,7 @@ function getBrandLogo($label)
     }
 }
 
-function getBrowserFamilyFullNameExtended($label)
+function getBrowserFamilyFullName($label)
 {
     foreach (BrowserParser::getAvailableBrowserFamilies() as $name => $family) {
         if (in_array($label, $family)) {
@@ -35,16 +35,16 @@ function getBrowserFamilyFullNameExtended($label)
     return Piwik::translate('General_Unknown');
 }
 
-function getBrowserFamilyLogoExtended($label)
+function getBrowserFamilyLogo($label)
 {
     $browserFamilies = BrowserParser::getAvailableBrowserFamilies();
     if (!empty($label) && array_key_exists($label, $browserFamilies)) {
-        return getBrowserLogoExtended($browserFamilies[$label][0]);
+        return getBrowserLogo($browserFamilies[$label][0]);
     }
-    return getBrowserLogoExtended($label);
+    return getBrowserLogo($label);
 }
 
-function getBrowserNameExtended($label)
+function getBrowserName($label)
 {
     $short = substr($label, 0, 2);
     $ver = substr($label, 3, 10);
@@ -67,7 +67,7 @@ function getBrowserNameExtended($label)
  *
  * @return string  path to image
  */
-function getBrowserLogoExtended($short)
+function getBrowserLogo($short)
 {
     $path = 'plugins/UserSettings/images/browsers/%s.gif';
 
@@ -82,7 +82,7 @@ function getBrowserLogoExtended($short)
         }
     }
 
-    $family = getBrowserFamilyFullNameExtended($short);
+    $family = getBrowserFamilyFullName($short);
 
     $browserFamilies = BrowserParser::getAvailableBrowserFamilies();
 
@@ -173,28 +173,35 @@ function getModelName($label)
     return $label;
 }
 
-function getOSFamilyFullNameExtended($label)
+function getOSFamilyFullName($label)
 {
     if ($label == \Piwik\Tracker\Settings::OS_BOT) {
         return 'Bot';
     }
     $label = OperatingSystemParser::getOsFamily($label);
+
+    if ($label == 'unknown') {
+        $label = Piwik::translate('General_Unknown');
+    } else if ($label == 'Gaming Console') {
+        $label = Piwik::translate('UserSettings_GamingConsole');
+    }
+
     if ($label !== false) {
         return $label;
     }
     return Piwik::translate('General_Unknown');
 }
 
-function getOsFamilyLogoExtended($label)
+function getOsFamilyLogo($label)
 {
     $osFamilies = OperatingSystemParser::getAvailableOperatingSystemFamilies();
     if (!empty($label) && array_key_exists($label, $osFamilies)) {
-        return getOsLogoExtended($osFamilies[$label][0]);
+        return getOsLogo($osFamilies[$label][0]);
     }
-    return getOsLogoExtended($label);
+    return getOsLogo($label);
 }
 
-function getOsFullNameExtended($label)
+function getOsFullName($label)
 {
     if (substr($label, 0, 3) == \Piwik\Tracker\Settings::OS_BOT) {
         return 'Bot';
@@ -221,7 +228,7 @@ function getOsFullNameExtended($label)
  *
  * @return string  path to image
  */
-function getOsLogoExtended($short)
+function getOsLogo($short)
 {
     $path = 'plugins/UserSettings/images/os/%s.gif';
 
@@ -235,7 +242,7 @@ function getOsLogoExtended($short)
         }
     }
 
-    $family = getOsFamilyFullNameExtended($short);
+    $family = getOSFamilyFullName($short);
     $osFamilies = OperatingSystemParser::getAvailableOperatingSystemFamilies();
 
     if (!empty($short) &&