Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2018-08-06 17:11:54 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2018-08-06 17:11:54 +0300
commitccff21200988e3ff72c8dcb1d09acdf47560a537 (patch)
tree723e9e9aa22a12d7f683658a988e157ece9afcf4 /plugins/SitesManager
parent89210df0ec01e4c6b2eb9f2c01854be52adbfce6 (diff)
Add scheduled task to delete log data for sites that have been deleted. (#13227)
* Add scheduled task to delete log data for sites that have been deleted. * Update Changelog for new event. * Use JOIN instead of NOT IN & remove event.
Diffstat (limited to 'plugins/SitesManager')
-rw-r--r--plugins/SitesManager/SitesManager.php1
-rw-r--r--plugins/SitesManager/lang/en.json3
-rw-r--r--plugins/SitesManager/templates/dialogs/remove-dialog.html2
3 files changed, 5 insertions, 1 deletions
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index 4cf778862e..15c1129d03 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -378,5 +378,6 @@ class SitesManager extends \Piwik\Plugin
$translationKeys[] = "General_Measurables";
$translationKeys[] = "Goals_Ecommerce";
$translationKeys[] = "SitesManager_NotFound";
+ $translationKeys[] = "SitesManager_DeleteSiteExplanation";
}
}
diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json
index 31c16f18a3..aed0dc631c 100644
--- a/plugins/SitesManager/lang/en.json
+++ b/plugins/SitesManager/lang/en.json
@@ -91,6 +91,7 @@
"XManagement": "Manage %s",
"ChooseMeasurableTypeHeadline": "What would you like to measure?",
"YouCurrentlyHaveAccessToNWebsites": "You currently have access to %s websites.",
- "YourCurrentIpAddressIs": "Your current IP address is %s"
+ "YourCurrentIpAddressIs": "Your current IP address is %s",
+ "DeleteSiteExplanation": "Deleting a website will delete all log data that has been collected for it. This action is permanent and cannot be undone."
}
}
diff --git a/plugins/SitesManager/templates/dialogs/remove-dialog.html b/plugins/SitesManager/templates/dialogs/remove-dialog.html
index fee3d6ae89..43f9f836ca 100644
--- a/plugins/SitesManager/templates/dialogs/remove-dialog.html
+++ b/plugins/SitesManager/templates/dialogs/remove-dialog.html
@@ -2,6 +2,8 @@
<h2>{{ site.removeDialog.title }}</h2>
+ <p>{{ 'SitesManager_DeleteSiteExplanation'|translate }}</p>
+
<input type="button" value="{{ 'General_Yes'|translate }}" role="yes"/>
<input type="button" value="{{ 'General_No'|translate }}" role="no" />
</div>