diff --git a/package-lock.json b/package-lock.json
index 9f6e8de..f7d6dcb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3304,9 +3304,9 @@
}
},
"@lingdocs/pashto-inflector": {
- "version": "0.2.5",
- "resolved": "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.2.5.tgz",
- "integrity": "sha512-JHhp6oODNzm6vgCK6yO4v3Z0LSRbuuCQnRwRMS2tJOUMergs0fOgtoV/FoGK5jIz2gYAIOmzdJo0PyJYTY4PGg==",
+ "version": "0.3.7",
+ "resolved": "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.3.7.tgz",
+ "integrity": "sha512-J6twWM5DeCZCMn5D94/0nt9L0iJk/v3KTKVmrYTTgrYwuStOGV9hj3k6SIzd4mKuFxbTAj6DY9dXpQHEUKp7yQ==",
"requires": {
"classnames": "^2.2.6",
"pbf": "^3.2.1"
@@ -13464,16 +13464,6 @@
}
}
},
- "react": {
- "version": "16.13.1",
- "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
- "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
- "requires": {
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1",
- "prop-types": "^15.6.2"
- }
- },
"react-app-polyfill": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz",
@@ -13672,17 +13662,6 @@
}
}
},
- "react-dom": {
- "version": "16.13.1",
- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
- "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==",
- "requires": {
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1",
- "prop-types": "^15.6.2",
- "scheduler": "^0.19.1"
- }
- },
"react-error-overlay": {
"version": "6.0.8",
"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.8.tgz",
@@ -14792,15 +14771,6 @@
"xmlchars": "^2.1.1"
}
},
- "scheduler": {
- "version": "0.19.1",
- "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
- "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
- "requires": {
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1"
- }
- },
"schema-utils": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
diff --git a/package.json b/package.json
index c9c9107..f6e36c3 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.2",
- "@lingdocs/pashto-inflector": "^0.3.5",
+ "@lingdocs/pashto-inflector": "^0.3.7",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
diff --git a/src/components/EquativeFormChoice.js b/src/components/EquativeFormChoice.js
index 9c025ff..acff660 100644
--- a/src/components/EquativeFormChoice.js
+++ b/src/components/EquativeFormChoice.js
@@ -22,6 +22,7 @@ function EquativeFormChoice({forms, opts}) {
displayForm={forms[choice].displayForm}
english={forms[choice].english}
textOptions={opts}
+ shortDefault
/>
);
diff --git a/src/content/equatives/other-equatives.mdx b/src/content/equatives/other-equatives.mdx
index c783ace..5afcfb7 100644
--- a/src/content/equatives/other-equatives.mdx
+++ b/src/content/equatives/other-equatives.mdx
@@ -15,24 +15,27 @@ https://creativecommons.org/licenses/by-sa/4.0/legalcode
import {
addToForm,
- defaultTextOptions,
+ defaultTextOptions as opts,
grammarUnits,
VerbFormDisplay,
ButtonSelect,
concatPsString,
InlinePs,
+ Examples,
} from "@lingdocs/pashto-inflector";
import EquativeFormChoice from "../../components/EquativeFormChoice";
import Formula from "../../components/Formula";
import Link from "../../components/Link";
-export const opts = defaultTextOptions;
## Future / Presumptive Equative
-This is used to say that something will be something in the future. It's also used to guess or surmise about something being something.
+This is used for:
+
+1. Saying that something will be something in the future. ("I'll be...")
+2. To guess or surmise about something being something (now or in the future). ("I'll be...")
- + subjunctive/informative equative
+ + subjunctive/habitual equative
+#### Examples
+
+{[
+ {
+ p: "زه به په کور کې یم.",
+ f: "zu ba pu kor ke yum.",
+ e: "I will be at home.",
+ },
+ {
+ p: "مونږ به ستړي یو",
+ f: "moonG ba stúRee yoo.",
+ e: "We will be tired.",
+ },
+ {
+ p: "ډوډۍ به تیاره وي.",
+ f: "DoDúy ba tayáara wee.",
+ e: "The food will be ready.",
+ },
+ {
+ p: "تاسو به وږي یئ، که نه؟",
+ f: "taaso ba wuGee yeyy, ku nu?",
+ e: "You'll be hungry, won't you?",
+ },
+]}
+
## Past Equative
-This is used to say that something was something in the past.
+This is used to say that something was something in the past. ("I was...")
It is usually used in the short form.
@@ -99,12 +127,47 @@ It is usually used in the short form.
displayForm: grammarUnits.equativeEndings.past,
},
}}
- opts={defaultTextOptions}
+ opts={opts}
/>
+#### Examples
+
+{[
+ {
+ p: "ته چېرته وې؟",
+ f: "tu cherta we?",
+ e: "Where were you?",
+ },
+ {
+ p: "زه په کور کې وم.",
+ f: "zu pu kor ke wum.",
+ e: "I was at home.",
+ },
+ {
+ p: "هغه ډېر ستړی و.",
+ f: "haghá Der stúRey wo.",
+ e: "He was very tired.",
+ },
+ {
+ p: "هغه ډېره ستړې وه.",
+ f: "haghá Déra stúRe wa.",
+ e: "She was very tired.",
+ },
+ {
+ p: "مونږ خفه وو",
+ f: "moonG khúfa woo.",
+ e: "We were sad.",
+ },
+]}
+
## Affirmative Equative
-This is used to affirm or to make a strong assumption that something will have been something.
+This is used:
+
+1. To affirm or to make a strong assumption that something will have been something. ("I'll have been ...")
+2. To say what would have happened if a hypothetical condition were true. ("If ..., I'd be ...")
+
+Like the past equative that it's based on, it's usually used with the short form.
+ past equative
@@ -141,14 +204,34 @@ This is used to affirm or to make a strong assumption that something will have b
], grammarUnits.equativeEndings.past)
}
}}
- opts={defaultTextOptions}
+ opts={opts}
/>
+#### Examples
+
+{[
+ {
+ p: "ډوډۍ به تیاره وه.",
+ f: "DoDúy ba tayáara wa.",
+ e: "The food will havve been ready.",
+ },
+ {
+ p: "ته به خبر وې",
+ f: "tu ba khabúr we.",
+ e: "You will have known.",
+ },
+ {
+ p: "که خوب مې نه وای کړی، زه به ستړی وم.",
+ f: "ku khob me nu waay kúRey, zu ba stúRey wum.",
+ e: "If I hadn't slept, I would have been tired.",
+ },
+]}
+
## Conterfactual / Past Subjunctive / Wish Equative
-This is used to talk about something being hypothetically something, or to wish that something were something. It is also used for prayers and blessings in some dialects.
+This is used to talk about something being hypothetically something, or to wish that something were something. ("If I was ...", "If only I was ..."). It is also used for prayers and blessings in some dialects.
-Because this uses the non-inflecting tail, it doesn't change at all depending on the person.
+Because this is based on the the non-inflecting tail, *it doesn't change at all, no matter what the subject is*.
+ non-inflecting tail
@@ -188,10 +271,28 @@ export function WithTailChoice() {
displayForm: waay,
}
}}
- opts={defaultTextOptions}
+ opts={opts}
/>
);
}
+
+{[
+ {
+ p: "کاشکې ته دلته وای!",
+ f: "kaashke tu dălta waay!",
+ e: "If only you were here!",
+ },
+ {
+ p: "که زه ستا پلار نه وای...",
+ f: "ku zu staa plaar nu waay...",
+ e: "If I wasn't your father...",
+ },
+ {
+ p: "که مونږ خبر وای، نه راتلو.",
+ f: "ku moonG khabúr waay, nú raatloo.",
+ e: "I we had known, we wouldn't have come.",
+ },
+]}
diff --git a/yarn.lock b/yarn.lock
index 1e57ea7..6f320a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1504,10 +1504,10 @@
"@types/yargs" "^15.0.0"
chalk "^4.0.0"
-"@lingdocs/pashto-inflector@^0.3.5":
- version "0.3.5"
- resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.3.5.tgz#c6e99e807d38addf61aed93997c95eafde6bb2ab"
- integrity sha512-m8IzUE+gxLcI/Cyu7iLEx+R65juaHmztJFMtsAP33mfyOseBq0ZTD8xC9CjRz/n8PvIPFcy+lpYrTcaBd0cPvQ==
+"@lingdocs/pashto-inflector@^0.3.7":
+ version "0.3.7"
+ resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.3.7.tgz#24a656f8912555cd13a9bb3ef0ea64c4e6d6bdf4"
+ integrity sha512-J6twWM5DeCZCMn5D94/0nt9L0iJk/v3KTKVmrYTTgrYwuStOGV9hj3k6SIzd4mKuFxbTAj6DY9dXpQHEUKp7yQ==
dependencies:
classnames "^2.2.6"
pbf "^3.2.1"