From 57bda257d902b8c052416da31d7babd07946abda Mon Sep 17 00:00:00 2001 From: Edwin Hoogerbeets Date: Mon, 6 Jan 2025 14:21:47 -0800 Subject: [PATCH 1/3] Update to CLDR 46 plural categories --- packages/loctool/db/pluralCategories.json | 15 ++++++++ packages/loctool/package.json | 2 +- pnpm-lock.yaml | 46 +++++++++++++++++++---- 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/packages/loctool/db/pluralCategories.json b/packages/loctool/db/pluralCategories.json index 232c22e29..26a133f2d 100644 --- a/packages/loctool/db/pluralCategories.json +++ b/packages/loctool/db/pluralCategories.json @@ -73,6 +73,11 @@ "one", "other" ], + "blo": [ + "zero", + "one", + "other" + ], "bm": [ "other" ], @@ -130,6 +135,10 @@ "many", "other" ], + "csw": [ + "one", + "other" + ], "cy": [ "zero", "one", @@ -444,6 +453,11 @@ "lkt": [ "other" ], + "lld": [ + "one", + "many", + "other" + ], "ln": [ "one", "other" @@ -657,6 +671,7 @@ ], "scn": [ "one", + "many", "other" ], "sd": [ diff --git a/packages/loctool/package.json b/packages/loctool/package.json index 7c21fbc9b..937232b6c 100644 --- a/packages/loctool/package.json +++ b/packages/loctool/package.json @@ -94,7 +94,7 @@ }, "devDependencies": { "@types/jest": "^29.5.14", - "cldr-core": "^43.1.0", + "cldr-core": "46.1.0", "ilib-loctool-mock": "file:test/ilib-loctool-mock/ilib-loctool-mock-1.0.0.tgz", "ilib-loctool-mock-json": "file:test/ilib-loctool-mock-json/ilib-loctool-mock-json-1.0.0.tgz", "ilib-loctool-mock-resource": "file:test/ilib-loctool-mock-resource/ilib-loctool-mock-resource-1.0.0.tgz", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5ec705a75..62a2d4674 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -687,7 +687,7 @@ importers: version: 3.2.0 grunt-contrib-nodeunit: specifier: ^4.0.0 - version: 4.0.0(ts-node@8.10.2(typescript@5.6.3))(typescript@5.6.3) + version: 4.0.0(ts-node@8.10.2(typescript@3.9.10))(typescript@3.9.10) grunt-contrib-uglify: specifier: ^5.2.2 version: 5.2.2 @@ -1572,7 +1572,7 @@ importers: version: 3.2.0 grunt-contrib-nodeunit: specifier: ^4.0.0 - version: 4.0.0(ts-node@8.10.2(typescript@3.9.10))(typescript@3.9.10) + version: 4.0.0(ts-node@8.10.2(typescript@5.6.3))(typescript@5.6.3) grunt-contrib-uglify: specifier: ^5.2.2 version: 5.2.2 @@ -1768,8 +1768,8 @@ importers: specifier: ^29.5.14 version: 29.5.14 cldr-core: - specifier: ^43.1.0 - version: 43.1.0 + specifier: 46.1.0 + version: 46.1.0 ilib-loctool-mock: specifier: file:test/ilib-loctool-mock/ilib-loctool-mock-1.0.0.tgz version: file:packages/loctool/test/ilib-loctool-mock/ilib-loctool-mock-1.0.0.tgz @@ -3496,8 +3496,8 @@ packages: cjs-module-lexer@1.4.1: resolution: {integrity: sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==} - cldr-core@43.1.0: - resolution: {integrity: sha512-8Q/Zh/eCzV4SxggzZhPnw5WDWH9OnhbPfwzthfG8uXsCn7F5UeBCiAOTxsstxuxtXPKlvPJqqMSQjiYcqJPJsA==} + cldr-core@46.1.0: + resolution: {integrity: sha512-YWIbxgpO6fUais+FIm6Stl/KoAAhNJx4wDg2sg06QxK6GQ+i1iwdpCiyIJ7CTWduRuqUmRoaYpL/n5/8Q8ywxg==} cldr-segmentation@2.2.1: resolution: {integrity: sha512-0XAXy22htsxXgdSbXxJzzyAsBrBUvFhUho3eRonfcP/zvromwjBe5yDji9/y4XaV9YszEZswKv3WYhgd+JA8CA==} @@ -9746,7 +9746,7 @@ snapshots: '@babel/core': 7.26.0 find-cache-dir: 4.0.0 schema-utils: 4.2.0 - webpack: 5.95.0(webpack-cli@5.1.4) + webpack: 5.95.0 babel-plugin-add-module-exports@1.0.4: {} @@ -10080,7 +10080,7 @@ snapshots: cjs-module-lexer@1.4.1: {} - cldr-core@43.1.0: {} + cldr-core@46.1.0: {} cldr-segmentation@2.2.1: dependencies: @@ -15623,6 +15623,36 @@ snapshots: webpack-sources@3.2.3: {} + webpack@5.95.0: + dependencies: + '@types/estree': 1.0.6 + '@webassemblyjs/ast': 1.12.1 + '@webassemblyjs/wasm-edit': 1.12.1 + '@webassemblyjs/wasm-parser': 1.12.1 + acorn: 8.14.0 + acorn-import-attributes: 1.9.5(acorn@8.14.0) + browserslist: 4.24.2 + chrome-trace-event: 1.0.4 + enhanced-resolve: 5.17.1 + es-module-lexer: 1.5.4 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.10(webpack@5.95.0) + watchpack: 2.4.2 + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + webpack@5.95.0(webpack-cli@4.10.0): dependencies: '@types/estree': 1.0.6 From bccc4ec2ce8cc3cea7867bd9cb9f6d1325343b19 Mon Sep 17 00:00:00 2001 From: Edwin Hoogerbeets Date: Mon, 6 Jan 2025 14:23:51 -0800 Subject: [PATCH 2/3] Add a changeset to go with it --- .changeset/spicy-tables-hang.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/spicy-tables-hang.md diff --git a/.changeset/spicy-tables-hang.md b/.changeset/spicy-tables-hang.md new file mode 100644 index 000000000..eab3c63d7 --- /dev/null +++ b/.changeset/spicy-tables-hang.md @@ -0,0 +1,5 @@ +--- +"loctool": minor +--- + +Updated the plural categories that loctool uses to those defined in CLDR 46.0 From 01b40e0e8b00b5b0e44beccd8caf47ae5523745c Mon Sep 17 00:00:00 2001 From: Edwin Hoogerbeets Date: Mon, 6 Jan 2025 14:26:11 -0800 Subject: [PATCH 3/3] Fix the changeset comment --- .changeset/spicy-tables-hang.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/spicy-tables-hang.md b/.changeset/spicy-tables-hang.md index eab3c63d7..b51e7a5bb 100644 --- a/.changeset/spicy-tables-hang.md +++ b/.changeset/spicy-tables-hang.md @@ -2,4 +2,4 @@ "loctool": minor --- -Updated the plural categories that loctool uses to those defined in CLDR 46.0 +Updated the plural categories that loctool uses to those defined in CLDR 46.1