diff --git a/package-lock.json b/package-lock.json index 52774dbd51..991b9d8fea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@nextcloud/dialogs": "^3.1.4", "@nextcloud/event-bus": "^3.0.0", "@nextcloud/initial-state": "^2.0.0", - "@nextcloud/l10n": "^1.6.0", + "@nextcloud/l10n": "^2.0.0", "@nextcloud/logger": "^2.2.1", "@nextcloud/router": "^2.0.0", "@skjnldsv/sanitize-svg": "^1.0.2", @@ -2956,6 +2956,15 @@ "npm": "^7.0.0 || ^8.0.0" } }, + "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/l10n": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.6.0.tgz", + "integrity": "sha512-aKGlgrwN9OiafN791sYus0shfwNeU3PlrH6Oi9ISma6iJSvN6a8aJM8WGKCJ9pqBaTR5PrDuckuM/WnybBWb6A==", + "dependencies": { + "core-js": "^3.6.4", + "node-gettext": "^3.0.0" + } + }, "node_modules/@nextcloud/eslint-config": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/@nextcloud/eslint-config/-/eslint-config-8.2.0.tgz", @@ -3045,12 +3054,18 @@ "integrity": "sha512-xmNP30v/RnkJ2z1HcuEo7YfcLJJa+FdWTwgNldXHOlMeMbl/ESpsGkWL2sULrhYurz64L0JpfwEdi/cHcmyuZQ==" }, "node_modules/@nextcloud/l10n": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.6.0.tgz", - "integrity": "sha512-aKGlgrwN9OiafN791sYus0shfwNeU3PlrH6Oi9ISma6iJSvN6a8aJM8WGKCJ9pqBaTR5PrDuckuM/WnybBWb6A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-2.0.0.tgz", + "integrity": "sha512-ugE1h/lDewtKFUf/mXq7i/jP0p/OW+18edt7PFNIabYHJvbRpLgBQsYH5UIOqTWUPc/LyuK3NVdIXkALdGPwSA==", "dependencies": { - "core-js": "^3.6.4", + "@nextcloud/router": "^2.0.0", + "dompurify": "^2.4.1", + "escape-html": "^1.0.3", "node-gettext": "^3.0.0" + }, + "engines": { + "node": "^16.0.0", + "npm": "^7.0.0 || ^8.0.0" } }, "node_modules/@nextcloud/logger": { @@ -8786,6 +8801,11 @@ "url": "https://github.com/fb55/domhandler?sponsor=1" } }, + "node_modules/dompurify": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz", + "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ==" + }, "node_modules/domutils": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz", @@ -28259,6 +28279,17 @@ "@nextcloud/typings": "^1.0.0", "core-js": "^3.6.4", "toastify-js": "^1.12.0" + }, + "dependencies": { + "@nextcloud/l10n": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.6.0.tgz", + "integrity": "sha512-aKGlgrwN9OiafN791sYus0shfwNeU3PlrH6Oi9ISma6iJSvN6a8aJM8WGKCJ9pqBaTR5PrDuckuM/WnybBWb6A==", + "requires": { + "core-js": "^3.6.4", + "node-gettext": "^3.0.0" + } + } } }, "@nextcloud/eslint-config": { @@ -28315,11 +28346,13 @@ "integrity": "sha512-xmNP30v/RnkJ2z1HcuEo7YfcLJJa+FdWTwgNldXHOlMeMbl/ESpsGkWL2sULrhYurz64L0JpfwEdi/cHcmyuZQ==" }, "@nextcloud/l10n": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.6.0.tgz", - "integrity": "sha512-aKGlgrwN9OiafN791sYus0shfwNeU3PlrH6Oi9ISma6iJSvN6a8aJM8WGKCJ9pqBaTR5PrDuckuM/WnybBWb6A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-2.0.0.tgz", + "integrity": "sha512-ugE1h/lDewtKFUf/mXq7i/jP0p/OW+18edt7PFNIabYHJvbRpLgBQsYH5UIOqTWUPc/LyuK3NVdIXkALdGPwSA==", "requires": { - "core-js": "^3.6.4", + "@nextcloud/router": "^2.0.0", + "dompurify": "^2.4.1", + "escape-html": "^1.0.3", "node-gettext": "^3.0.0" } }, @@ -32845,6 +32878,11 @@ "domelementtype": "^2.3.0" } }, + "dompurify": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz", + "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ==" + }, "domutils": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz", diff --git a/package.json b/package.json index c5e1ab7684..263e2c82cb 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@nextcloud/dialogs": "^3.1.4", "@nextcloud/event-bus": "^3.0.0", "@nextcloud/initial-state": "^2.0.0", - "@nextcloud/l10n": "^1.6.0", + "@nextcloud/l10n": "^2.0.0", "@nextcloud/logger": "^2.2.1", "@nextcloud/router": "^2.0.0", "@skjnldsv/sanitize-svg": "^1.0.2", diff --git a/src/l10n.js b/src/l10n.js index 2db1197daa..da8ebe0305 100644 --- a/src/l10n.js +++ b/src/l10n.js @@ -1,4 +1,4 @@ -import { getGettextBuilder } from '@nextcloud/l10n/dist/gettext.js' +import { getGettextBuilder } from '@nextcloud/l10n/gettext' const gtBuilder = getGettextBuilder() .detectLocale()