Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2019-11-04 03:59:49 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2019-11-04 03:59:49 +0300
commit22137c635f58cbc0104dca86cc59db3fd0a16941 (patch)
treeb093d600ddded8fb917b769100c00e77e720ec52 /plugins/DevicesDetection
parentdb4e0f2285dc2ef7cab638a48a1a2e505e4674c4 (diff)
Updates device detector to 3.12.1 (#15055)
* updates device detector to 3.12.1 * adds new device type smart speaker * updates expected test files * updates UI files
Diffstat (limited to 'plugins/DevicesDetection')
-rw-r--r--plugins/DevicesDetection/functions.php1
-rw-r--r--plugins/DevicesDetection/lang/en.json1
-rw-r--r--plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml6
3 files changed, 8 insertions, 0 deletions
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index c4f182a5a1..5399309477 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -134,6 +134,7 @@ function getDeviceTypeLabel($label)
'smart display' => 'DevicesDetection_SmartDisplay',
'camera' => 'DevicesDetection_Camera',
'portable media player' => 'DevicesDetection_PortableMediaPlayer',
+ 'smart speaker' => 'DevicesDetection_SmartSpeaker',
);
$deviceTypes = DeviceParser::getAvailableDeviceTypes();
diff --git a/plugins/DevicesDetection/lang/en.json b/plugins/DevicesDetection/lang/en.json
index 1f7a1a1694..e985e0c060 100644
--- a/plugins/DevicesDetection/lang/en.json
+++ b/plugins/DevicesDetection/lang/en.json
@@ -38,6 +38,7 @@
"PluginDescription": "Provides extended information about user devices, such as Brand (manufacturer), Model (device version), device type (tv, consoles, smart phones, desktop, etc) and more.",
"SmartDisplay": "Smart display",
"Smartphone": "Smartphone",
+ "SmartSpeaker": "Smart speaker",
"PortableMediaPlayer": "Portable media player",
"Devices": "Devices",
"GenericDevice": "Generic %s",
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 6242c1719a..c5ea05a965 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
@@ -142,4 +142,10 @@
<segment>deviceType==smart+display</segment>
<logo>plugins/Morpheus/icons/dist/devices/smart_display.png</logo>
</row>
+ <row>
+ <label>Smart speaker</label>
+ <nb_visits>0</nb_visits>
+ <segment>deviceType==smart+speaker</segment>
+ <logo>plugins/Morpheus/icons/dist/devices/smart_speaker.png</logo>
+ </row>
</result> \ No newline at end of file