Refs #3612

 * making some tests pass == fixing bugs

3 files changed, 23 insertions, 19 deletions

diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 7403f29329..e9cb732e8c 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -169,7 +169,9 @@ class Piwik_DevicesDetection extends Piwik_Plugin
                 Piwik_Exec($q2);
             }
         } catch (Exception $e) {
-            throw $e;
+           if (!Zend_Registry::get('db')->isErrNo($e, '1060')) {
+                throw $e;
+            }
         }
     }
 
diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
index c0a2825811..9031b0fd33 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
@@ -228,7 +228,7 @@ class UserAgentParserEnhanced
     public static $browserFamilies = array(

         'Android Browser' => array('AN'),

         'BlackBerry Browser' => array('BB'),

-        'Chrome' => array('CH', 'CM', 'CI', 'CF', 'CR'),

+        'Chrome' => array('CH', 'CM', 'CI', 'CF', 'CR', 'RM'),

         'Firefox' => array('FF', 'FE', 'SX', 'FB', 'PX', 'MB'),

         'Internet Explorer' => array('IE', 'IM'),

         'Konqueror' => array('KO'),

@@ -314,6 +314,8 @@ class UserAgentParserEnhanced
         'WO' => 'wOSBrowser',

         'YA' => 'Yandex Browser'

     );

+

+    const UNKNOWN = "UNK";

     protected static $regexesDir = '/regexes/';

     protected static $osRegexesFile = 'oss.yml';

     protected static $browserRegexesFile = 'browsers.yml';

@@ -406,7 +408,7 @@ class UserAgentParserEnhanced
         if (in_array($browserRegex['name'], self::$browsers)) {

             $short = array_search($browserRegex['name'], self::$browsers);

         } else {

-            $short = 'UN';

+            $short = 'XX';

         }

 

         $this->browser = array(

@@ -630,8 +632,9 @@ class UserAgentParserEnhanced
     public function isDesktop()

     {

         $osName = $this->getOs('name');

-        if (empty($osName))

+        if (empty($osName) || empty(self::$osShorts[$osName])) {

             return false;

+        }

 

         $osShort = self::$osShorts[$osName];

         foreach (self::$osFamilies as $family => $familyOs) {

@@ -650,7 +653,7 @@ class UserAgentParserEnhanced
         }

 

         if (!isset($this->os[$attr])) {

-            return '';

+            return self::UNKNOWN;

         }

 

         if ($attr == 'version') {

@@ -666,7 +669,7 @@ class UserAgentParserEnhanced
         }

 

         if (!isset($this->browser[$attr])) {

-            return '';

+            return self::UNKNOWN;

         }

 

         return $this->browser[$attr];

@@ -701,7 +704,7 @@ class UserAgentParserEnhanced
                 return $osFamily;

             }

         }

-        error_log($osLabel);

+

         return 'Other';

     }

 

diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index 55a538d1d6..34f8ed8690 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -26,7 +26,7 @@ function Piwik_getBrowserFamilyFullNameExtended($label)
             return $name;
         }
     }
-    return "Unknown";
+    return Piwik_Translate('General_Unknown');
 }
 
 function Piwik_getBrowserFamilyLogoExtended($label)
@@ -46,7 +46,7 @@ function Piwik_getBrowserNameExtended($label)
     if (array_key_exists($short, UserAgentParserEnhanced::$browsers)) {
         return trim(ucfirst(UserAgentParserEnhanced::$browsers[$short]) . ' ' . $ver);
     } else {
-        return "Unknown";
+        return Piwik_Translate('General_Unknown');
     }
 }
 
@@ -65,7 +65,7 @@ function Piwik_getDeviceBrandLabel($label)
     if (array_key_exists($label, UserAgentParserEnhanced::$deviceBrands)) {
         return ucfirst(UserAgentParserEnhanced::$deviceBrands[$label]);
     } else {
-        return "Unknown";
+        return Piwik_Translate('General_Unknown');
     }
 }
 
@@ -74,7 +74,7 @@ function Piwik_getDeviceTypeLabel($label)
     if (isset(UserAgentParserEnhanced::$deviceTypes[$label])) {
         return ucfirst(UserAgentParserEnhanced::$deviceTypes[$label]);
     } else {
-        return "Unknown";
+        return Piwik_Translate('General_Unknown');
     }
 }
 
@@ -99,10 +99,10 @@ function Piwik_getDeviceTypeLogo($label)
 
 function Piwik_getModelName($label)
 {
-    if (!$label)
-        return "Unknown";
-    else
-        return $label;
+    if (!$label) {
+        return Piwik_Translate('General_Unknown');
+    }
+    return $label;
 }
 
 function Piwik_getOSFamilyFullNameExtended($label)
@@ -112,7 +112,7 @@ function Piwik_getOSFamilyFullNameExtended($label)
             return $name;
         }
     }
-    return "Unknown";
+    return Piwik_Translate('General_Unknown');
 }
 
 function Piwik_getOsFamilyLogoExtended($label)
@@ -127,7 +127,7 @@ function Piwik_getOsFamilyLogoExtended($label)
 
 function Piwik_getOsFullNameExtended($label)
 {
-    if ($label != "" && $label != ";") {
+    if (!empty($label) && $label != ";") {
         $os = substr($label, 0, 3);
         $ver = substr($label, 4, 15);
         $osFullName = array_search($os, UserAgentParserEnhanced::$osShorts);
@@ -138,9 +138,8 @@ function Piwik_getOsFullNameExtended($label)
                 return trim($osFullName . " " . $ver);
             }
         }
-    } else {
-        return "Unknown";
     }
+    return Piwik_Translate('General_Unknown');
 }
 
 function Piwik_getOsLogoExtended($label)