diff options
author | sgiehl <stefan@piwik.org> | 2015-04-04 19:19:25 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2015-04-04 19:19:25 +0300 |
commit | 5e7b85f7c154abe04590d76a1eef148122f704b0 (patch) | |
tree | 8dd41e4fb31e6f342e0388db7fac91c5b7767745 | |
parent | 56c7f5d3dd0e213d5a6755d496e0d778b027312b (diff) |
added translation for new device type; fixed tests
7 files changed, 27 insertions, 1 deletions
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index f47ba4c175..d19f0e3b46 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 7009992d34..df313e9142 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 3f2929faff..745f9c6095 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -37,6 +37,12 @@ <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> <segment>deviceType==portable+media+player</segment> 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 3f2929faff..745f9c6095 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml @@ -37,6 +37,12 @@ <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> <segment>deviceType==portable+media+player</segment> 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 31bbd93f01..6b1fedb0c5 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 @@ -38,6 +38,12 @@ <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> <segment>deviceType==portable+media+player</segment> 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 31bbd93f01..6b1fedb0c5 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 @@ -38,6 +38,12 @@ <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> <segment>deviceType==portable+media+player</segment> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index add85693bb..b7936fb1ab 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> |