diff --git a/.prettierignore b/.prettierignore index 7655465dd..09bde8d03 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,6 @@ build/**/* docs/**/* +shared/js/ui/base/locale-resources.js .github/**/* **/*.md **/*.html diff --git a/eslint.config.mjs b/eslint.config.mjs index 12530ca8c..3c45b088a 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -5,7 +5,7 @@ export default [ ...ddgConfig, { - ignores: ['shared/js/content-scope/sjcl.js', 'unit-test/data/reference-tests/'], + ignores: ['shared/js/content-scope/sjcl.js', 'shared/js/ui/base/locale-resources.js', 'unit-test/data/reference-tests/'], }, { diff --git a/package-lock.json b/package-lock.json index f77fbb355..d9e22ea50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#6.34.0", "@duckduckgo/ddg2dnr": "file:packages/ddg2dnr", "@duckduckgo/jsbloom": "^1.0.2", - "@duckduckgo/privacy-dashboard": "github:duckduckgo/privacy-dashboard#7.1.1", + "@duckduckgo/privacy-dashboard": "github:duckduckgo/privacy-dashboard#7.3.2", "@duckduckgo/privacy-grade": "file:packages/privacy-grade", "@duckduckgo/privacy-reference-tests": "github:duckduckgo/privacy-reference-tests#main", "@duckduckgo/tracker-surrogates": "github:duckduckgo/tracker-surrogates#1.3.2", @@ -217,10 +217,9 @@ "integrity": "sha512-cJvuLGRnREddo20OCk4qiFUVxS1xA6Y5MRpaDFuzdNkdrs1tF5F52EbfBSGFEbP6i+xUcoVYeqQ7DxT1MPa+jA==" }, "node_modules/@duckduckgo/privacy-dashboard": { - "resolved": "git+ssh://git@github.com/duckduckgo/privacy-dashboard.git#53fd1a0f8d91fcf475d9220f810141007300dffd", - "integrity": "sha512-NwyhnuCVS+DDVgsriZ0olLvYjDUrU4Z8jW4bM1MksF9XdufEZm9NKVc4M1FgSYHJWS2bscLyNSYa/6d2EnUq4A==", + "resolved": "git+ssh://git@github.com/duckduckgo/privacy-dashboard.git#50bd30a7fae5b8287562d4168af98911d89e6a38", "engines": { - "node": ">=18.0.0", + "node": ">=22.0.0", "npm": ">=9.0.0" } }, @@ -11488,9 +11487,8 @@ "integrity": "sha512-cJvuLGRnREddo20OCk4qiFUVxS1xA6Y5MRpaDFuzdNkdrs1tF5F52EbfBSGFEbP6i+xUcoVYeqQ7DxT1MPa+jA==" }, "@duckduckgo/privacy-dashboard": { - "version": "git+ssh://git@github.com/duckduckgo/privacy-dashboard.git#53fd1a0f8d91fcf475d9220f810141007300dffd", - "integrity": "sha512-NwyhnuCVS+DDVgsriZ0olLvYjDUrU4Z8jW4bM1MksF9XdufEZm9NKVc4M1FgSYHJWS2bscLyNSYa/6d2EnUq4A==", - "from": "@duckduckgo/privacy-dashboard@github:duckduckgo/privacy-dashboard#7.1.1" + "version": "git+ssh://git@github.com/duckduckgo/privacy-dashboard.git#50bd30a7fae5b8287562d4168af98911d89e6a38", + "from": "@duckduckgo/privacy-dashboard@github:duckduckgo/privacy-dashboard#7.3.2" }, "@duckduckgo/privacy-grade": { "version": "file:packages/privacy-grade", diff --git a/package.json b/package.json index b03dc6705..e474570de 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#6.34.0", "@duckduckgo/ddg2dnr": "file:packages/ddg2dnr", "@duckduckgo/jsbloom": "^1.0.2", - "@duckduckgo/privacy-dashboard": "github:duckduckgo/privacy-dashboard#7.1.1", + "@duckduckgo/privacy-dashboard": "github:duckduckgo/privacy-dashboard#7.3.2", "@duckduckgo/privacy-grade": "file:packages/privacy-grade", "@duckduckgo/privacy-reference-tests": "github:duckduckgo/privacy-reference-tests#main", "@duckduckgo/tracker-surrogates": "github:duckduckgo/tracker-surrogates#1.3.2", diff --git a/shared/js/background/components/toggle-reports.js b/shared/js/background/components/toggle-reports.js index 6fddf58fd..b6fe7b2fd 100644 --- a/shared/js/background/components/toggle-reports.js +++ b/shared/js/background/components/toggle-reports.js @@ -59,6 +59,7 @@ export default class ToggleReports { 'features', 'httpErrorCodes', 'jsPerformance', + 'locale', 'openerContext', 'requests', 'userRefreshCount', diff --git a/shared/js/ui/base/locale-resources.js b/shared/js/ui/base/locale-resources.js index d9e54aba4..98aa3fc17 100644 --- a/shared/js/ui/base/locale-resources.js +++ b/shared/js/ui/base/locale-resources.js @@ -2,81 +2,81 @@ * This file is auto-generated by scripts/bundleLocales.mjs, based on the contents of the shared/locales directory. * Any manual changes in here will be overwritten on build! */ -import bgFeedback from '../../../locales/bg/feedback.json'; -import bgOptions from '../../../locales/bg/options.json'; -import bgShared from '../../../locales/bg/shared.json'; -import csFeedback from '../../../locales/cs/feedback.json'; -import csOptions from '../../../locales/cs/options.json'; -import csShared from '../../../locales/cs/shared.json'; -import daFeedback from '../../../locales/da/feedback.json'; -import daOptions from '../../../locales/da/options.json'; -import daShared from '../../../locales/da/shared.json'; -import deFeedback from '../../../locales/de/feedback.json'; -import deOptions from '../../../locales/de/options.json'; -import deShared from '../../../locales/de/shared.json'; -import elFeedback from '../../../locales/el/feedback.json'; -import elOptions from '../../../locales/el/options.json'; -import elShared from '../../../locales/el/shared.json'; -import enFeedback from '../../../locales/en/feedback.json'; -import enOptions from '../../../locales/en/options.json'; -import enShared from '../../../locales/en/shared.json'; -import esFeedback from '../../../locales/es/feedback.json'; -import esOptions from '../../../locales/es/options.json'; -import esShared from '../../../locales/es/shared.json'; -import etFeedback from '../../../locales/et/feedback.json'; -import etOptions from '../../../locales/et/options.json'; -import etShared from '../../../locales/et/shared.json'; -import fiFeedback from '../../../locales/fi/feedback.json'; -import fiOptions from '../../../locales/fi/options.json'; -import fiShared from '../../../locales/fi/shared.json'; -import frFeedback from '../../../locales/fr/feedback.json'; -import frOptions from '../../../locales/fr/options.json'; -import frShared from '../../../locales/fr/shared.json'; -import hrFeedback from '../../../locales/hr/feedback.json'; -import hrOptions from '../../../locales/hr/options.json'; -import hrShared from '../../../locales/hr/shared.json'; -import huFeedback from '../../../locales/hu/feedback.json'; -import huOptions from '../../../locales/hu/options.json'; -import huShared from '../../../locales/hu/shared.json'; -import itFeedback from '../../../locales/it/feedback.json'; -import itOptions from '../../../locales/it/options.json'; -import itShared from '../../../locales/it/shared.json'; -import ltFeedback from '../../../locales/lt/feedback.json'; -import ltOptions from '../../../locales/lt/options.json'; -import ltShared from '../../../locales/lt/shared.json'; -import lvFeedback from '../../../locales/lv/feedback.json'; -import lvOptions from '../../../locales/lv/options.json'; -import lvShared from '../../../locales/lv/shared.json'; -import nbFeedback from '../../../locales/nb/feedback.json'; -import nbOptions from '../../../locales/nb/options.json'; -import nbShared from '../../../locales/nb/shared.json'; -import nlFeedback from '../../../locales/nl/feedback.json'; -import nlOptions from '../../../locales/nl/options.json'; -import nlShared from '../../../locales/nl/shared.json'; -import plFeedback from '../../../locales/pl/feedback.json'; -import plOptions from '../../../locales/pl/options.json'; -import plShared from '../../../locales/pl/shared.json'; -import ptFeedback from '../../../locales/pt/feedback.json'; -import ptOptions from '../../../locales/pt/options.json'; -import ptShared from '../../../locales/pt/shared.json'; -import roFeedback from '../../../locales/ro/feedback.json'; -import roOptions from '../../../locales/ro/options.json'; -import roShared from '../../../locales/ro/shared.json'; -import ruFeedback from '../../../locales/ru/feedback.json'; -import ruOptions from '../../../locales/ru/options.json'; -import ruShared from '../../../locales/ru/shared.json'; -import skFeedback from '../../../locales/sk/feedback.json'; -import skOptions from '../../../locales/sk/options.json'; -import skShared from '../../../locales/sk/shared.json'; -import slFeedback from '../../../locales/sl/feedback.json'; -import slOptions from '../../../locales/sl/options.json'; -import slShared from '../../../locales/sl/shared.json'; -import svFeedback from '../../../locales/sv/feedback.json'; -import svOptions from '../../../locales/sv/options.json'; -import svShared from '../../../locales/sv/shared.json'; -import trFeedback from '../../../locales/tr/feedback.json'; -import trOptions from '../../../locales/tr/options.json'; -import trShared from '../../../locales/tr/shared.json'; +import bgFeedback from '../../../locales/bg/feedback.json' +import bgOptions from '../../../locales/bg/options.json' +import bgShared from '../../../locales/bg/shared.json' +import csFeedback from '../../../locales/cs/feedback.json' +import csOptions from '../../../locales/cs/options.json' +import csShared from '../../../locales/cs/shared.json' +import daFeedback from '../../../locales/da/feedback.json' +import daOptions from '../../../locales/da/options.json' +import daShared from '../../../locales/da/shared.json' +import deFeedback from '../../../locales/de/feedback.json' +import deOptions from '../../../locales/de/options.json' +import deShared from '../../../locales/de/shared.json' +import elFeedback from '../../../locales/el/feedback.json' +import elOptions from '../../../locales/el/options.json' +import elShared from '../../../locales/el/shared.json' +import enFeedback from '../../../locales/en/feedback.json' +import enOptions from '../../../locales/en/options.json' +import enShared from '../../../locales/en/shared.json' +import esFeedback from '../../../locales/es/feedback.json' +import esOptions from '../../../locales/es/options.json' +import esShared from '../../../locales/es/shared.json' +import etFeedback from '../../../locales/et/feedback.json' +import etOptions from '../../../locales/et/options.json' +import etShared from '../../../locales/et/shared.json' +import fiFeedback from '../../../locales/fi/feedback.json' +import fiOptions from '../../../locales/fi/options.json' +import fiShared from '../../../locales/fi/shared.json' +import frFeedback from '../../../locales/fr/feedback.json' +import frOptions from '../../../locales/fr/options.json' +import frShared from '../../../locales/fr/shared.json' +import hrFeedback from '../../../locales/hr/feedback.json' +import hrOptions from '../../../locales/hr/options.json' +import hrShared from '../../../locales/hr/shared.json' +import huFeedback from '../../../locales/hu/feedback.json' +import huOptions from '../../../locales/hu/options.json' +import huShared from '../../../locales/hu/shared.json' +import itFeedback from '../../../locales/it/feedback.json' +import itOptions from '../../../locales/it/options.json' +import itShared from '../../../locales/it/shared.json' +import ltFeedback from '../../../locales/lt/feedback.json' +import ltOptions from '../../../locales/lt/options.json' +import ltShared from '../../../locales/lt/shared.json' +import lvFeedback from '../../../locales/lv/feedback.json' +import lvOptions from '../../../locales/lv/options.json' +import lvShared from '../../../locales/lv/shared.json' +import nbFeedback from '../../../locales/nb/feedback.json' +import nbOptions from '../../../locales/nb/options.json' +import nbShared from '../../../locales/nb/shared.json' +import nlFeedback from '../../../locales/nl/feedback.json' +import nlOptions from '../../../locales/nl/options.json' +import nlShared from '../../../locales/nl/shared.json' +import plFeedback from '../../../locales/pl/feedback.json' +import plOptions from '../../../locales/pl/options.json' +import plShared from '../../../locales/pl/shared.json' +import ptFeedback from '../../../locales/pt/feedback.json' +import ptOptions from '../../../locales/pt/options.json' +import ptShared from '../../../locales/pt/shared.json' +import roFeedback from '../../../locales/ro/feedback.json' +import roOptions from '../../../locales/ro/options.json' +import roShared from '../../../locales/ro/shared.json' +import ruFeedback from '../../../locales/ru/feedback.json' +import ruOptions from '../../../locales/ru/options.json' +import ruShared from '../../../locales/ru/shared.json' +import skFeedback from '../../../locales/sk/feedback.json' +import skOptions from '../../../locales/sk/options.json' +import skShared from '../../../locales/sk/shared.json' +import slFeedback from '../../../locales/sl/feedback.json' +import slOptions from '../../../locales/sl/options.json' +import slShared from '../../../locales/sl/shared.json' +import svFeedback from '../../../locales/sv/feedback.json' +import svOptions from '../../../locales/sv/options.json' +import svShared from '../../../locales/sv/shared.json' +import trFeedback from '../../../locales/tr/feedback.json' +import trOptions from '../../../locales/tr/options.json' +import trShared from '../../../locales/tr/shared.json' export default { bg: { feedback: bgFeedback, options: bgOptions, shared: bgShared }, @@ -103,5 +103,5 @@ export default { sk: { feedback: skFeedback, options: skOptions, shared: skShared }, sl: { feedback: slFeedback, options: slOptions, shared: slShared }, sv: { feedback: svFeedback, options: svOptions, shared: svShared }, - tr: { feedback: trFeedback, options: trOptions, shared: trShared }, -}; + tr: { feedback: trFeedback, options: trOptions, shared: trShared } +} diff --git a/unit-test/background/toggle-reports.js b/unit-test/background/toggle-reports.js index 2cf8742ac..c1cbc44d2 100644 --- a/unit-test/background/toggle-reports.js +++ b/unit-test/background/toggle-reports.js @@ -87,6 +87,7 @@ describe('ToggleReports', () => { { id: 'features' }, { id: 'httpErrorCodes' }, { id: 'jsPerformance' }, + { id: 'locale' }, { id: 'openerContext' }, { id: 'requests' }, { id: 'userRefreshCount' }, @@ -104,6 +105,7 @@ describe('ToggleReports', () => { { id: 'features' }, { id: 'httpErrorCodes' }, { id: 'jsPerformance' }, + { id: 'locale' }, { id: 'openerContext' }, { id: 'requests' }, { id: 'userRefreshCount' },