diff options
6 files changed, 8 insertions, 8 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> diff --git a/plugins/WebsiteMeasurable/MeasurableSettings.php b/plugins/WebsiteMeasurable/MeasurableSettings.php index 7f3b5ce9c2..85a9ccb1f1 100644 --- a/plugins/WebsiteMeasurable/MeasurableSettings.php +++ b/plugins/WebsiteMeasurable/MeasurableSettings.php @@ -176,7 +176,7 @@ class MeasurableSettings extends \Piwik\Settings\Measurable\MeasurableSettings $ip = IP::getIpFromHeader(); $field->title = Piwik::translate('SitesManager_ExcludedIps'); - $field->inlineHelp = Piwik::translate('SitesManager_HelpExcludedIps', array('1.2.3.*', '1.2.*.*')) + $field->inlineHelp = Piwik::translate('SitesManager_HelpExcludedIpAddresses', array('1.2.3.4/24', '1.2.3.*', '1.2.*.*')) . '<br /><br />' . Piwik::translate('SitesManager_YourCurrentIpAddressIs', array('<i>' . $ip . '</i>')); $field->uiControl = FieldConfig::UI_CONTROL_TEXTAREA; diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index 5b238b17af..95a3eebfc1 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -83,7 +83,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 /> @@ -246,4 +246,4 @@ </row> </settings> </row> -</result>
\ No newline at end of file +</result> |