diff options
author | sgiehl <stefan@piwik.org> | 2014-06-17 11:10:02 +0400 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2014-06-17 11:10:02 +0400 |
commit | 90c3dd9efec74bfb5cecef93d4550d6d392cb659 (patch) | |
tree | 685b923099b9b7572564fdc7cf4c8d050123e33e /plugins/DevicesDetection/functions.php | |
parent | 960e6053d738bde4b30d126e7fd76862dfff6ee5 (diff) |
cs
Diffstat (limited to 'plugins/DevicesDetection/functions.php')
-rw-r--r-- | plugins/DevicesDetection/functions.php | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index 376912b035..af76162f01 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -86,9 +86,16 @@ function getBrowserLogoExtended($short) $browserFamilies = BrowserParser::getAvailableBrowserFamilies(); - if (!empty($short) && array_key_exists($short, BrowserParser::getAvailableBrowsers()) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) { + if (!empty($short) && + array_key_exists($short, BrowserParser::getAvailableBrowsers()) && + file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) { + return sprintf($path, $short); - } elseif (!empty($short) && array_key_exists($family, $browserFamilies) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $browserFamilies[$family][0]))) { + + } elseif (!empty($short) && + array_key_exists($family, $browserFamilies) && + file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $browserFamilies[$family][0]))) { + return sprintf($path, $browserFamilies[$family][0]); } return sprintf($path, 'UNK'); @@ -119,7 +126,10 @@ function getDeviceTypeLabel($label) $deviceTypes = DeviceParser::getAvailableDeviceTypes(); - if (is_numeric($label) && in_array($label, $deviceTypes) && isset($translations[array_search($label, $deviceTypes)])) { + if (is_numeric($label) && + in_array($label, $deviceTypes) && + isset($translations[array_search($label, $deviceTypes)])) { + return Piwik::translate($translations[array_search($label, $deviceTypes)]); } else if (isset($translations[$label])) { return Piwik::translate($translations[$label]); @@ -228,9 +238,16 @@ function getOsLogoExtended($short) $family = getOsFamilyFullNameExtended($short); $osFamilies = OperatingSystemParser::getAvailableOperatingSystemFamilies(); - if (!empty($short) && array_key_exists($short, OperatingSystemParser::getAvailableOperatingSystems()) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) { + if (!empty($short) && + array_key_exists($short, OperatingSystemParser::getAvailableOperatingSystems()) && + file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) { + return sprintf($path, $short); - } elseif (!empty($family) && array_key_exists($family, $osFamilies) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $osFamilies[$family][0]))) { + + } elseif (!empty($family) && + array_key_exists($family, $osFamilies) && + file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $osFamilies[$family][0]))) { + return sprintf($path, $osFamilies[$family][0]); } return sprintf($path, 'UNK'); |