Changing Linux to GNU/Linux Fixes #14 Refs #5276

matomo-org · Jun 10, 2014 · a1001f8 · a1001f8
1 parent a0ba5a3
commit a1001f8
Show file tree

Hide file tree

Showing 12 changed files with 224 additions and 238 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ notifications:
     rooms:
       - piwik:3HWhNh21qPfDACQXTrJOb0mW
       - piwikpro:7OABSbDrywSTo2nv9lD2svXG
-      
+
   irc:
     skip_join: true
     on_success: change

diff --git a/DeviceDetector.php b/DeviceDetector.php
@@ -29,7 +29,7 @@ class DeviceDetector
      *
      * @var array
      */
-    protected static $desktopOsArray = array('AmigaOS', 'IBM', 'Linux', 'Mac', 'Unix', 'Windows', 'BeOS');
+    protected static $desktopOsArray = array('AmigaOS', 'IBM', 'GNU/Linux', 'Mac', 'Unix', 'Windows', 'BeOS');
 
     /**
      * Constant used as value for unknown browser / os

diff --git a/Parser/OperatingSystem.php b/Parser/OperatingSystem.php
@@ -54,7 +54,7 @@ class OperatingSystem extends ParserAbstract
         'INF' => 'Inferno',
         'KNO' => 'Knoppix',
         'KBT' => 'Kubuntu',
-        'LIN' => 'Linux',
+        'LIN' => 'GNU/Linux',
         'LBT' => 'Lubuntu',
         'MAC' => 'Mac',
         'MDR' => 'Mandriva',
@@ -129,7 +129,7 @@ class OperatingSystem extends ParserAbstract
         'IBM'                   => array('OS2'),
         'iOS'                   => array('IOS'),
         'RISC OS'               => array('ROS'),
-        'Linux'                 => array('LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'MDR', 'GNT', 'SAB', 'SLW', 'SSE', 'PPY', 'CES', 'BTR', 'YNS', 'PRS', 'SAF'),
+        'GNU/Linux'             => array('LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'MDR', 'GNT', 'SAB', 'SLW', 'SSE', 'PPY', 'CES', 'BTR', 'YNS', 'PRS', 'SAF'),
         'Mac'                   => array('MAC'),
         'Mobile Gaming Console' => array('PSP', 'NDS', 'XBX'),
         'Other Mobile'          => array('WOS', 'POS', 'SBA', 'TIZ', 'SMG'),

diff --git a/Tests/fixtures/car_browser.yml b/Tests/fixtures/car_browser.yml
@@ -2,7 +2,7 @@
 - 
   user_agent: Mozilla/5.0 (X11; u; Linux; C) AppleWebKit /533.3 (Khtml, like Gheko) QtCarBrowser Safari/533.3
   os:
-    name: Linux
+    name: GNU/Linux
     short_name: LIN
     version:
   client:
@@ -14,5 +14,5 @@
     type: car browser
     brand: TA
     model: Model S
-  os_family: Linux
+  os_family: GNU/Linux
   browser_family: Safari