diff --git a/src/App.tsx b/src/App.tsx index fa5c7ff..355143f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -47,7 +47,7 @@ function App(props: RouteComponentProps) { if (prod && !(user?.admin)) { ReactGA.pageview(window.location.pathname); } - }, [props.location.pathname]); + }, [props.location.pathname, user]); return ( <>
diff --git a/src/components/Table.js b/src/components/Table.js index bff9308..ed3dc01 100644 --- a/src/components/Table.js +++ b/src/components/Table.js @@ -27,6 +27,8 @@ function Table({ headRow, children, opts, wide }) { {isObject(cell) ? {[cell]} + : (!cell) + ? "" : cell } diff --git a/src/content/inflection/inflection-patterns.mdx b/src/content/inflection/inflection-patterns.mdx index 9b2ef68..13b38e1 100644 --- a/src/content/inflection/inflection-patterns.mdx +++ b/src/content/inflection/inflection-patterns.mdx @@ -35,9 +35,14 @@ Below are the **5 basic patterns for inflecting** nouns and adjectives. Notice h Don't worry about memorizing them all perfectly to start. Instead keep looking back and use them as guides to help you as you get familiar with the inflections over time. -## 1. Words ending in a consonant / +## 1. Basic - +These words always end in: + +- **Masculine:** - consonant or a shwa ( vowel) +- **Feminine:** - + +
@@ -77,7 +82,7 @@ This is very similar to pattern #2, but with the stress on the last syllable the -## 4. Words with the "Pashtun" pattern +## 4. Words with the "Pashtoon" pattern These words are a little irregular but you can see a common patten based around: @@ -94,3 +99,10 @@ These are also a little irregular but instead of lengthening the 1st masculine i +## Not all words inflect + +It's important to know that *not all words can be inflected*. If a word doesn't fit into one of these 5 patterns, you can't inflect it. For example, if an adjective ends in an in the masculine form, you can't inflect it because it doesn't fit any of the patterns above. 🙅‍♂️ + +{[ + { p: "خفه", f: "khufa", e: "sad", sub: "...is also sad because it can't inflect like all the other words 😢" }, +]} diff --git a/src/content/nouns/nouns-gender.mdx b/src/content/nouns/nouns-gender.mdx index 5e0052b..c01534c 100644 --- a/src/content/nouns/nouns-gender.mdx +++ b/src/content/nouns/nouns-gender.mdx @@ -20,7 +20,7 @@ import { } from "../../games/games"; import GameDisplay from "../../games/GameDisplay"; -export const femEndingWConsonant = words.filter((w) => w.category === "consonant-fem"); +export const femEndingWConsonant = words.filter((w) => w.category === "basic-fem"); export const Masc = () => ( masculine diff --git a/src/content/nouns/nouns-plural.mdx b/src/content/nouns/nouns-plural.mdx index 0c33a8d..eddbd08 100644 --- a/src/content/nouns/nouns-plural.mdx +++ b/src/content/nouns/nouns-plural.mdx @@ -29,39 +29,47 @@ export function PluralTable({ children, inflection }) { In Pashto **there are many, many ways that nouns become plural**. It may seem overwhelming at first to learn *all* these different ways of nouns becoming plural. In the beginning, just look at a few. Then keep coming back and see if you're getting familiar with all the different ways that nouns become plural. +Basically, to make a noun plural you have the following options: + +1. Inflect it. +2. If the word isn't inflectable you add a plural ending, or +3. If the word has an irregular plural use that. + ## Plural by Inflection -The first way is inflect a word if possible. Not all words inflect, but if they do, you can use the first inflection to make them plural. +To understand how to inflect words, have a look at the 5 inflection patterns. Here are some examples of words made plural using inflection. ### With masculine nouns {[ - [{ p: "سړی", f: "saRey", e: "man" }, { p: "سړي", f: "saRee", e: "men" }], - [{ p: "سپی", f: "spey", e: "dog" }, { p: "سپي", f: "spee", e: "dog" }], - [{ p: "پښتون", f: "puxtóon", e: "Pashtun" }, { p: "پښتانه", f: "puxtaanu", e: "Pashtuns" }], - [{ p: "غل", f: "ghul", e: "thief" }, { p: "غله", f: "ghlu", e: "thieves" }], + [{p: "سړی", f: "saRéy", e: "man", sub: pattern #3 }, { p: "سړي", f: "saRée", e: "men" }], + [{ p: "سپی", f: "spey", e: "dog", sub: pattern #3 }, { p: "سپي", f: "spee", e: "dog" }], + [{ p: "پښتون", f: "puxtóon", e: "Pashtun", sub: pattern #4 }, { p: "پښتانه", f: "puxtaanu", e: "Pashtuns" }], + [{ p: "غل", f: "ghul", e: "thief", sub: pattern #5 }, { p: "غله", f: "ghlu", e: "thieves" }], ]} ### With feminine nouns {[ - [{ p: "ښڅه", f: "xudza", e: "woman" }, { p: "ښځې", f: "xudze", e: "women" }], - [{ p: "پښتنه", f: "puxtana", e: "Pashtun (f.)" }, { p: "پښتنې", f: "puxtane", e: "Pashtuns (f.)" }], - [{ p: "لار", f: "laar", e: "road" }, { p: "لارې", f: "laare", e: "roads" }], - [{ p: "سختي", f: "sakhtée", e: "difficulty" }, { p: "سختۍ", f: "sakhtúy", e: "difficulties" }], - [{ p: "ناجوړتیا", f: "naajoRtyaa", e: "sickness" }, { p: "ناجوړتیاوې", f: "naajoRtyaawe", e: "sicknesses" }], + [{ p: "ښڅه", f: "xudza", e: "woman", sub: pattern #1 }, { p: "ښځې", f: "xudze", e: "women" }], + [{ p: "پښتنه", f: "puxtana", e: "Pashtun (f.)", sub: pattern #5 }, { p: "پښتنې", f: "puxtane", e: "Pashtuns (f.)" }], + [{ p: "سختي", f: "sakhtée", e: "difficulty", sub: ending in {{ p: "ي", f: "ee" }} }, { p: "سختۍ", f: "sakhtúy", e: "difficulties" }], ]} Note that in some forms of inflection with feminine nouns the word does not change at all in the first inflection. In these cases the singular and plural are just the same. {[ - [{ p: "ملګرې", f: "malgúre", e: "friend (f.)" }, { p: "ملګرې", f: "malgúre", e: "friends (f.)" }], - [{ p: "کړکۍ", f: "kuRkúy", e: "window" }, { p: "کړکۍ", f: "kuRkúy", e: "windows" }] + [{ p: "ملګرې", f: "malgúre", e: "friend (f.)", sub: pattern #2 }, { p: "ملګرې", f: "malgúre", e: "friends (f.)" }], + [{ p: "کړکۍ", f: "kuRkúy", e: "window", sub: ending in {{ p: "ۍ", f: "uy" }} }, { p: "کړکۍ", f: "kuRkúy", e: "windows" }] ]} -## Inanimate Plural Ending +## Plural Endings -For masculine inanimate words that end in a consonant (and some others) you can add the ** ending** to make the noun plural. +### Masculine Plural Endings + +#### Inanimate Plural Ending + +This only works with **masculine nouns** that fit into the basic pattern. It's *usually* only used with inanimate things (not with people or animals). But there are exceptions... {[ [{ p: "کور", f: "kor", e: "house" }, { p: "کورونه", f: "koróona", e: "houses" }], @@ -69,11 +77,9 @@ For masculine inanimate words that end in a consonant (and some others) you can [{ p: "کتاب", f: "kitáab", e: "book" }, { p: "کتابونه", f: "kitaabóona", e: "books" }], ]} -## Animate Plural Ending +#### Animate Plural Ending -For many animate nouns (and some others), you can add a ending to make it plural. If the noun ends in a vowel, you will often need to add a before the ending. - -### With masculine nouns +This is *usually* only used with animate things (people or animals), but there are exceptions... {[ [{ p: "دوست", f: "dost", e: "friend" }, { p: "دوستان", f: "dostáan", e: "friends" }], @@ -81,15 +87,7 @@ For many animate nouns (and some others), you can add a -### With feminine nouns - -When we use this with feminine nouns, we need to add an on the end. - -{[ - [{ p: "بيشو", f: "peeshó", e: "cat 🐱" }, { p: "پیشوګانې", f: "peeshogáane", e: "cats 🐱🐱" }], - [{ p: "استاذ", f: "Ustáaza", e: "teacher (f.) 👩‍🏫" }, { p: "استاذانې", f: "Ustaazáane", e: "teachers (f.) 👩‍🏫👩‍🏫" }], - [{ p: "ډاکټره", f: "DakTára", e: "doctor (f.) 👩‍⚕️"}, { p: "ډاکټرانې", f: "DakTaráane", e: "doctors (f.) 👩‍⚕️👩‍⚕️" }], -]} +**Note**: If the word ends with a non-shwa vowel, (ie. not 'u') a can be added to seperate the ending and the vowel. **Note:** Sometimes the ending is used with animate nouns, and somethimes the ending is used with inanimate nouns as well. For example: @@ -97,6 +95,27 @@ When we use this with feminine nouns, we need to add an + +### Feminine Plural Endings + +Depending on the dialect, you can either add , or to the end of the word to make it plural. + +{[ + [{ p: "دعا", f: "dUáa", e: "prayer" }, { p: "دعاوې", f: "dUáawe", e: "prayers" }], + [null, { p: "دعاګانې", f: "dUaagáane", e: "prayers" }], + [{ p: "بيشو", f: "peeshó", e: "cat 🐱" }, { p: "پیشووې", f: "peeshówe", e: "cats 🐱🐱" }], + [null, { p: "پیشوګانې", f: "peeshogáane", e: "cats 🐱🐱" }], +]} + +#### With unisex animate nouns + +When a noun is a unisex noun, you often add an on the end of the animate ending instead of using the regular inflection. + +{[ + [{ p: "استاذ", f: "Ustáaza", e: "teacher (f.) 👩‍🏫" }, { p: "استاذانې", f: "Ustaazáane", e: "teachers (f.) 👩‍🏫👩‍🏫" }], + [{ p: "ډاکټره", f: "DakTára", e: "doctor (f.) 👩‍⚕️"}, { p: "ډاکټرانې", f: "DakTaráane", e: "doctors (f.) 👩‍⚕️👩‍⚕️" }], +]} + ## Irregular Plurals Some nouns just have completely irregular plural forms. diff --git a/src/content/nouns/nouns-unisex.mdx b/src/content/nouns/nouns-unisex.mdx index 5512bf6..5243995 100644 --- a/src/content/nouns/nouns-unisex.mdx +++ b/src/content/nouns/nouns-unisex.mdx @@ -19,9 +19,9 @@ There are many words for people and animals in Pashto that can be used in both m To make the male and female forms you just follow the 5 inflection patterns. If you haven't mastered the 5 inflection patterns yet, don't worry, we'll review how each of them works with the unisex nouns below. -### 1. Words ending in a consonant / +### 1. Basic -Just like with other words ending in a consonant, you add an on the end to make them feminine. +Just like with other words following the basic pattern, you add an on the end to make them feminine. ### 2. Words ending in an unstressed -With the feminine form the on the end becomes . +The feminine form the on the end becomes . See pattern. on ### 3. Words ending in a stressed -If the accent comes on the end of the word, the femine form is a little different. With these words the on the end becomes . +If the accent comes on the end of the word, the femine form is a little different. With these words the on the end becomes . See pattern. -### 4. Words with the "Pashtun" pattern +### 4. Words with the "Pashtoon" pattern + +See pattern. pattern. +