From bf7f3baacb5867875c39d5a226445a9d6258844a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:20:14 +0000
Subject: [PATCH 1/2] Bump @nextcloud/l10n from 1.6.0 to 2.0.1
Bumps [@nextcloud/l10n](https://github.com/nextcloud/nextcloud-l10n) from 1.6.0 to 2.0.1.
- [Release notes](https://github.com/nextcloud/nextcloud-l10n/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-l10n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-l10n/compare/v1.6.0...v2.0.1)
---
updated-dependencies:
- dependency-name: "@nextcloud/l10n"
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
---
package-lock.json | 56 +++++++++++++++++++++++++++++++++++++++--------
package.json | 2 +-
2 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 7f82f2b368..d75811b53e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,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.1",
"@nextcloud/logger": "^2.2.1",
"@nextcloud/router": "^2.0.0",
"@skjnldsv/sanitize-svg": "^1.0.2",
@@ -2970,6 +2970,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.1",
"resolved": "https://registry.npmjs.org/@nextcloud/eslint-config/-/eslint-config-8.2.1.tgz",
@@ -3060,12 +3069,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.1",
+ "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-2.0.1.tgz",
+ "integrity": "sha512-vTzsYUdNNJhDmdQS5pOhv+tdqGhjzI+iWZMQgM19rcpFo9MDFrcK/bQBIgcQypJjqSmNlP62M9CMVTm4fIwlsA==",
"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": {
@@ -8801,6 +8816,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",
@@ -28331,6 +28351,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": {
@@ -28387,11 +28418,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.1",
+ "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-2.0.1.tgz",
+ "integrity": "sha512-vTzsYUdNNJhDmdQS5pOhv+tdqGhjzI+iWZMQgM19rcpFo9MDFrcK/bQBIgcQypJjqSmNlP62M9CMVTm4fIwlsA==",
"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"
}
},
@@ -32917,6 +32950,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 a8970d6440..06af21d131 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,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.1",
"@nextcloud/logger": "^2.2.1",
"@nextcloud/router": "^2.0.0",
"@skjnldsv/sanitize-svg": "^1.0.2",
From 458626641f47757e13f19868ff995b263930a9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
<raimund.schluessler@mailbox.org>
Date: Tue, 31 Jan 2023 17:21:06 +0100
Subject: [PATCH 2/2] Adjust getGettextBuilder import
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
---
src/l10n.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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()