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:
authorLukas Winkler <git@lw1.at>2020-06-28 10:15:55 +0300
committerGitHub <noreply@github.com>2020-06-28 10:15:55 +0300
commit764068c41dd3c01e450472fe81aa4a1753f708a1 (patch)
treeed5bcfad1bd34941208130544269d616bc1e3ea1 /plugins/PrivacyManager
parentde5ae85e7a11f7bbd962256c890a32188c40d000 (diff)
add missing link to consent help page (#15973)
Diffstat (limited to 'plugins/PrivacyManager')
-rw-r--r--plugins/PrivacyManager/lang/en.json4
-rw-r--r--plugins/PrivacyManager/templates/askingForConsent.twig7
2 files changed, 7 insertions, 4 deletions
diff --git a/plugins/PrivacyManager/lang/en.json b/plugins/PrivacyManager/lang/en.json
index e5d54baf83..6e4d147266 100644
--- a/plugins/PrivacyManager/lang/en.json
+++ b/plugins/PrivacyManager/lang/en.json
@@ -10,7 +10,7 @@
"ConsentExplanation": "Consent means offering individuals choice and control about how their personal data is processed.",
"ClickHereSettings": "Click here to access the %s settings.",
"WhenDoINeedConsent": "When do I need to ask for user consent?",
- "WhenConsentIsNeeded1": "In the context of the GDPR privacy regulations, 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 lawful basis under the GDPR for Matomo.",
+ "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.",
@@ -18,7 +18,7 @@
"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 privacy notices and asking for user consent. 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.",
+ "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",
diff --git a/plugins/PrivacyManager/templates/askingForConsent.twig b/plugins/PrivacyManager/templates/askingForConsent.twig
index 1ef5450a6d..ae446c621d 100644
--- a/plugins/PrivacyManager/templates/askingForConsent.twig
+++ b/plugins/PrivacyManager/templates/askingForConsent.twig
@@ -10,7 +10,10 @@
<div piwik-content-block content-title="{{ 'PrivacyManager_WhenDoINeedConsent'|translate|e('html_attr') }}" class="privacyAskingForConsent">
<p>
- {{ 'PrivacyManager_WhenConsentIsNeeded1'|translate }}
+ {{ 'PrivacyManager_WhenConsentIsNeeded1'|translate(
+ '<a href="https://matomo.org/docs/gdpr/" target="_blank" rel="noreferrer noopener">', '</a>',
+ '<a href="https://matomo.org/blog/2018/04/lawful-basis-for-processing-personal-data-under-gdpr-with-matomo/" target="_blank" rel="noreferrer noopener">', '</a>'
+ )|raw }}
<br /><br />
{{ 'PrivacyManager_WhenConsentIsNeeded2'|translate('<a href="' ~ linkTo({module: 'PrivacyManager', action: 'privacySettings'}) ~ '">', '</a>.')|raw }}
</p>
@@ -34,7 +37,7 @@ _paq.push(['trackPageview']);
</p>
<h3>{{ 'PrivacyManager_AskForConsentStep2'|translate }}</h3>
<p>
- {{ 'PrivacyManager_AskForConsentStep2Desc'|translate }}
+ {{ '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>