Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"copy-webpack-plugin": "^14.0.0",
"cssnano": "^8.0.2",
"cssnano-preset-default": "^8.0.2",
"editorconfig-checker": "^6.1.1",
"editorconfig-checker": "^6.2.0",
"eslint": "^9.39.4",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-import-x": "^4.17.1",
Expand Down
14 changes: 14 additions & 0 deletions src/server/i18n/translations/cy.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,20 @@
"purpose": "Defnyddir gan Google Analytics i ddod o hyd i sesiwn unigol gyda'ch dyfais a'i holrhain",
"expires": "2 flynedd"
}
},
"googleAnalytics": {
"lede": "Mae Google Analytics yn prosesu gwybodaeth am:",
"items": [
"eich cyfeiriad IP",
"y tudalennau rydych yn ymweld â nhw ar <strong>[[serviceName]]</strong>",
"faint o amser rydych yn ei dreulio ar bob tudalen o <strong>[[serviceName]]</strong>",
"sut y gwnaethoch gyrraedd y wefan",
"beth rydych yn ei ddewis wrth ymweld â'r wefan"
],
"body1": "Bydd Defra yn sicrhau na ellir eich adnabod yn uniongyrchol gan ddata Google Analytics. Rydym yn gwneud hyn drwy ddefnyddio nodwedd <a class=\"govuk-link\" href=\"https://support.google.com/analytics/answer/2763052\">anonymeiddio cyfeiriad IP Google Analytics</a> a thrwy ddileu unrhyw ddata personol arall o deitlau neu URLau'r tudalennau rydych yn ymweld â nhw.",
"body2": "Ni fydd Defra yn cyfuno gwybodaeth ddadansoddeg â setiau data eraill mewn ffordd a fyddai'n nodi pwy ydych chi yn uniongyrchol.",
"body3": "Rydym yn defnyddio logiau system i gasglu gwybodaeth am y defnydd o ffurflenni.",
"body4": "Rydym yn defnyddio'r logiau system a data Google Analytics i greu adroddiadau dienw am berfformiad ffurflenni sy'n defnyddio <strong>[[serviceName]]</strong>. Rydym yn defnyddio'r data hyn i wella ffurflenni, er enghraifft, os byddwn yn darganfod nifer uchel o ffurflenni anghyflawn."
}
},
"cookiePreferences": {
Expand Down
14 changes: 14 additions & 0 deletions src/server/i18n/translations/en-GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@
"purpose": "Used by Google Analytics to find and track an individual session with your device",
"expires": "2 years"
}
},
"googleAnalytics": {
"lede": "Google Analytics processes information about:",
"items": [
"your IP address",
"the pages you visit on <strong>[[serviceName]]</strong>",
"how long you spend on each <strong>[[serviceName]]</strong> page",
"how you got to the site",
"what you select while you’re visiting the site"
],
"body1": "Defra will make sure you cannot be directly identified by Google Analytics data. We do this by using <a class=\"govuk-link\" href=\"https://support.google.com/analytics/answer/2763052\">Google Analytics’ IP address anonymisation</a> feature and by removing any other personal data from the titles or URLs of the pages you visit.",
"body2": "Defra will not combine analytics information with other data sets in a way that would directly identify who you are.",
"body3": "We use system logs to collect information about the usage of forms.",
"body4": "We use the system logs and Google Analytics data to create anonymised reports about the performance of forms that use <strong>[[serviceName]]</strong>. We use this data to improve forms, for example, if we discover a high number of incomplete forms."
}
},
"cookiePreferences": {
Expand Down
26 changes: 20 additions & 6 deletions src/server/views/help/cookies.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ <h2 class="govuk-heading-m">{{ tR('help.cookies.essentialHeading') }}</h2>
{ text: tR('help.cookies.cookies.crumb.expires') }
]
] %}

{% if config.googleTagManagerContainerId %}
{% set essentialTableRows = (essentialTableRows.unshift([
{ text: "cookieConsent" },
{ text: tR('help.cookies.cookies.cookieConsent.purpose') },
{ text: tR('help.cookies.cookies.cookieConsent.expires') }
]), essentialTableRows)
%}
{% set essentialTableRows = (essentialTableRows.unshift([
{ text: "cookieConsent" },
{ text: tR('help.cookies.cookies.cookieConsent.purpose') },
{ text: tR('help.cookies.cookies.cookieConsent.expires') }
]), essentialTableRows)
%}
{% endif %}

{{ govukTable({
firstCellIsHeader: true,
caption: tR('help.cookies.tableCaption.essential'),
Expand All @@ -47,6 +49,7 @@ <h2 class="govuk-heading-m">{{ tR('help.cookies.essentialHeading') }}</h2>
{% if config.googleTagManagerContainerId %}
<h2 class="govuk-heading-m">{{ tR('help.cookies.analyticsHeading') }}</h2>
<p class="govuk-body">{{ tR('help.cookies.analyticsBody') }}</p>

{{ govukTable({
firstCellIsHeader: true,
caption: tR('help.cookies.tableCaption.analytics'),
Expand All @@ -69,6 +72,17 @@ <h2 class="govuk-heading-m">{{ tR('help.cookies.analyticsHeading') }}</h2>
]
}) }}

<p class="govuk-body">{{ tR('help.cookies.googleAnalytics.lede') }}</p>
<ul class="govuk-list govuk-list--bullet">
{% for item in tR('help.cookies.googleAnalytics.items', { serviceName: config.serviceName }) %}
<li>{{ item | safe }}</li>
{% endfor %}
</ul>
<p class="govuk-body">{{ tR('help.cookies.googleAnalytics.body1') | safe }}</p>
<p class="govuk-body">{{ tR('help.cookies.googleAnalytics.body2') }}</p>
<p class="govuk-body">{{ tR('help.cookies.googleAnalytics.body3') }}</p>
<p class="govuk-body">{{ tR('help.cookies.googleAnalytics.body4', { serviceName: config.serviceName }) | safe }}</p>

<h2 class="govuk-heading-m">{{ tR('help.cookies.changeSettingsHeading') }}</h2>
<p class="govuk-body">{{ tR('help.cookies.changeSettingsBody', { slug: slug }) | safe }}</p>
{% endif %}
Expand Down
Loading