From da12287fb04147327ba786bb7082398365e1672e Mon Sep 17 00:00:00 2001 From: adueck Date: Fri, 2 Dec 2022 09:21:03 +0500 Subject: [PATCH] include bundled plural --- account/package-lock.json | 14 +++++++------- account/package.json | 2 +- account/yarn.lock | 8 ++++---- functions/package-lock.json | 14 +++++++------- functions/package.json | 2 +- website/package.json | 2 +- website/src/lib/inflection-search-helpers.ts | 1 + website/src/screens/IsolatedEntry.tsx | 4 ++++ website/yarn.lock | 8 ++++---- 9 files changed, 30 insertions(+), 25 deletions(-) diff --git a/account/package-lock.json b/account/package-lock.json index c3fc5dd..5073352 100644 --- a/account/package-lock.json +++ b/account/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@lingdocs/inflect": "5.2.1", + "@lingdocs/inflect": "5.3.0", "base64url": "^3.0.1", "bcryptjs": "^2.4.3", "connect-redis": "^6.0.0", @@ -124,9 +124,9 @@ } }, "node_modules/@lingdocs/inflect": { - "version": "5.2.1", - "resolved": "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.2.1.tgz", - "integrity": "sha512-A2Is03lIx8od0JfnHjAbreNeI1jsoRARRXnNhqaJ+Hw7DMPMXEkOlpZnY/luvTcUA7/E5FHKEEAtBOng//zcog==", + "version": "5.3.0", + "resolved": "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.3.0.tgz", + "integrity": "sha512-rFNys1HmgU1bL1cFFtUE3vAPiOTqbkYk7hq9n1KiDHo4slr/hSs28esnhgjyRRDIjX16lgEYpDkvr8j7Hac/TQ==", "license": "MIT", "dependencies": { "pbf": "^3.2.1", @@ -2741,9 +2741,9 @@ } }, "@lingdocs/inflect": { - "version": "5.2.1", - "resolved": "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.2.1.tgz", - "integrity": "sha512-A2Is03lIx8od0JfnHjAbreNeI1jsoRARRXnNhqaJ+Hw7DMPMXEkOlpZnY/luvTcUA7/E5FHKEEAtBOng//zcog==", + "version": "5.3.0", + "resolved": "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.3.0.tgz", + "integrity": "sha512-rFNys1HmgU1bL1cFFtUE3vAPiOTqbkYk7hq9n1KiDHo4slr/hSs28esnhgjyRRDIjX16lgEYpDkvr8j7Hac/TQ==", "requires": { "pbf": "^3.2.1", "rambda": "^7.3.0" diff --git a/account/package.json b/account/package.json index 8e6fb72..aca5246 100644 --- a/account/package.json +++ b/account/package.json @@ -11,7 +11,7 @@ "author": "", "license": "ISC", "dependencies": { - "@lingdocs/inflect": "5.2.1", + "@lingdocs/inflect": "5.3.0", "base64url": "^3.0.1", "bcryptjs": "^2.4.3", "connect-redis": "^6.0.0", diff --git a/account/yarn.lock b/account/yarn.lock index 7203f20..256d592 100644 --- a/account/yarn.lock +++ b/account/yarn.lock @@ -45,10 +45,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@lingdocs/inflect@5.2.1": - "integrity" "sha512-A2Is03lIx8od0JfnHjAbreNeI1jsoRARRXnNhqaJ+Hw7DMPMXEkOlpZnY/luvTcUA7/E5FHKEEAtBOng//zcog==" - "resolved" "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.2.1.tgz" - "version" "5.2.1" +"@lingdocs/inflect@5.3.0": + "integrity" "sha512-rFNys1HmgU1bL1cFFtUE3vAPiOTqbkYk7hq9n1KiDHo4slr/hSs28esnhgjyRRDIjX16lgEYpDkvr8j7Hac/TQ==" + "resolved" "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.3.0.tgz" + "version" "5.3.0" dependencies: "pbf" "^3.2.1" "rambda" "^7.3.0" diff --git a/functions/package-lock.json b/functions/package-lock.json index 90503c5..d2cf76b 100644 --- a/functions/package-lock.json +++ b/functions/package-lock.json @@ -7,7 +7,7 @@ "name": "functions", "dependencies": { "@google-cloud/storage": "^5.8.1", - "@lingdocs/inflect": "5.2.1", + "@lingdocs/inflect": "5.3.0", "@types/cors": "^2.8.10", "@types/google-spreadsheet": "^3.0.2", "@types/react": "^18.0.21", @@ -391,9 +391,9 @@ } }, "node_modules/@lingdocs/inflect": { - "version": "5.2.1", - "resolved": "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.2.1.tgz", - "integrity": "sha512-A2Is03lIx8od0JfnHjAbreNeI1jsoRARRXnNhqaJ+Hw7DMPMXEkOlpZnY/luvTcUA7/E5FHKEEAtBOng//zcog==", + "version": "5.3.0", + "resolved": "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.3.0.tgz", + "integrity": "sha512-rFNys1HmgU1bL1cFFtUE3vAPiOTqbkYk7hq9n1KiDHo4slr/hSs28esnhgjyRRDIjX16lgEYpDkvr8j7Hac/TQ==", "license": "MIT", "dependencies": { "pbf": "^3.2.1", @@ -3499,9 +3499,9 @@ } }, "@lingdocs/inflect": { - "version": "5.2.1", - "resolved": "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.2.1.tgz", - "integrity": "sha512-A2Is03lIx8od0JfnHjAbreNeI1jsoRARRXnNhqaJ+Hw7DMPMXEkOlpZnY/luvTcUA7/E5FHKEEAtBOng//zcog==", + "version": "5.3.0", + "resolved": "https://npm.lingdocs.com/@lingdocs%2finflect/-/inflect-5.3.0.tgz", + "integrity": "sha512-rFNys1HmgU1bL1cFFtUE3vAPiOTqbkYk7hq9n1KiDHo4slr/hSs28esnhgjyRRDIjX16lgEYpDkvr8j7Hac/TQ==", "requires": { "pbf": "^3.2.1", "rambda": "^7.3.0" diff --git a/functions/package.json b/functions/package.json index 181a63a..6dd6044 100644 --- a/functions/package.json +++ b/functions/package.json @@ -14,7 +14,7 @@ "main": "lib/functions/src/index.js", "dependencies": { "@google-cloud/storage": "^5.8.1", - "@lingdocs/inflect": "5.2.1", + "@lingdocs/inflect": "5.3.0", "@types/cors": "^2.8.10", "@types/google-spreadsheet": "^3.0.2", "@types/react": "^18.0.21", diff --git a/website/package.json b/website/package.json index 081de5a..c0b7589 100644 --- a/website/package.json +++ b/website/package.json @@ -7,7 +7,7 @@ "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.2", - "@lingdocs/ps-react": "5.2.1", + "@lingdocs/ps-react": "5.3.0", "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", diff --git a/website/src/lib/inflection-search-helpers.ts b/website/src/lib/inflection-search-helpers.ts index 7aec550..7415514 100644 --- a/website/src/lib/inflection-search-helpers.ts +++ b/website/src/lib/inflection-search-helpers.ts @@ -105,4 +105,5 @@ export function displayFormResult(res: string[]): string { .replace("ArabicPlural", "Arabic Plural") .replace("Fem", "Fem.") .replace("Masc", "Masc.") + .replace("BundledPlural", "Bundled Plural"); } \ No newline at end of file diff --git a/website/src/screens/IsolatedEntry.tsx b/website/src/screens/IsolatedEntry.tsx index bce2813..7d6246c 100644 --- a/website/src/screens/IsolatedEntry.tsx +++ b/website/src/screens/IsolatedEntry.tsx @@ -260,6 +260,10 @@ function IsolatedEntry({ state, dictionary, isolateEntry }: {
Plural
} + {"bundledPlural" in inf && inf.bundledPlural !== undefined &&
+
Bundled Plural
+ +
} {"arabicPlural" in inf && inf.arabicPlural !== undefined &&
Arabic Plural
diff --git a/website/yarn.lock b/website/yarn.lock index ac454bc..9f5f9af 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2349,10 +2349,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@lingdocs/ps-react@5.2.1": - version "5.2.1" - resolved "https://npm.lingdocs.com/@lingdocs%2fps-react/-/ps-react-5.2.1.tgz#e483ced9d12a1913564831f8b37fdb843b912e80" - integrity sha512-2gG2GVNISgjgiyOjyt1rjCPeJ+Bd+FWKZMPXHV98KFSWuuUEX5Jhf8K2FXzv0CGdTOviI++V1O07y86iCSlaXA== +"@lingdocs/ps-react@5.3.0": + version "5.3.0" + resolved "https://npm.lingdocs.com/@lingdocs%2fps-react/-/ps-react-5.3.0.tgz#4c3a66e4192e14aede43a0a23b7e170bab2d4cb9" + integrity sha512-UnIDvUSbbJBHf2CYcBYAgAfLst9M+eVcZJfPDiMSV2tiZgLzueplNw5ykl5hlSR7+zxc9ExziEps1nobXkqGnw== dependencies: "@formkit/auto-animate" "^1.0.0-beta.3" classnames "^2.2.6"