Skip to content

Commit

Permalink
added Jolla smartphone to UserAgentParserEnhanced.
Browse files Browse the repository at this point in the history
Added Jolla as a new device brand.
Added Sailfish OS as a new OS.
Added SailfishBrowser as a new browser.
  • Loading branch information
dawnbreak committed Dec 24, 2013
1 parent 36f620f commit a86aab3
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class UserAgentParserEnhanced
'IN' => 'Innostream',
'IO' => 'i-mobile',
'IQ' => 'INQ',
'JO' => 'Jolla',
'KA' => 'Karbonn',
'KD' => 'KDDI',
'KN' => 'Kindle',
Expand Down Expand Up @@ -173,6 +174,7 @@ class UserAgentParserEnhanced
'Puppy' => 'PPY',
'Red Hat' => 'RHT',
'SUSE' => 'SSE',
'Sailfish OS' => 'SAF',
'Slackware' => 'SLW',
'Solaris' => 'SOS',
'Syllable' => 'SYL',
Expand Down Expand Up @@ -226,6 +228,7 @@ class UserAgentParserEnhanced
'Mac' => array('MAC'),
'Mobile Gaming Console' => array('PSP', 'NDS', 'XBX'),
'Other Mobile' => array('WOS', 'POS', 'QNX', 'SBA', 'TIZ'),
'Sailfish' => array('SAF'),
'Simulator' => array('TKT', 'WWP'),
'Symbian' => array('SYM', 'SYS', 'SY3', 'S60', 'S40', 'SMG'),
'Unix' => array('SOS', 'AIX', 'HPX', 'BSD', 'NBS', 'OBS', 'DFB', 'SYL', 'IRI', 'T64'),
Expand All @@ -243,7 +246,8 @@ class UserAgentParserEnhanced
'NetFront' => array('NF'),
'Nokia Browser' => array('NB'),
'Opera' => array('OP', 'OM', 'OI'),
'Safari' => array('SF', 'MF')
'Safari' => array('SF', 'MF'),
'Sailfish Browser' => array('SA')
);
public static $browsers = array(
'AB' => 'ABrowse',
Expand Down Expand Up @@ -313,6 +317,7 @@ class UserAgentParserEnhanced
'PX' => 'Phoenix',
'RK' => 'Rekonq',
'RM' => 'RockMelt',
'SA' => 'Sailfish Browser',
'SF' => 'Safari',
'SM' => 'SeaMonkey',
'SN' => 'Snowshoe',
Expand Down Expand Up @@ -753,4 +758,4 @@ public static function getOsNameFromId($os, $ver = false)
return false;
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
# @package DevicesDetection
###############

#SailfishBrowser
- regex: 'SailfishBrowser/(\d+\.\d+)'
name: Sailfish Browser
version: '$1'

# SeaMonkey
- regex: '(Iceape|SeaMonkey|gnuzilla)/(\d+\.\d+)'
name: $1
Expand Down Expand Up @@ -416,8 +421,8 @@
- regex: 'Version/(\d+\.\d+).*Safari/|Safari/\d+'
name: Safari
version: '$1'

#Android Browser
- regex: 'Android'
name: Android Browser
version: ''
version: ''
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,12 @@ iKoMo:
device: 'feature phone'
model: '$1'

# Jolla
Jolla:
regex: 'Jolla'
device: 'smartphone'
model: ''

# kddi
KDDI:
regex: 'kddi-([A-Za-z0-9]+)'
Expand Down Expand Up @@ -955,4 +961,4 @@ ZTE:
# Change name from Nokia to other to not change above Nokia element
#Nokia:
# regex: 'Symbian'
# device: 'feature phone'
# device: 'feature phone'
19 changes: 14 additions & 5 deletions plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,18 @@
- regex: 'Tizen'
name: 'Tizen'
version: ''






##########
## Sailfish OS
###########
- regex: 'Sailfish|Jolla'
name: 'Sailfish OS'
version: ''



##########
# Android
##########
Expand Down Expand Up @@ -264,7 +273,7 @@
name: 'Symbian'
version: ''



##########
# Firefox OS
Expand Down Expand Up @@ -424,4 +433,4 @@
name: 'Bot '
version: ''



Binary file added plugins/DevicesDetection/images/brand/Jolla.ico
Binary file not shown.
Binary file added plugins/UserSettings/images/browsers/SA.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added plugins/UserSettings/images/os/SAF.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a86aab3

Please sign in to comment.