Version 3 cleanup before release

Author: Joshua Brule

API.php

@@ -45,10 +45,11 @@ protected function init()
     private function createIdSiteSetting(){
         return $this->makeSetting('idSite', $default = "", FieldConfig::TYPE_STRING, function (FieldConfig $field) {
             $field->title = $this->t('idSiteSettingTitle');
+            $field->introduction = $this->t('PluginDescription');
             $field->uiControl = FieldConfig::UI_CONTROL_TEXT;
             $field->uiControlAttributes = array("size" => "6", "maxlength" => "8");
-            $field->description = $this->t('TitleSettingDescription');
-            $field->inlineHelp = sprintf('<br/>Probably not useful in most scenarios. The idSite option is included for completeness.<br/><br/>Default: %s',$this->t('TitleSettingDefault'));
+            $field->description = $this->t('idSiteSettingDescription');
+            $field->inlineHelp = sprintf('<br/>Probably not useful in most scenarios. The idSite option is included for completeness.<br/><br/>Default: %s',$this->t('idSiteSettingDefault'));
             $field->validate = function ($value, $setting) {
                 if ($value != "" && preg_match("/^[0-9]+$/",$value) !== 1) {
                 throw new \Exception('Value is invalid. Must be positive integer');

SystemSettings.php

@@ -1,18 +1,18 @@
 {
     "TrackingCodeCustomizer": {
-        "PluginDescription":"The provided values will replace the defaults in the generated tracking code (leave blank to use defaults). Viewing https://github.com/piwik/piwik/blob/master/core/Tracker/TrackerCodeGenerator.php is recommended to deconstruct how the tracking code is built.",
+        "PluginDescription":"The provided values will replace the defaults in the generated tracking code (leave blank to use defaults). Viewing https://github.com/matomo-org/matomo/blob/master/core/Tracker/TrackerCodeGenerator.php is recommended to deconstruct how the tracking code is built.",
         "idSiteSettingTitle":"idSite",
         "idSiteSettingDescription":"The siteId that will be included in the tracking code.",
         "idSiteSettingDefault":"Dependent on selected site.",
         "protocolSettingTitle":"protocol",
         "protocolSettingDescription":"Piwik url protocol.",
-        "protocolSettingDefault":"\"//\"",
+        "protocolSettingDefault":"\"//\" <- Protocol relative",
         "piwikUrlSettingTitle":"piwikUrl",
         "piwikUrlSettingDescription":"The tracker URL to use.\nDefault: Same as Matomo installation path",
         "piwikUrlSettingDefault":"Same as Matomo installation path",
         "httpsPiwikUrlSettingTitle":"httpsPiwikUrl",
         "httpsPiwikUrlSettingDescription":"Set if the HTTPS domain is different from the normal domain.",
-        "httpsPiwikUrlSettingDefault":"Attempts to detect protocol and retrieves using piwikUrl.<br/>Note: Setting a value here will disable protocol checking and force https.",
+        "httpsPiwikUrlSettingDefault":"Empty<br/>Note: Setting a value here will add a protocol check condition to the tracking code.",
         "optionsSettingTitle":"options",
         "optionsSettingDescription":"A string of JavaScript code that customizes the JavaScript tracker (after _paq = _paq || [] and before trackPageView).",
         "optionsSettingDefault":"Empty",