From 04ad1831f00fd76f51a7136cdfa5f863571ffe69 Mon Sep 17 00:00:00 2001 From: lingdocs <71590811+lingdocs@users.noreply.github.com> Date: Thu, 8 Jul 2021 17:11:06 +0300 Subject: [PATCH] more --- notes | 5 ++ package.json | 5 +- scripts/get-words.js | 10 +++- src/content/verbs/verb-aspect.mdx | 72 +++++++++++++++++------ src/words/verb-categories/simple-trans.js | 18 +++--- yarn.lock | 8 +-- 6 files changed, 83 insertions(+), 35 deletions(-) create mode 100644 notes diff --git a/notes b/notes new file mode 100644 index 0000000..f692e11 --- /dev/null +++ b/notes @@ -0,0 +1,5 @@ +adjectives can be used like nouns + +وبخښه، ته **استرحات** وې + +زه **عادت** یم diff --git a/package.json b/package.json index aac2183..88e0cb9 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.2", - "@lingdocs/pashto-inflector": "^0.4.0", + "@lingdocs/pashto-inflector": "^0.6.9", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", @@ -31,7 +31,8 @@ "start": "react-scripts start", "build": "node scripts/get-words.js && react-scripts build", "test": "react-scripts test", - "eject": "react-scripts eject" + "eject": "react-scripts eject", + "get-words": "node scripts/get-words.js" }, "eslintConfig": { "extends": "react-app" diff --git a/scripts/get-words.js b/scripts/get-words.js index 4a88921..4f14d12 100644 --- a/scripts/get-words.js +++ b/scripts/get-words.js @@ -37,12 +37,16 @@ export default nounsAdjs;`; }); function getVerbsFromTsS(entries) { - return allVerbTsS.map(item => { + const missingEc = []; + const toReturn = allVerbTsS.map(item => { const entry = entries.find(x => item.ts === x.ts); if (!entry) { console.log("couldn't find ts", ts); return undefined; } + if (!entry.ec) { + missingEc.push(entry.ts); + } if (entry.c && entry.c.includes("comp.")) { const complement = entries.find(x => entry.l === x.ts); return { @@ -52,6 +56,10 @@ function getVerbsFromTsS(entries) { } return { entry, def: item.e }; }).filter(x => x); + if (missingEc.length !== 0) { + console.log("Verbs missing ec:", missingEc); + } + return toReturn; } function getNounsAdjsFromTsS(entries) { diff --git a/src/content/verbs/verb-aspect.mdx b/src/content/verbs/verb-aspect.mdx index f5856cb..a5b26fb 100644 --- a/src/content/verbs/verb-aspect.mdx +++ b/src/content/verbs/verb-aspect.mdx @@ -7,6 +7,7 @@ import { Examples, InlinePs, } from "@lingdocs/pashto-inflector"; +import psmd from "../../lib/psmd"; import imperfectiveTimeline from "./imperfective-time.svg"; import perfectiveTimeline from "./perfective-time.svg"; @@ -22,9 +23,10 @@ The imperfective aspect is used for looking at the action as a process that's co For example: -{[ - { p: "ما ډوډۍ خوړله", f: "maa DoDuy khoRúla", e: "I was eating food" }, -]} +{psmd([ + { p: `ما ډوډۍ **خوړله**`, f: `maa DoDuy **khoRúla**`, e: "I was eating food" }, + { p: `زه په پارک کې **ګرځېدم**`, f: `zu pu paark ke **gurdzedúm**`, e: "I was walking in the park" }, +])} #### 2. Perfective Aspect @@ -36,9 +38,10 @@ The perfective aspect is used for looking at the action as a complete whole, wit For example: -{[ - { p: "ما ډوډۍ وخوړله", f: "maa DoDuy óokhoRula", e: "I ate food" }, -]} +{psmd([ + { p: `ما ډوډۍ **وخوړله**`, f: `maa DoDuy **óokhoRula**`, e: "I ate food" }, + { p: `زه په پارک کې **وګرځېدم**`, f: `zu pu paark ke **óogurdzedum**`, e: "I took a walk in the park" }, +])} As we saw in the examples above, in English we are used to using these two different aspects with the past tense. But **Pashto uses these two aspects for almost *everything!*** This is very import to remember and it takes a while for learners to get used to. @@ -54,14 +57,14 @@ For example, when making commands in Pashto we have to choose which aspect we ar - {[ - { p: "خبله کوټه صفا کوه!", f: "khpula koTa safaa kawa!", e: "Clean your room!" }, - ]} + {psmd([ + { p: `خبله کوټه **صفا کوه**!`, f: `khpula koTa **safaa kawa**`, e: "Clean your room!" }, + ])} - {[ - { p: "خبله کوټه صفا کړه!", f: "khpula koTa safaa kRa!", e: "Clean your room!" }, - ]} + {psmd([ + { p: `خبله کوټه **صفا کړه**!`, f: `khpula koTa **safaa kRa**!`, e: "Clean your room!" }, + ])} @@ -83,14 +86,14 @@ Or when talking about things in the future tense, we face the same choice of asp - {[ - { p: "مونږ به کېنو او خبرې کوو", f: "moonG ba keenóo aw khabure kawoo", e: "We'll sit and talk" }, - ]} + {psmd([ + { p: `مونږ به **کېنو** او **خبرې کوو**`, f: `moonG ba **keenóo** aw **khabure kawoo**`, e: "We'll sit and talk" }, + ])} - {[ - { p: "مونږ به کېنو او خبرې وکړو", f: "moonG ba kéenoo aw khabure ookRoo", e: "We'll sit and talk" }, - ]} + {psmd([ + { p: `مونږ به **کېنو** او **خبرې وکړو**`, f: `moonG ba **kéenoo** aw **khabure ookRoo**`, e: "We'll sit and talk" }, + ])} @@ -100,4 +103,35 @@ Or when talking about things in the future tense, we face the same choice of asp -In the next chapters (coming soon) we'll learn how to actually make verbs with these two different aspects. For now, it's just important to **be aware that they exist**. It takes a long time for learners to get used to the idea that they have to use the right aspect for almost everything. Otherwise, we tend to pick an aspect without thinking and sound completely wrong or confusing 50% of the time. 🤦‍♂️ +Even when talking about ability in the past tense, you still have to choose an aspect! + + + + + + + + + + + + + + + + + + +
Imperfective Perfective
+ {psmd([ + { p: `هغه له کوره **وتلی شوه**`, f: `haghá la kora **watuley shwa**`, e: "She was able to leave the house." }, + ])} + + {psmd([ + { p: `هغه له کوره **ووتلی شوه**`, f: `haghá la kora **óowatuley shwa**`, e: "She was able to leave the house." }, + ])} +
She had permission to go and could go whenever she wanted, repeatedly or in general.In one particular instance, she was able to get out of the house.
+ +See what a big difference the aspect ( / ) makes? Poor English verbs don't have these aspects in a lot of situations, and so when we speak English we just have to make do with more ambiguity. But in Pashto we can (and must!) be precise. + +In the next chapters (coming soon) we'll learn how to actually make verbs with these two different aspects. For now, it's just important to **be aware that they exist**. It takes a long time for learners to get used to the idea that they have to use the right aspect for almost everything. Otherwise, we tend to pick an aspect at random and then sound completely wrong or confusing 50% of the time. 🤦‍♂️ diff --git a/src/words/verb-categories/simple-trans.js b/src/words/verb-categories/simple-trans.js index 6349dda..a0525ea 100644 --- a/src/words/verb-categories/simple-trans.js +++ b/src/words/verb-categories/simple-trans.js @@ -7,18 +7,18 @@ */ module.exports = [ - { ts: 1527814617, e: "to take" }, // نیول - to take - { ts: 1527811872, e: "to put on" }, // اچول - to put, pour, drop, throw, put on - { ts: 1527817298, e: "to take" }, // اخیستل - to take, buy, purchase, receive; to shave, cut with scissors + { ts: 1527814617, e: "to take", ec: ["take", "takes", "taking", "took", "taken"] }, // نیول - to take + { ts: 1527811872, e: "to put on", ec: ["put", "puts", "putting", "put", "put"] }, // اچول - to put, pour, drop, throw, put on + { ts: 1527817298, e: "to take", ec: ["take", "takes", "taking", "took", "taken"] }, // اخیستل - to take, buy, purchase, receive; to shave, cut with scissors { ts: 1527816127, e: "to turn over" }, // اړول - to turn over, flip over; convert, change; to move over to, establish oneself in a new spot; divert, turn away, hijack - { ts: 1527811605, e: "to test" }, // ازمویل - to attempt, try; to experiment, test - { ts: 1527812458, e: "to send" },// استول - to send - { ts: 1527811397, e: "to wear" },// اغوستل - to wear, to put on (clothes) + { ts: 1527811605, e: "to test", ec: ["test", "tests", "testing", "tested", "tested"] }, // ازمویل - to attempt, try; to experiment, test + { ts: 1527812458, e: "to send", ec: ["send", "sends", "sending", "sent", "sent"] },// استول - to send + { ts: 1527811397, e: "to wear", ec: ["wear", "wears", "wearing", "worn", "worn"] },// اغوستل - to wear, to put on (clothes) { ts: 1527816125, e: "to make fly" },// الوزول - to make fly, to toss, to release (birds); to blow up { ts: 1527816146, e: "to take out" },// ایستل - to throw out, discard, chuck, toss; to extract, to take out - { ts: 1527817786, e: "to forgive" },// بخښل - to forgive, to pardon - { ts: 1527816092, e: "to call, deem" },// بلل - to call, invite; to consider, deem - { ts: 1577389204616, e: "to open" },// پرانیستل - to open; to undo; to initiate + { ts: 1527817786, e: "to forgive", ec: ["forgive", "forgives", "forgiving", "forgave", "forgiven"] },// بخښل - to forgive, to pardon + { ts: 1527816092, e: "to call, deem, consider", ec: ["deem", "deems", "deeming", "deemed", "deemed"] },// بلل - to call, invite; to consider, deem + { ts: 1577389204616, e: "to open", ec: ["open", "opens", "opening", "opened", "opened" ] }, // پرانیستل - to open; to undo; to initiate { ts: 1527816874, e: "to sell" },// پلورل - to sell { ts: 1527815190, e: "to quit" },// پرېښودل - to quit { ts: 1527815216, e: "to come" },// راتلل - to come diff --git a/yarn.lock b/yarn.lock index 70285de..4c9a820 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1554,10 +1554,10 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@lingdocs/pashto-inflector@^0.4.0": - version "0.4.6" - resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.4.6.tgz#02326f80333b181d62bb31b72922e37e6b7dcef5" - integrity sha512-22AYH63kYoSMF2YOo4Pu9S631kvOLlsgCuVL41zHDMf9KzXgkoDOqfYO4ogorI5X/IlylfscSe50RSDvUnagQw== +"@lingdocs/pashto-inflector@^0.6.9": + version "0.6.9" + resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.6.9.tgz#924bfc8f35cd9947196ce6ceb4ac346f6c91a8d5" + integrity sha512-EfFkxC1SQS+zXhIbiS5HqQfKUV31TDIY0f6QUGN60pMcILDerHUghUlicsgEdbfb88asiplXb434eCU62z9Prg== dependencies: classnames "^2.2.6" pbf "^3.2.1"