diff options
| author | Jouveer <35312684+Jouveer@users.noreply.github.com> | 2018-01-18 04:59:06 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-01-18 04:59:06 +0300 |
| commit | e6c1134dba1ba5df5a86fb72cc4a7b49b58db6eb (patch) | |
| tree | ffa0b196f3f2835bdd0eefdab9653e495730ed83 /plugins/SitesManager | |
| parent | 7a6b99f26631ac9a80ed0475bed524bd8496a4d1 (diff) | |
Added CIDR Help (#12450)
Websites manager, exclude IP addresses, explain that CIDR notation is supported
Diffstat (limited to 'plugins/SitesManager')
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index a588191901..c55d581e2c 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -308,7 +308,7 @@ class SitesManager extends \Piwik\Plugin $translationKeys[] = "SitesManager_OnlyMatchedUrlsAllowedHelp"; $translationKeys[] = "SitesManager_OnlyMatchedUrlsAllowedHelpExamples"; $translationKeys[] = "SitesManager_KeepURLFragmentsLong"; - $translationKeys[] = "SitesManager_HelpExcludedIps"; + $translationKeys[] = "SitesManager_HelpExcludedIpAddresses"; $translationKeys[] = "SitesManager_ListOfQueryParametersToExclude"; $translationKeys[] = "SitesManager_PiwikWillAutomaticallyExcludeCommonSessionParameters"; $translationKeys[] = "SitesManager_GlobalExcludedUserAgentHelp1"; diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json index 3cb025fae2..d23e6c88d5 100644 --- a/plugins/SitesManager/lang/en.json +++ b/plugins/SitesManager/lang/en.json @@ -35,7 +35,7 @@ "GlobalListExcludedUserAgents_Desc": "If the visitor's user agent string contains any of the strings you specify, the visitor will be excluded from Matomo.", "GlobalSettings": "Global settings", "GlobalWebsitesSettings": "Global websites settings", - "HelpExcludedIps": "Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use wildcards, eg. %1$s or %2$s", + "HelpExcludedIpAddresses": "Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use CIDR notation eg. %1$s or you can use wildcards, eg. %2$s or %3$s", "JsTrackingTagHelp": "Here is the JavaScript Tracking code to include on all your pages", "KeepURLFragments": "Page URL fragments tracking", "KeepURLFragmentsHelp": "If the checkbox below is unchecked, Page URL fragments (everything after the %1$s) will be removed when tracking: %2$s will be tracked as %3$s", diff --git a/plugins/SitesManager/templates/help/excluded-ip-help.html b/plugins/SitesManager/templates/help/excluded-ip-help.html index 7bfa421d6f..df371f5473 100644 --- a/plugins/SitesManager/templates/help/excluded-ip-help.html +++ b/plugins/SitesManager/templates/help/excluded-ip-help.html @@ -1,5 +1,5 @@ <div> - {{ 'SitesManager_HelpExcludedIps' | translate : '1.2.3.*' : '1.2.*.*' }} + {{ 'SitesManager_HelpExcludedIpAddresses' | translate : '1.2.3.4/24' : '1.2.3.*' : '1.2.*.*' }} <br/><br/> diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index 45ee7902c5..d9bfc97474 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -78,7 +78,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use wildcards, eg. 1.2.3.* or 1.2.*.*<br /><br />Your current IP address is <i>127.0.0.1</i></inlineHelp> + <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use CIDR notation eg. 1.2.3.4/24 or you can use wildcards, eg. 1.2.3.* or 1.2.*.*<br /><br />Your current IP address is <i>127.0.0.1</i></inlineHelp> <templateFile /> <introduction /> <condition /> @@ -241,4 +241,4 @@ </row> </settings> </row> -</result>
\ No newline at end of file +</result> |