Set name and default value for certain dimensions. (#16684)

15 files changed, 62 insertions, 4 deletions

diff --git a/plugins/Actions/Columns/TimeSpentRefAction.php b/plugins/Actions/Columns/TimeSpentRefAction.php
index 629da1d893..350e5041b7 100644
--- a/plugins/Actions/Columns/TimeSpentRefAction.php
+++ b/plugins/Actions/Columns/TimeSpentRefAction.php
@@ -18,6 +18,7 @@ class TimeSpentRefAction extends ActionDimension
     protected $columnName = 'time_spent_ref_action';
     protected $columnType = 'INTEGER(10) UNSIGNED NULL';
     protected $type = self::TYPE_DURATION_S;
+    protected $nameSingular = 'Actions_TimeSpentInReferringAction';
 
     public function onNewAction(Request $request, Visitor $visitor, Action $action)
     {
diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json
index 209b3ce8da..af73c89f44 100644
--- a/plugins/Actions/lang/en.json
+++ b/plugins/Actions/lang/en.json
@@ -78,6 +78,7 @@
         "WidgetSearchNoResultKeywords": "Search Keywords with No Results",
         "ActionType": "Action Type",
         "ActionTypes": "Action Types",
-        "Behaviour": "Behaviour"
+        "Behaviour": "Behaviour",
+        "TimeSpentInReferringAction": "Time Spent in Referring Action"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/Columns/VisitsCount.php b/plugins/CoreHome/Columns/VisitsCount.php
index 6e1d65840b..ce81f7b431 100644
--- a/plugins/CoreHome/Columns/VisitsCount.php
+++ b/plugins/CoreHome/Columns/VisitsCount.php
@@ -18,7 +18,7 @@ use Piwik\Tracker\Visitor;
 class VisitsCount extends VisitDimension
 {
     protected $columnName = 'visitor_count_visits';
-    protected $columnType = 'INT(11) UNSIGNED NOT NULL';
+    protected $columnType = 'INT(11) UNSIGNED NOT NULL DEFAULT 0';
     protected $segmentName = 'visitCount';
     protected $nameSingular = 'General_NumberOfVisits';
     protected $type = self::TYPE_NUMBER;
diff --git a/plugins/DevicePlugins/Columns/PluginCookie.php b/plugins/DevicePlugins/Columns/PluginCookie.php
index c07f1f80f1..5a13ec78bb 100644
--- a/plugins/DevicePlugins/Columns/PluginCookie.php
+++ b/plugins/DevicePlugins/Columns/PluginCookie.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\DevicePlugins\Columns;
 
 use Piwik\Common;
+use Piwik\Piwik;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -19,6 +20,11 @@ class PluginCookie extends DevicePluginColumn
     protected $columnType = 'TINYINT(1) NULL';
     protected $type = self::TYPE_BOOL;
 
+    public function getName()
+    {
+        return Piwik::translate('General_Plugin') . ' (Cookie)';
+    }
+
     /**
      * @param Request $request
      * @param Visitor $visitor
diff --git a/plugins/DevicePlugins/Columns/PluginFlash.php b/plugins/DevicePlugins/Columns/PluginFlash.php
index 299a4bb13a..9508f4c688 100644
--- a/plugins/DevicePlugins/Columns/PluginFlash.php
+++ b/plugins/DevicePlugins/Columns/PluginFlash.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\DevicePlugins\Columns;
 
 use Piwik\Common;
+use Piwik\Piwik;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -19,6 +20,11 @@ class PluginFlash extends DevicePluginColumn
     protected $columnType = 'TINYINT(1) NULL';
     protected $type = self::TYPE_BOOL;
 
+    public function getName()
+    {
+        return Piwik::translate('General_Plugin') . ' (Flash)';
+    }
+
     /**
      * @param Request $request
      * @param Visitor $visitor
diff --git a/plugins/DevicePlugins/Columns/PluginJava.php b/plugins/DevicePlugins/Columns/PluginJava.php
index 627db0f914..0cd7a647ca 100644
--- a/plugins/DevicePlugins/Columns/PluginJava.php
+++ b/plugins/DevicePlugins/Columns/PluginJava.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\DevicePlugins\Columns;
 
 use Piwik\Common;
+use Piwik\Piwik;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -19,6 +20,11 @@ class PluginJava extends DevicePluginColumn
     protected $columnType = 'TINYINT(1) NULL';
     protected $type = self::TYPE_BOOL;
 
+    public function getName()
+    {
+        return Piwik::translate('General_Plugin') . ' (Java)';
+    }
+
     /**
      * @param Request $request
      * @param Visitor $visitor
diff --git a/plugins/DevicePlugins/Columns/PluginPdf.php b/plugins/DevicePlugins/Columns/PluginPdf.php
index 02971f6fac..2cdbbe98cb 100644
--- a/plugins/DevicePlugins/Columns/PluginPdf.php
+++ b/plugins/DevicePlugins/Columns/PluginPdf.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\DevicePlugins\Columns;
 
 use Piwik\Common;
+use Piwik\Piwik;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -19,6 +20,11 @@ class PluginPdf extends DevicePluginColumn
     protected $columnType = 'TINYINT(1) NULL';
     protected $type = self::TYPE_BOOL;
 
+    public function getName()
+    {
+        return Piwik::translate('General_Plugin') . ' (PDF)';
+    }
+
     /**
      * @param Request $request
      * @param Visitor $visitor
diff --git a/plugins/DevicePlugins/Columns/PluginQuickTime.php b/plugins/DevicePlugins/Columns/PluginQuickTime.php
index f95afb7719..0a51dd4b27 100644
--- a/plugins/DevicePlugins/Columns/PluginQuickTime.php
+++ b/plugins/DevicePlugins/Columns/PluginQuickTime.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\DevicePlugins\Columns;
 
 use Piwik\Common;
+use Piwik\Piwik;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -19,6 +20,11 @@ class PluginQuickTime extends DevicePluginColumn
     protected $columnType = 'TINYINT(1) NULL';
     protected $type = self::TYPE_BOOL;
 
+    public function getName()
+    {
+        return Piwik::translate('General_Plugin') . ' (QuickTime)';
+    }
+
     /**
      * @param Request $request
      * @param Visitor $visitor
diff --git a/plugins/DevicePlugins/Columns/PluginRealPlayer.php b/plugins/DevicePlugins/Columns/PluginRealPlayer.php
index c3774deebc..f58da199eb 100644
--- a/plugins/DevicePlugins/Columns/PluginRealPlayer.php
+++ b/plugins/DevicePlugins/Columns/PluginRealPlayer.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\DevicePlugins\Columns;
 
 use Piwik\Common;
+use Piwik\Piwik;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -19,6 +20,11 @@ class PluginRealPlayer extends DevicePluginColumn
     protected $columnType = 'TINYINT(1) NULL';
     protected $type = self::TYPE_BOOL;
 
+    public function getName()
+    {
+        return Piwik::translate('General_Plugin') . ' (RealPlayer)';
+    }
+
     /**
      * @param Request $request
      * @param Visitor $visitor
diff --git a/plugins/DevicePlugins/Columns/PluginSilverlight.php b/plugins/DevicePlugins/Columns/PluginSilverlight.php
index 833962b88a..352631b129 100644
--- a/plugins/DevicePlugins/Columns/PluginSilverlight.php
+++ b/plugins/DevicePlugins/Columns/PluginSilverlight.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\DevicePlugins\Columns;
 
 use Piwik\Common;
+use Piwik\Piwik;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -19,6 +20,11 @@ class PluginSilverlight extends DevicePluginColumn
     protected $columnType = 'TINYINT(1) NULL';
     protected $type = self::TYPE_BOOL;
 
+    public function getName()
+    {
+        return Piwik::translate('General_Plugin') . ' (Silverlight)';
+    }
+
     /**
      * @param Request $request
      * @param Visitor $visitor
diff --git a/plugins/DevicePlugins/Columns/PluginWindowsMedia.php b/plugins/DevicePlugins/Columns/PluginWindowsMedia.php
index 40ec7ed610..252110e2d8 100644
--- a/plugins/DevicePlugins/Columns/PluginWindowsMedia.php
+++ b/plugins/DevicePlugins/Columns/PluginWindowsMedia.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\DevicePlugins\Columns;
 
 use Piwik\Common;
+use Piwik\Piwik;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -19,6 +20,11 @@ class PluginWindowsMedia extends DevicePluginColumn
     protected $columnType = 'TINYINT(1) NULL';
     protected $type = self::TYPE_BOOL;
 
+    public function getName()
+    {
+        return Piwik::translate('General_Plugin') . ' (Windows Media)';
+    }
+
     /**
      * @param Request $request
      * @param Visitor $visitor
diff --git a/plugins/PrivacyManager/tests/Integration/Dao/LogDataAnonymizerTest.php b/plugins/PrivacyManager/tests/Integration/Dao/LogDataAnonymizerTest.php
index c06e951ae9..9c06efc76f 100644
--- a/plugins/PrivacyManager/tests/Integration/Dao/LogDataAnonymizerTest.php
+++ b/plugins/PrivacyManager/tests/Integration/Dao/LogDataAnonymizerTest.php
@@ -193,6 +193,7 @@ class LogDataAnonymizerTest extends IntegrationTestCase
             'visitor_returning' => null,
             'visitor_seconds_since_first' => null,
             'visitor_seconds_since_order' => null,
+            'visitor_count_visits' => '0',
             'visit_entry_idaction_name' => null,
             'visit_entry_idaction_url' => null,
             'visit_exit_idaction_name' => null,
diff --git a/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableVisitColumnsToAnonymize.xml b/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableVisitColumnsToAnonymize.xml
index 1148072adb..7f0c1453ad 100755
--- a/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableVisitColumnsToAnonymize.xml
+++ b/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableVisitColumnsToAnonymize.xml
@@ -225,6 +225,10 @@
 		<default_value />
 	</row>
 	<row>
+		<column_name>visitor_count_visits</column_name>
+		<default_value>0</default_value>
+	</row>
+	<row>
 		<column_name>visitor_localtime</column_name>
 		<default_value />
 	</row>
diff --git a/plugins/UserCountry/Columns/Provider.php b/plugins/UserCountry/Columns/Provider.php
index fb50378d8d..a2e76a9878 100644
--- a/plugins/UserCountry/Columns/Provider.php
+++ b/plugins/UserCountry/Columns/Provider.php
@@ -19,7 +19,8 @@ class Provider extends Base
     protected $columnName = 'location_provider';
     protected $type = self::TYPE_TEXT;
     protected $category = 'UserCountry_VisitLocation';
-
+    protected $nameSingular = 'UserCountry_InternetServiceProvider';
+    protected $namePlural = 'UserCountry_InternetServiceProviderPlural';
     /**
      * @param Request $request
      * @param Visitor $visitor
diff --git a/plugins/UserCountry/lang/en.json b/plugins/UserCountry/lang/en.json
index 4c927f7345..1108c84c4c 100644
--- a/plugins/UserCountry/lang/en.json
+++ b/plugins/UserCountry/lang/en.json
@@ -42,6 +42,8 @@
         "ToGeolocateOldVisits": "To get location data for your old visits, use the script described %1$shere%2$s.",
         "WidgetLocation": "Visitor Location",
         "GeoIpDbIpAccuracyNote": "Note: the DBIP databases are free and can be downloaded automatically, but geolocation results (specifically city results) are not as accurate as MaxMind's. MaxMind, however, requires that you create an account even for the free database. If you want to use MaxMind's geolocation database, you can start the process %1$shere%2$s",
-        "MaxMindLinkExplanation": "If you are using MaxMind's geolocation databases and you do not already know how to generate your download URL, %1$sclick here to learn how%2$s."
+        "MaxMindLinkExplanation": "If you are using MaxMind's geolocation databases and you do not already know how to generate your download URL, %1$sclick here to learn how%2$s.",
+        "InternetServiceProvider": "Internet Service Provider",
+        "InternetServiceProviderPlural": "Internet Service Providers"
     }
 }
\ No newline at end of file