got nouns back in
This commit is contained in:
parent
25dbee760d
commit
28b4426e8c
|
@ -1,28 +0,0 @@
|
||||||
{
|
|
||||||
"PS Sententce": {
|
|
||||||
"prefix": "pssentence",
|
|
||||||
"body": [
|
|
||||||
"{",
|
|
||||||
"\tp: \"$1\",",
|
|
||||||
"\tf: \"$2\",",
|
|
||||||
"\te: \"$3\",",
|
|
||||||
"}"
|
|
||||||
],
|
|
||||||
}
|
|
||||||
// Place your Code workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
|
|
||||||
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
|
|
||||||
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
|
|
||||||
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
|
|
||||||
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
|
|
||||||
// Placeholders with the same ids are connected.
|
|
||||||
// Example:
|
|
||||||
// "Print to console": {
|
|
||||||
// "scope": "javascript,typescript",
|
|
||||||
// "prefix": "log",
|
|
||||||
// "body": [
|
|
||||||
// "console.log('$1');",
|
|
||||||
// "$2"
|
|
||||||
// ],
|
|
||||||
// "description": "Log output to console"
|
|
||||||
// }
|
|
||||||
}
|
|
|
@ -19,16 +19,16 @@ import * as otherEquatives from "!babel-loader!@lingdocs/mdx-loader!./equatives/
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import * as equativeExplorer from "!babel-loader!@lingdocs/mdx-loader!./equatives/equative-explorer.mdx";
|
import * as equativeExplorer from "!babel-loader!@lingdocs/mdx-loader!./equatives/equative-explorer.mdx";
|
||||||
|
|
||||||
// // @ts-ignore
|
// @ts-ignore
|
||||||
// import * as nounsGender from "!babel-loader!@lingdocs/mdx-loader!./nouns/nouns-gender.mdx";
|
import * as nounsGender from "!babel-loader!@lingdocs/mdx-loader!./nouns/nouns-gender.mdx";
|
||||||
// // @ts-ignore
|
// @ts-ignore
|
||||||
// import * as nounsUnisex from "!babel-loader!@lingdocs/mdx-loader!./nouns/nouns-unisex.mdx";
|
import * as nounsUnisex from "!babel-loader!@lingdocs/mdx-loader!./nouns/nouns-unisex.mdx";
|
||||||
// // @ts-ignore
|
// @ts-ignore
|
||||||
// import * as nounsPlural from "!babel-loader!@lingdocs/mdx-loader!./nouns/nouns-plural.mdx";
|
import * as nounsPlural from "!babel-loader!@lingdocs/mdx-loader!./nouns/nouns-plural.mdx";
|
||||||
// // @ts-ignore
|
// @ts-ignore
|
||||||
// import * as arabicPlurals from "!babel-loader!@lingdocs/mdx-loader!./nouns/arabic-plurals.mdx";
|
import * as arabicPlurals from "!babel-loader!@lingdocs/mdx-loader!./nouns/arabic-plurals.mdx";
|
||||||
// // @ts-ignore
|
// @ts-ignore
|
||||||
// import * as bundledPlurals from "!babel-loader!@lingdocs/mdx-loader!./nouns/bundled-plurals.mdx";
|
import * as bundledPlurals from "!babel-loader!@lingdocs/mdx-loader!./nouns/bundled-plurals.mdx";
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import * as verbAspect from "!babel-loader!@lingdocs/mdx-loader!./verbs/verb-aspect.mdx";
|
import * as verbAspect from "!babel-loader!@lingdocs/mdx-loader!./verbs/verb-aspect.mdx";
|
||||||
|
@ -113,6 +113,32 @@ const contentTree = [
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
heading: "Nouns",
|
||||||
|
subdirectory: "nouns",
|
||||||
|
chapters: [
|
||||||
|
{
|
||||||
|
import: nounsGender,
|
||||||
|
slug: "nouns-gender",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
import: nounsUnisex,
|
||||||
|
slug: "nouns-unisex",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
import: nounsPlural,
|
||||||
|
slug: "nouns-plural",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
import: arabicPlurals,
|
||||||
|
slug: "arabic-plurals",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
import: bundledPlurals,
|
||||||
|
sluge: "bundled-plurals",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
heading: "Verbs",
|
heading: "Verbs",
|
||||||
subdirectory: "verbs",
|
subdirectory: "verbs",
|
||||||
|
|
|
@ -11,7 +11,6 @@ import genderColors from "../../lib/gender-colors";
|
||||||
import { firstVariation } from "../../lib/text-tools";
|
import { firstVariation } from "../../lib/text-tools";
|
||||||
import GenderTable from "../../components/GenderTable";
|
import GenderTable from "../../components/GenderTable";
|
||||||
import Link from "../../components/Link";
|
import Link from "../../components/Link";
|
||||||
import words from "../../words/nouns-adjs";
|
|
||||||
export const femColor = genderColors.f;
|
export const femColor = genderColors.f;
|
||||||
export const mascColor = genderColors.m;
|
export const mascColor = genderColors.m;
|
||||||
import {
|
import {
|
||||||
|
@ -20,8 +19,6 @@ import {
|
||||||
} from "../../games/games";
|
} from "../../games/games";
|
||||||
import GameDisplay from "../../games/GameDisplay";
|
import GameDisplay from "../../games/GameDisplay";
|
||||||
|
|
||||||
export const femEndingWConsonant = words.filter((w) => w.category === "basic-fem");
|
|
||||||
|
|
||||||
export const Masc = () => (
|
export const Masc = () => (
|
||||||
<span style={{ backgroundColor: mascColor }}>masculine</span>
|
<span style={{ backgroundColor: mascColor }}>masculine</span>
|
||||||
);
|
);
|
||||||
|
@ -123,10 +120,21 @@ Some <Fem /> words have had their <InlinePs opts={opts} ps={{p:"ـه", f:"a"}} /
|
||||||
|
|
||||||
Here are some other <Fem /> words that have lost their <InlinePs opts={opts} ps={{p:"ـه", f:"a"}} /> ending:
|
Here are some other <Fem /> words that have lost their <InlinePs opts={opts} ps={{p:"ـه", f:"a"}} /> ending:
|
||||||
|
|
||||||
|
export const femEndingWConsonant = [
|
||||||
|
{ p: "لار", f: "laar", e: "road" },
|
||||||
|
{ p: "میاشت", f: "myaasht", e: "month" },
|
||||||
|
{ p: "غېږ", f: "gheG", e: "bosom" },
|
||||||
|
{ p: "څنګل", f: "tsangul", e: "elbow" },
|
||||||
|
{ p: "بړستن", f: "bRastun", e: "blanket" },
|
||||||
|
{ p: "ږمنځ", f: "Gmundz", e: "comb" },
|
||||||
|
{ p: "ستن", f: "stun", e: "needle" },
|
||||||
|
{ p: "لمن", f: "lamun", e: "skirt" },
|
||||||
|
];
|
||||||
|
|
||||||
export function IrregularFem() {
|
export function IrregularFem() {
|
||||||
return <ul>
|
return <ul>
|
||||||
{femEndingWConsonant.map(({ entry }) => (
|
{femEndingWConsonant.map((entry) => (
|
||||||
<li key={entry.ts}>
|
<li key={entry.p}>
|
||||||
<InlinePs opts={opts} ps={{ p: entry.p, f: firstVariation(entry.f), e: firstVariation(entry.e) }} />
|
<InlinePs opts={opts} ps={{ p: entry.p, f: firstVariation(entry.f), e: firstVariation(entry.e) }} />
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
|
|
|
@ -96,6 +96,7 @@ export default function GenderGame({level, id, link}: { level: 1 | 2, id: string
|
||||||
function* questions () {
|
function* questions () {
|
||||||
const wordPool = {...types};
|
const wordPool = {...types};
|
||||||
const exceptionsPool = {...exceptions};
|
const exceptionsPool = {...exceptions};
|
||||||
|
console.log(exceptionsPool);
|
||||||
for (let i = 0; i < amount; i++) {
|
for (let i = 0; i < amount; i++) {
|
||||||
const base = level === 1
|
const base = level === 1
|
||||||
? wordPool
|
? wordPool
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue