diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index f47ba4c175e0aa33ac3e0dc2edfba376226ebe5b..d19f0e3b46efa5c04dede0311ce4292968dc2714 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -127,6 +127,7 @@ function getDeviceTypeLabel($label) 'desktop' => 'General_Desktop', 'smartphone' => 'DevicesDetection_Smartphone', 'tablet' => 'DevicesDetection_Tablet', + 'phablet' => 'DevicesDetection_Phablet', 'feature phone' => 'DevicesDetection_FeaturePhone', 'console' => 'DevicesDetection_Console', 'tv' => 'DevicesDetection_TV', diff --git a/plugins/DevicesDetection/lang/en.json b/plugins/DevicesDetection/lang/en.json index 7009992d3414ba05c5cc558292a7b3e05eaadf26..df313e9142b288a689373a87dd7a9d17ade9e84c 100644 --- a/plugins/DevicesDetection/lang/en.json +++ b/plugins/DevicesDetection/lang/en.json @@ -35,6 +35,7 @@ "PortableMediaPlayer": "Portable media player", "Devices": "Devices", "Tablet": "Tablet", + "Phablet": "Phablet", "TV": "Tv", "UserAgent": "User-Agent", "WidgetBrowsers": "Visitor Browser", diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index 3f2929faffdd0b59f1c54d1153b728f35b8c7f80..745f9c609537f910d30bda2a47238bdf42573f0d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -36,6 +36,12 @@ <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> + <row> + <label>Phablet</label> + <nb_visits>0</nb_visits> + <segment>deviceType==phablet</segment> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml index 3f2929faffdd0b59f1c54d1153b728f35b8c7f80..745f9c609537f910d30bda2a47238bdf42573f0d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml @@ -36,6 +36,12 @@ <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> + <row> + <label>Phablet</label> + <nb_visits>0</nb_visits> + <segment>deviceType==phablet</segment> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index 31bbd93f01fb0d3939d19099c7612ad8295b70c5..6b1fedb0c5a7622ea6d4a011888cca6f569a0c8f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -37,6 +37,12 @@ <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> + <row> + <label>Phablet</label> + <nb_visits>0</nb_visits> + <segment>deviceType==phablet</segment> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml index 31bbd93f01fb0d3939d19099c7612ad8295b70c5..6b1fedb0c5a7622ea6d4a011888cca6f569a0c8f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml @@ -37,6 +37,12 @@ <segment>deviceType==feature+phone</segment> <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> </row> + <row> + <label>Phablet</label> + <nb_visits>0</nb_visits> + <segment>deviceType==phablet</segment> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index add85693bbb308c173d7735681137fa77c3a3876..b7936fb1ab7717025238e500faa9f36dfd88723c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -134,7 +134,7 @@ <category>Visit</category> <name>Device type</name> <segment>deviceType</segment> - <acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera, portable media player</acceptedValues> + <acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera, portable media player, phablet</acceptedValues> </row> <row> <type>dimension</type>