diff options
| author | Stefan Giehl <stefan@matomo.org> | 2020-12-07 18:21:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 18:21:20 +0300 |
| commit | 28efeafae6c9540060f39a5e1f76b4da3ad6c8bc (patch) | |
| tree | 150650e4ffd9c1a0d015f8446a903ade478da112 /plugins/DevicesDetection | |
| parent | 2ff0bf2194dea0a62474a60f7209f420dc5cda07 (diff) | |
updates device detector to 4.0.2 (#16900)
* updates device detector to 4.0.2
* Adds missing device type peripheral and update tests
* submodule update
* updates icon submodule
* update expected ui files
Diffstat (limited to 'plugins/DevicesDetection')
4 files changed, 10 insertions, 2 deletions
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index e509123721..5bef26bfb7 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -178,6 +178,7 @@ function getDeviceTypeLabel($label) 'portable media player' => 'DevicesDetection_PortableMediaPlayer', 'smart speaker' => 'DevicesDetection_SmartSpeaker', 'wearable' => 'DevicesDetection_Wearable', + 'peripheral' => 'DevicesDetection_Peripheral', ); $deviceTypes = DeviceParser::getAvailableDeviceTypes(); diff --git a/plugins/DevicesDetection/lang/en.json b/plugins/DevicesDetection/lang/en.json index 466edb59f7..934c11a1fe 100644 --- a/plugins/DevicesDetection/lang/en.json +++ b/plugins/DevicesDetection/lang/en.json @@ -46,6 +46,7 @@ "GenericDevice": "Generic %s", "MobileDevice": "Mobile device", "Tablet": "Tablet", + "Peripheral": "Peripheral", "Phablet": "Phablet", "TV": "Tv", "UserAgent": "User-Agent", diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml index 1e4dc2c09c..5b3523672f 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml @@ -118,7 +118,7 @@ <segment>deviceBrand==Philips;deviceModel==Blu-ray+Player+%28BDP5600%29</segment> </row> <row> - <label>Samsung - GALAXY Tab 3 8.0" WiFi</label> + <label>Samsung - Galaxy Tab 3 8.0" WiFi</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -127,7 +127,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <segment>deviceBrand==Samsung;deviceModel==GALAXY+Tab+3+8.0%22+WiFi</segment> + <segment>deviceBrand==Samsung;deviceModel==Galaxy+Tab+3+8.0%22+WiFi</segment> </row> <row> <label>ViewSonic - ViewPad 7e</label> diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml index 6a22c1926e..6aa976d8f7 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml @@ -125,6 +125,12 @@ <logo>plugins/Morpheus/icons/dist/devices/feature_phone.png</logo> </row> <row> + <label>Peripheral</label> + <nb_visits>0</nb_visits> + <segment>deviceType==peripheral</segment> + <logo>plugins/Morpheus/icons/dist/devices/peripheral.png</logo> + </row> + <row> <label>Phablet</label> <nb_visits>0</nb_visits> <segment>deviceType==phablet</segment> |