Make log and report data screen less technical (#13464)

4 files changed, 22 insertions, 33 deletions

diff --git a/plugins/PrivacyManager/API.php b/plugins/PrivacyManager/API.php
index 01664ce496..32cb354e47 100644
--- a/plugins/PrivacyManager/API.php
+++ b/plugins/PrivacyManager/API.php
@@ -212,8 +212,8 @@ class API extends \Piwik\Plugin\API
         $settings['delete_reports_enable'] = !empty($enableDeleteReports);
 
         $deleteReportsOlderThan = (int) $deleteReportsOlderThan;
-        if ($deleteReportsOlderThan < 3) {
-            $deleteReportsOlderThan = 3;
+        if ($deleteReportsOlderThan < 2) {
+            $deleteReportsOlderThan = 2;
         }
 
         $settings['delete_reports_older_than'] = $deleteReportsOlderThan;
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index 5dc27722ec..606270c1a8 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -58,7 +58,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         // delete reports settings
         $settings['delete_reports_enable'] = Common::getRequestVar("enableDeleteReports", 0);
         $deleteReportsOlderThan = Common::getRequestVar("deleteReportsOlderThan", 3);
-        $settings['delete_reports_older_than'] = $deleteReportsOlderThan < 3 ? 3 : $deleteReportsOlderThan;
+        $settings['delete_reports_older_than'] = $deleteReportsOlderThan < 2 ? 2 : $deleteReportsOlderThan;
         $settings['delete_reports_keep_basic_metrics']   = Common::getRequestVar("keepBasic", 0);
         $settings['delete_reports_keep_day_reports']     = Common::getRequestVar("keepDay", 0);
         $settings['delete_reports_keep_week_reports']    = Common::getRequestVar("keepWeek", 0);
diff --git a/plugins/PrivacyManager/lang/en.json b/plugins/PrivacyManager/lang/en.json
index 0f6660a62c..cc8cecc187 100644
--- a/plugins/PrivacyManager/lang/en.json
+++ b/plugins/PrivacyManager/lang/en.json
@@ -7,27 +7,26 @@
         "AnonymizeIpMaskLengtDescription": "Select how many bytes of the visitors' IPs should be masked.",
         "AnonymizeIpMaskLength": "%1$s byte(s) - e.g. %2$s",
         "AskingForConsent": "Asking for consent",
-        "CannotLockSoDeleteLogActions": "The log_action table will not be purged: please grant the LOCK TABLES privilege to the '%s' MySQL user.",
         "ClickHereSettings": "Click here to access the %s settings.",
         "CurrentDBSize": "Current database size",
         "DBPurged": "DB purged.",
         "DeleteBothConfirm": "You are about to enable both raw data deletion & report data deletion. This will permanently remove your ability to view old analytics data. Are you sure you want to do this?",
-        "DeleteDataDescription": "You can configure Matomo to regularly delete old visitor logs and\/or processed reports to keep your database size small.",
-        "DeleteDataDescription2": "If desired, pre-processed reports will not be deleted, only visit, pageview and conversion raw data will be deleted. Or, the pre-processed reports can be deleted and the raw data can be kept.",
+        "DeleteDataDescription": "You can configure Matomo to regularly delete old raw data and\/or aggregated reports to keep your database small or to meet privacy regulations such as GDPR.",
         "DeleteDataInterval": "Delete old data every",
         "DeleteOldVisitorLogs": "Delete old visitor logs",
-        "DeleteOldArchivedReports": "Delete old archived reports",
+        "DeleteOldRawData": "Regularly delete old raw data",
+        "DeleteOldAggregatedReports": "Delete old aggregated report data",
         "DeleteLogDescription2": "When you enable automatic log deletion, you must ensure that all previous daily reports have been processed, so that no data is lost.",
-        "DeleteLogInfo": "Logs from the following tables will be deleted: %s",
+        "DeleteRawDataInfo": "The raw data contains all details about each individual visit and each action your visitors took. When you delete raw data, the deleted information won't be available anymore in the visitor log. Also if you later decide to create a segment, the segmented reports won't become available for the time frame that has been deleted since all aggregated reports are generated from this raw data.",
         "DeleteLogsConfirm": "You are about to enable raw data deletion. If old raw data is removed, and reports haven't already been created, you will not be able to see historical past analytics data. Are you sure you want to do this?",
         "DeleteLogsOlderThan": "Delete logs older than",
         "DeleteMaxRows": "Maximum number of rows to delete in one run:",
         "DeleteMaxRowsNoLimit": "no limit",
         "DeleteReportsConfirm": "You are about to enable report data deletion. If old reports are removed, you will have to re-process them in order view them. Are you sure you want to do this?",
-        "DeleteReportsDetailedInfo": "Data from the database numeric archive tables (%1$s) and blob archive tables (%2$s) will be deleted.",
-        "DeleteReportsInfo": "If enabled, old reports will be deleted. %1$sWe recommend to enable only when your database space is limited.%2$s",
-        "DeleteReportsInfo2": "If you have not enabled \"%s\", old reports will be recreated automatically when requested.",
-        "DeleteReportsInfo3": "If you have enabled \"%s\", the data will be permanently lost.",
+        "DeleteAggregateReportsDetailedInfo": "When you enable this setting, all aggregated reports will be deleted. Aggregated reports are generated from the raw data and represent aggregated data from several individual visits. For example, the \"Country\" report lists aggregated numbers to see how many visits you have gotten from each country.",
+        "KeepBasicMetricsReportsDetailedInfo": "When you enable this setting, some numeric key performance indicators won't be deleted.",
+        "DeleteReportsInfo2": "If you delete old reports, they may be re-processed again from your RAW data when you request them.",
+        "DeleteReportsInfo3": "If you have also enabled \"%s\", then the reports data you're deleting will be permanently lost.",
         "DeleteReportsOlderThan": "Delete reports older than",
         "DeleteSchedulingSettings": "Schedule old data deletion",
         "DeleteDataSettings": "Delete old visitor logs and reports",
@@ -75,7 +74,7 @@
         "UseAnonymizeUserId": "Anonymize User ID",
         "PseudonymizeUserId": "Replace User ID with a pseudonym",
         "UseAnonymizeOrderId": "Anonymize Order ID",
-        "UseDeleteLog": "Regularly delete old visitor logs from the database",
+        "UseDeleteLog": "Regularly delete old raw data from the database",
         "UseDeleteReports": "Regularly delete old reports from the database",
         "UsersOptOut": "Users opt-out",
         "PrivacyPolicyUrl": "Privacy Policy URL",
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index 7690ff6011..540d6251b1 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -62,7 +62,7 @@
 
 {% if isDataPurgeSettingsEnabled %}
     <div piwik-content-block id="deleteLogsAnchor"
-         content-title="{{ 'PrivacyManager_DeleteOldVisitorLogs'|translate|e('html_attr') }}">
+         content-title="{{ 'PrivacyManager_DeleteOldRawData'|translate|e('html_attr') }}">
         <div class="ui-confirm" id="confirmDeleteSettings">
             <h2 id="deleteLogsConfirm">{{ 'PrivacyManager_DeleteLogsConfirm'|translate }}</h2>
 
@@ -82,30 +82,22 @@
             <input role="no" type="button" value="{{ 'General_No'|translate }}"/>
         </div>
 
-        <p>{{ 'PrivacyManager_DeleteDataDescription'|translate }} {{ 'PrivacyManager_DeleteDataDescription2'|translate }}</p>
+        <p>{{ 'PrivacyManager_DeleteDataDescription'|translate }}</p>
 
         <div piwik-form
              ng-controller="DeleteOldLogsController as deleteOldLogs"
              id="formDeleteSettings">
             <div id="deleteLogSettingEnabled">
 
-                <div id="deleteLogInfoInlineHelp" class="inline-help-node">
-                    {{ 'PrivacyManager_DeleteLogInfo'|translate(deleteData.deleteTables)|raw }}
-                    {% if not canDeleteLogActions %}
-                        <br/><br/>
-                        {{ 'PrivacyManager_CannotLockSoDeleteLogActions'|translate(dbUser) }}
-                    {% endif %}
-                </div>
-
                 <div piwik-field uicontrol="checkbox" name="deleteEnable"
                      ng-model="deleteOldLogs.enabled"
                      ng-change="deleteOldLogs.reloadDbStats()"
                      title="{{ 'PrivacyManager_UseDeleteLog'|translate|e('html_attr') }}"
                      value="{{ deleteData.config.delete_logs_enable }}"
-                     inline-help="#deleteLogInfoInlineHelp">
+                     inline-help="{{ 'PrivacyManager_DeleteRawDataInfo'|translate|e('html_attr') }}">
                 </div>
 
-                <div class="alert alert-warning" style="width: 50%;">
+                <div class="alert alert-warning deleteOldLogsWarning" style="width: 50%;" ng-show="deleteOldLogs.enabled">
                     {{ 'PrivacyManager_DeleteLogDescription2'|translate|raw }}
                     <a href="https://matomo.org/faq/general/#faq_125" rel="noreferrer noopener" target="_blank">
                         {{ 'General_ClickHere'|translate }}
@@ -128,7 +120,7 @@
     </div>
 
     <div piwik-content-block id="deleteReportsAnchor"
-            content-title="{{ 'PrivacyManager_DeleteOldArchivedReports'|translate|e('html_attr') }}">
+            content-title="{{ 'PrivacyManager_DeleteOldAggregatedReports'|translate|e('html_attr') }}">
 
         <div piwik-form
              ng-controller="DeleteOldReportsController as deleteReports" 
@@ -141,14 +133,12 @@
                      ng-change="deleteReports.reloadDbStats()"
                      title="{{ 'PrivacyManager_UseDeleteReports'|translate|e('html_attr') }}"
                      value="{{ deleteData.config.delete_reports_enable }}"
-                     inline-help="{{ 'PrivacyManager_DeleteReportsDetailedInfo'|translate('archive_numeric_*','archive_blob_*')|e('html_attr') }}">
+                     inline-help="{{ 'PrivacyManager_DeleteAggregateReportsDetailedInfo'|translate|e('html_attr') }}">
                 </div>
 
-                <div class="alert alert-warning" style="width: 50%;">
+                <div class="alert alert-warning" style="width: 50%;" ng-show="deleteReports.enabled">
                     {% set deleteOldLogs %}{{ 'PrivacyManager_UseDeleteLog'|translate }}{% endset %}
-                    {{ 'PrivacyManager_DeleteReportsInfo'|translate('','')|raw }}
-                    <span ng-show="deleteReports.enabled">
-                        <br/><br/>
+                    <span>
                         {{ 'PrivacyManager_DeleteReportsInfo2'|translate(deleteOldLogs) }}<br/><br/>
                         {{ 'PrivacyManager_DeleteReportsInfo3'|translate(deleteOldLogs) }}
                     </span>
@@ -163,7 +153,7 @@
                      ng-change="deleteReports.reloadDbStats()"
                      title="{{ 'PrivacyManager_DeleteReportsOlderThan'|translate|e('html_attr') }} ({{ 'Intl_PeriodMonths'|translate }})"
                      value="{{ deleteData.config.delete_reports_older_than }}"
-                     inline-help="{{ 'PrivacyManager_LeastMonthsInput'|translate("3")|e('html_attr') }}">
+                     inline-help="{{ 'PrivacyManager_LeastMonthsInput'|translate("1")|e('html_attr') }}">
                 </div>
 
                 <div piwik-field uicontrol="checkbox" name="deleteReportsKeepBasic"
@@ -171,7 +161,7 @@
                      ng-change="deleteReports.reloadDbStats()"
                      title="{{ 'PrivacyManager_KeepBasicMetrics'|translate|e('html_attr') }} ({{ 'General_Recommended'|translate|e('html_attr') }})"
                      value="{{ deleteData.config.delete_reports_keep_basic_metrics }}"
-                     inline-help="{{ 'PrivacyManager_DeleteReportsDetailedInfo'|translate('archive_numeric_*','archive_blob_*')|e('html_attr') }}">
+                     inline-help="{{ 'PrivacyManager_KeepBasicMetricsReportsDetailedInfo'|translate|e('html_attr') }}">
                 </div>
 
                 <h3>