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:
authorThomas Steur <tsteur@users.noreply.github.com>2020-07-07 21:50:32 +0300
committerGitHub <noreply@github.com>2020-07-07 21:50:32 +0300
commitb0f8e9aa5324d7f6e2c92d8097de2b897b0acfe3 (patch)
tree4c0366019bcb9efc6fc3a39d657c99530396678e /plugins
parent3a29486c0048d8db48e6407f22dff69d36ad0455 (diff)
Link to tracking consent guide to not have duplicate content (#16188)
* Link to tracking consent guide to not have duplicate content * fix test
Diffstat (limited to 'plugins')
-rw-r--r--plugins/PrivacyManager/lang/en.json28
-rw-r--r--plugins/PrivacyManager/templates/askingForConsent.twig84
-rw-r--r--plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_consent_default.png4
3 files changed, 4 insertions, 112 deletions
diff --git a/plugins/PrivacyManager/lang/en.json b/plugins/PrivacyManager/lang/en.json
index 6e4d147266..0811d2f9fc 100644
--- a/plugins/PrivacyManager/lang/en.json
+++ b/plugins/PrivacyManager/lang/en.json
@@ -13,33 +13,7 @@
"WhenConsentIsNeeded1": "In the context of the %1$sGDPR privacy regulations%2$s, when you are processing personal data, in some cases you will need to ask for your users' consent. To identify whether you need to ask for consent, you need to determine whether your lawful basis for processing personal data is \"Consent\" or \"Legitimate interest\", or whether you can avoid collecting personal data altogether. We recommend to learn more about the %3$slawful basis under the GDPR for Matomo%4$s.",
"WhenConsentIsNeeded2": "Note that when you require to have your users' consents and if you cannot prove that you got the \"Consent\" of your users in the past, then we recommend to %1$sanonymise your previously tracked users' raw data%2$s.",
"HowDoIAskForConsent": "How do I ask users for consent?",
- "AskForConsentFollowSteps": "Follow the steps below to ask your user for their consents before their data is processed within Matomo.",
- "AskForConsentStep1": "Step 1: require consent",
- "AskForConsentStep1Desc1": "To require consent, insert the following line at top of your existing Matomo Tracking code on all your pages:",
- "AskForConsentStep1Desc2": "Once this function ‘requireConsent' is executed then no tracking request will be sent to Matomo. Note that some %1$stracking cookies%2$s will be set during this page view but will be deleted as soon as the user navigates to a different page or closes the browser.",
- "AskForConsentStep2": "Step 2: asking for consent through your privacy notice",
- "AskForConsentStep2Desc": "Now you can ask the user for consent for example by displaying a clear privacy notice on your pages. Learn more about %1$sprivacy notices and asking for user consent%2$s. Note that Matomo does not yet offer the feature to display a privacy notice, but may implement such a feature in the future to easily let you display the notice and gather user consent.",
- "AskForConsentStep3": "Step 3: user gives consent",
- "AskForConsentStep3Desc": "Once a user gives consent, you can either A) let Matomo remember the consent, or B) use your own consent tool to remember the consent. We present the two solutions below:",
- "AskForConsentStep3DescA": "A) if you want to let Matomo remember the consent",
- "AskForConsentStep3DescADesc1": "Once a user gives their consent, you can let Matomo remember that the user has given consent by simply calling the following method once the user has given her or his consent:",
- "AskForConsentStep3DescADesc2": "Matomo will then remember on subsequent requests that the user has given her or his consent by setting a cookie named \"consent\". As long as this cookie exists, Matomo will know that consent has been given and will automatically process the data. This means that you only need to call %1$s once, and it is not needed to call %2$s on any page view.",
- "AskForConsentStep3DescANote1": "By default, the cookie and consent will be remembered forever. It is possible to define an optional expiry period for your user consent by calling:",
- "AskForConsentStep3DescANote2": "When you're tracking multiple sub-domains into the same website in Matomo, you want to ensure that when you ask for Consent, the user gives consent for all the sub-domains on which you are collecting data. If the user only gives consent for a particular domain or sub-domain(s), you may need to restrict or widen the scope of the consent cookie domain and path by using 'setCookieDomain' and ‘setCookiePath' (learn more in the JavaScript tracking guide).",
- "AskForConsentStep3DescANote3": "It is required that you do not disable cookies.",
- "AskForConsentStep3DescB": "B) if you use your own consent tool to remember the consent",
- "AskForConsentStep3DescBDesc1": "In some cases, you record the information that the user has given consent to be tracked directly in your own system or CMS (for example when you use your own a cookie to remember user consent). Once you have the consent by the user to process their data, you need to call the 'setConsentGiven' method:",
- "AskForConsentStep3DescBDesc2": "This lets the JavaScript tracker know that the user has given consent and ensures the tracking is working as expected. This function needs to be called anytime after %1$s.",
- "AskForConsentStep3DescBNote1": "when you call %1$s, Matomo will not remember on subsequent requests that this user has given consent: it is important that you call setConsentGiven on every page.",
- "AskForConsentStep3DescBNote2": "when the user has given consent, you could also avoid calling %1$s in the first place.",
- "AskForConsentStep4": "Step 4: user removes consent",
- "AskForConsentStep4Desc": "In order to remove his consent the user needs to perform a specific action, for example: clicking on a button \"I do not want to be tracked anymore\".",
- "AskForConsentStep4DescA": "A) if you want to let Matomo remember the consent",
- "AskForConsentStep4DescADesc": "When the user has expressed she or he no longer gives consent, you need to call the following method once:",
- "AskForConsentStep4DescADesc2": "This makes sure the cookie that remembered the given consent is deleted.",
- "AskForConsentStep4DescB": "B) if you use your own consent tool to remember the consent",
- "AskForConsentStep4DescBDesc": "When the user has expressed she or he no longer gives consent, you shall not call the following method anymore:",
- "AskForConsentStepNotes": "Notes:",
+ "HowDoIAskForConsentIntroduction": "Learn everything about %1$sasking for cookie or tracking consent in our integration guide.%2$s",
"AnonymizeSites": "Anonymize the data of this site(s)",
"AnonymizeRowDataFrom": "Anonymize all raw data starting from:",
"AnonymizeRowDataTo": "Anonymize all raw data up to:",
diff --git a/plugins/PrivacyManager/templates/askingForConsent.twig b/plugins/PrivacyManager/templates/askingForConsent.twig
index ae446c621d..064f863db7 100644
--- a/plugins/PrivacyManager/templates/askingForConsent.twig
+++ b/plugins/PrivacyManager/templates/askingForConsent.twig
@@ -20,89 +20,7 @@
</div>
<div piwik-content-block content-title="{{ 'PrivacyManager_HowDoIAskForConsent'|translate|e('html_attr') }}" class="privacyAskingForConsent">
- <p>
- {{ 'PrivacyManager_AskForConsentFollowSteps'|translate }}
- </p>
-
- <h3>{{ 'PrivacyManager_AskForConsentStep1'|translate }}</h3>
- <p>
- {{ 'PrivacyManager_AskForConsentStep1Desc1'|translate }}
- </p>
- <pre piwik-select-on-focus><code>// require user consent before processing data
-_paq.push(['requireConsent']);
-_paq.push(['trackPageview']);
-[...]</code></pre>
- <p>
- {{ 'PrivacyManager_AskForConsentStep1Desc2'|translate('<a href="https://matomo.org/faq/general/faq_146/" target="_blank" rel="noreferrer noopener">', '</a>')|raw }}
- </p>
- <h3>{{ 'PrivacyManager_AskForConsentStep2'|translate }}</h3>
- <p>
- {{ 'PrivacyManager_AskForConsentStep2Desc'|translate('<a href="https://matomo.org/blog/2018/04/how-should-i-write-my-privacy-notice-for-matomo-analytics-under-gdpr/" target="_blank" rel="noreferrer noopener">', '</a>')|raw }}
- </p>
- <h3>{{ 'PrivacyManager_AskForConsentStep3'|translate }}</h3>
- <p>
- {{ 'PrivacyManager_AskForConsentStep3Desc'|translate }}
- <br /><br />
- <strong>{{ 'PrivacyManager_AskForConsentStep3DescA'|translate }}</strong>
- <br />
- {{ 'PrivacyManager_AskForConsentStep3DescADesc1'|translate }}
- </p>
- <pre piwik-select-on-focus><code>_paq.push(['rememberConsentGiven'])</code></pre>
- <p>
- {{ 'PrivacyManager_AskForConsentStep3DescADesc2'|translate("<code piwik-select-on-focus>_paq.push(['rememberConsentGiven'])</code>", "<code piwik-select-on-focus>_paq.push(['setConsentGiven'])</code>")|raw }}
- <br /><br />
- {{ 'PrivacyManager_AskForConsentStepNotes'|translate }}
- </p>
- <ol>
- <li>{{ 'PrivacyManager_AskForConsentStep3DescANote1'|translate }}
- <br /><code piwik-select-on-focus>_paq.push(['rememberConsentGiven', optionallyExpireConsentInHours])</code>.</li>
- <li>{{ 'PrivacyManager_AskForConsentStep3DescANote2'|translate }}</li>
- <li>{{ 'PrivacyManager_AskForConsentStep3DescANote3'|translate }}</li>
- </ol>
- <p>
- <br />
- <br />
- <strong>{{ 'PrivacyManager_AskForConsentStep3DescB'|translate }}</strong>
- <br />
- {{ 'PrivacyManager_AskForConsentStep3DescBDesc1'|translate }}
+ <p>{{ 'PrivacyManager_HowDoIAskForConsentIntroduction'|translate('<a href="https://developer.matomo.org/guides/tracking-consent" target="_blank" rel="noreferrer noopener">', '</a>')|raw }}
</p>
- <pre piwik-select-on-focus><code>// require user consent before processing data
-_paq.push(['requireConsent']);
-_paq.push([‘trackPageview']);
-[...]
-
-// user has given consent to process their data
-_paq.push(['setConsentGiven']);</code></pre>
- <p>
- {{ 'PrivacyManager_AskForConsentStep3DescBDesc2'|translate("<code piwik-select-on-focus>_paq.push(['requireConsent'])</code>")|raw }}
- <br />
- <br />
- {{ 'PrivacyManager_AskForConsentStepNotes'|translate }}
- </p>
- <ol>
- <li>{{ 'PrivacyManager_AskForConsentStep3DescBNote1'|translate("<code piwik-select-on-focus>_paq.push(['setConsentGiven'])</code>")|raw }}</li>
- <li>{{ 'PrivacyManager_AskForConsentStep3DescBNote2'|translate("<code piwik-select-on-focus>_paq.push(['requireConsent'])</code>")|raw }}</li>
- </ol>
-
- <h3>{{ 'PrivacyManager_AskForConsentStep4'|translate }}</h3>
- <p>
- {{ 'PrivacyManager_AskForConsentStep4Desc'|translate }}
- <br /><br />
- <strong>{{ 'PrivacyManager_AskForConsentStep4DescA'|translate }}</strong>
- <br />
- {{ 'PrivacyManager_AskForConsentStep4DescADesc'|translate }}
- </p>
- <pre piwik-select-on-focus><code> _paq.push(['forgetConsentGiven']);</code></pre>
- <p>
- {{ 'PrivacyManager_AskForConsentStep4DescADesc2'|translate }}
- <br />
- <br />
- <strong>{{ 'PrivacyManager_AskForConsentStep4DescB'|translate }}</strong><br />
- {{ 'PrivacyManager_AskForConsentStep4DescBDesc'|translate }}
- <br />
- </p>
- <pre piwik-select-on-focus><code>// do not call this once user has removed their consent
-_paq.push(['setConsentGiven']);</code></pre>
-
</div>
{% endblock %}
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_consent_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_consent_default.png
index e2910248e2..7efe11492f 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_consent_default.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_consent_default.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:df1c4903dcc44bfe024b4be867bfdbf39ea0d3df1e21937f14b041835cc1e050
-size 361914
+oid sha256:9b5f9ace6bd01b341c16e4a7b9f61d6ed7766bb26b7664e2ae4c66e7b2b3f31d
+size 76568