From d0f39f1a157a0b736625a909e726b0a53fba86e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 08:21:21 +0000 Subject: [PATCH 1/2] Bump gettext-parser from 5.1.2 to 6.0.0 Bumps [gettext-parser](https://github.com/smhg/gettext-parser) from 5.1.2 to 6.0.0. - [Release notes](https://github.com/smhg/gettext-parser/releases) - [Changelog](https://github.com/smhg/gettext-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/smhg/gettext-parser/compare/v5.1.2...v6.0.0) --- updated-dependencies: - dependency-name: gettext-parser dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 98 ++++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 51 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f52b22..0789000 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "colorette": "^2.0.19", "commander": "^9.4.0", "gettext-converter": "^1.2.3", - "gettext-parser": "^5.1.2", + "gettext-parser": "^6.0.0", "node-gettext": "^3.0.0", "p-from-callback": "^1.0.0" }, @@ -285,6 +285,17 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, "node_modules/acorn": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", @@ -1554,6 +1565,14 @@ "node": ">=0.10.0" } }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "engines": { + "node": ">=6" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -1774,13 +1793,13 @@ } }, "node_modules/gettext-parser": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-5.1.2.tgz", - "integrity": "sha512-TaCShmFIQDvic6Ao+LFvFSPyl/9sjua3zNHMfmjfzzEeK3NIPbBSbNdPihJ+vG476td+ylrVk0ZyjJaAy9CiwQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-6.0.0.tgz", + "integrity": "sha512-eWFsR78gc/eKnzDgc919Us3cbxQbzxK1L8vAIZrKMQqOUgULyeqmczNlBjTlVTk2FaB7nV9C1oobd/PGBOqNmg==", "dependencies": { "content-type": "^1.0.4", "encoding": "^0.1.13", - "readable-stream": "^3.6.0", + "readable-stream": "^4.1.0", "safe-buffer": "^5.2.1" } }, @@ -3120,16 +3139,14 @@ } }, "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.1.0.tgz", + "integrity": "sha512-sVisi3+P2lJ2t0BPbpK629j8wRW06yKGJUcaLAGXPAUhyUxVJm7VsCTit1PFgT4JHUDMrGNR+ZjSKpzGaRF3zw==", "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "abort-controller": "^3.0.0" }, "engines": { - "node": ">= 6" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/readdirp": { @@ -3375,14 +3392,6 @@ "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", "dev": true }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -3589,11 +3598,6 @@ "punycode": "^2.1.0" } }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, "node_modules/v8-compile-cache": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", @@ -3958,6 +3962,14 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "requires": { + "event-target-shim": "^5.0.0" + } + }, "acorn": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", @@ -4887,6 +4899,11 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -5063,13 +5080,13 @@ } }, "gettext-parser": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-5.1.2.tgz", - "integrity": "sha512-TaCShmFIQDvic6Ao+LFvFSPyl/9sjua3zNHMfmjfzzEeK3NIPbBSbNdPihJ+vG476td+ylrVk0ZyjJaAy9CiwQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-6.0.0.tgz", + "integrity": "sha512-eWFsR78gc/eKnzDgc919Us3cbxQbzxK1L8vAIZrKMQqOUgULyeqmczNlBjTlVTk2FaB7nV9C1oobd/PGBOqNmg==", "requires": { "content-type": "^1.0.4", "encoding": "^0.1.13", - "readable-stream": "^3.6.0", + "readable-stream": "^4.1.0", "safe-buffer": "^5.2.1" } }, @@ -6032,13 +6049,11 @@ } }, "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.1.0.tgz", + "integrity": "sha512-sVisi3+P2lJ2t0BPbpK629j8wRW06yKGJUcaLAGXPAUhyUxVJm7VsCTit1PFgT4JHUDMrGNR+ZjSKpzGaRF3zw==", "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "abort-controller": "^3.0.0" } }, "readdirp": { @@ -6207,14 +6222,6 @@ "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", "dev": true }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "requires": { - "safe-buffer": "~5.2.0" - } - }, "string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -6367,11 +6374,6 @@ "punycode": "^2.1.0" } }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, "v8-compile-cache": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", diff --git a/package.json b/package.json index 685d884..19caa7b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "colorette": "^2.0.19", "commander": "^9.4.0", "gettext-converter": "^1.2.3", - "gettext-parser": "^5.1.2", + "gettext-parser": "^6.0.0", "node-gettext": "^3.0.0", "p-from-callback": "^1.0.0" }, From 89852f97b34de9322fd1fe4c1410dc7d15f4477c Mon Sep 17 00:00:00 2001 From: Julian Grinblat Date: Mon, 15 Aug 2022 17:31:06 +0900 Subject: [PATCH 2/2] Fix --- test/_testfiles/de/translation.utf8.po | 1 + test/_testfiles/en/translation.noFoldLength.po | 2 +- test/_testfiles/en/translation.persist-msgid_plural.po | 1 + test/_testfiles/en/translation.utf8.po | 1 + test/_testfiles/ja/translation.utf8.po | 1 + test/_testfiles/ru/translation2.utf8.po | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/_testfiles/de/translation.utf8.po b/test/_testfiles/de/translation.utf8.po index e23a237..68197ac 100644 --- a/test/_testfiles/de/translation.utf8.po +++ b/test/_testfiles/de/translation.utf8.po @@ -383,3 +383,4 @@ msgstr "A boyfriend" msgctxt "female" msgid "app##friend_context" msgstr "A girlfriend" + diff --git a/test/_testfiles/en/translation.noFoldLength.po b/test/_testfiles/en/translation.noFoldLength.po index 59cd537..d6def8f 100644 --- a/test/_testfiles/en/translation.noFoldLength.po +++ b/test/_testfiles/en/translation.noFoldLength.po @@ -7,4 +7,4 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" msgid "The dog stole the apple and buried it in the yard. The next year, a tree started to grow." -msgstr "The dog stole the apple and buried it in the yard. The next year, a tree started to grow." \ No newline at end of file +msgstr "The dog stole the apple and buried it in the yard. The next year, a tree started to grow." diff --git a/test/_testfiles/en/translation.persist-msgid_plural.po b/test/_testfiles/en/translation.persist-msgid_plural.po index 083dcdb..5d7da8c 100644 --- a/test/_testfiles/en/translation.persist-msgid_plural.po +++ b/test/_testfiles/en/translation.persist-msgid_plural.po @@ -10,3 +10,4 @@ msgid "tied with% {count} other% {test_one} test" msgid_plural "tied with% {count} others% {test_one} test" msgstr[0] "à égalité avec% {count} other% {test_one} test" msgstr[1] "à égalité avec% {count} others% {test_one} test" + diff --git a/test/_testfiles/en/translation.utf8.po b/test/_testfiles/en/translation.utf8.po index 72452fc..c9ea714 100644 --- a/test/_testfiles/en/translation.utf8.po +++ b/test/_testfiles/en/translation.utf8.po @@ -37,3 +37,4 @@ msgid "friend" msgid_plural "friend" msgstr[0] "A girlfriend" msgstr[1] "{count} girlfriends" + diff --git a/test/_testfiles/ja/translation.utf8.po b/test/_testfiles/ja/translation.utf8.po index 4f5a0c3..3b5a72f 100644 --- a/test/_testfiles/ja/translation.utf8.po +++ b/test/_testfiles/ja/translation.utf8.po @@ -23,3 +23,4 @@ msgctxt "female" msgid "friend" msgid_plural "friend" msgstr[0] "{count}人のガールフレンド" + diff --git a/test/_testfiles/ru/translation2.utf8.po b/test/_testfiles/ru/translation2.utf8.po index 3cdb91b..1d037e9 100644 --- a/test/_testfiles/ru/translation2.utf8.po +++ b/test/_testfiles/ru/translation2.utf8.po @@ -32,3 +32,4 @@ msgid_plural "friend" msgstr[0] "Подруга" msgstr[1] "{count} подруги" msgstr[2] "{count} подруг" +