From ea0b0a79d2815b79bb2e823bcaa2cbb840ec976f Mon Sep 17 00:00:00 2001 From: Avris Date: Sun, 17 Jan 2021 18:57:02 +0100 Subject: [PATCH] [nl] three forms, hen/hun duality --- locale/nl/config.suml | 1 + locale/nl/pronouns/GrammarTables.vue | 16 ++++++++-------- locale/nl/pronouns/pronouns.tsv | 17 +++++++++-------- src/classes.js | 6 ++++-- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/locale/nl/config.suml b/locale/nl/config.suml index 6af619be..289815c0 100644 --- a/locale/nl/config.suml +++ b/locale/nl/config.suml @@ -37,6 +37,7 @@ pronouns: slashes: true avoiding: false others: 'Other pronouns' + threeForms: true pronunciation: enabled: true diff --git a/locale/nl/pronouns/GrammarTables.vue b/locale/nl/pronouns/GrammarTables.vue index 635141f2..30149efc 100644 --- a/locale/nl/pronouns/GrammarTables.vue +++ b/locale/nl/pronouns/GrammarTables.vue @@ -9,19 +9,19 @@ - - - - + + + + - - - - + + + + diff --git a/locale/nl/pronouns/pronouns.tsv b/locale/nl/pronouns/pronouns.tsv index d0efce3b..04bef66a 100644 --- a/locale/nl/pronouns/pronouns.tsv +++ b/locale/nl/pronouns/pronouns.tsv @@ -1,11 +1,12 @@ key description normative nominative accusative pronominal_poss predicative_poss reflexive plural pluralHonorific pronounceable history thirdForm smallForm sourcesInfo -hij,hij/hem/zijn Masculine TRUE hij hem zijn zijne zichzelf FALSE FALSE TRUE -zij,zij/haar/haar Feminine TRUE zij haar haar hare haarzelf FALSE FALSE TRUE -hen,hen/hen/hun Neutral FALSE hen hen hun hunne hunzelf FALSE FALSE TRUE +hij,hij/hem,hij/hem/zijn Masculine TRUE hij hem zijn zijne zichzelf FALSE FALSE TRUE +zij,zij/haar,zij/haar/haar Feminine TRUE zij haar haar hare haarzelf FALSE FALSE TRUE +hen,hen/hun,hen/hen/hun Neutral FALSE hen hen hun hunne hunzelf FALSE FALSE TRUE Mogelijk ook met {/hen/hun/hun=“hun”} als accusatief. Deze lijst van bronnen bevat zowel de versie met {/hen=“hen/hen/hun”} als {/hen/hun/hun=“/hen/hun/hun”}. +hen/hun/hun Neutral FALSE hen hun hun hunne hunzelf FALSE FALSE TRUE Mogelijk ook met {/hen/hen/hun=“hen”} als accusatief. Deze lijst van bronnen bevat zowel de versie met {/hen=“hen/hen/hun”} als {/hen/hun/hun=“/hen/hun/hun”}. die/hen,die/hen/hun Neutral FALSE die hen hun hunne hunzelf FALSE FALSE TRUE -die,die/die/diens Neutral FALSE die die diens diense dienzelf FALSE FALSE TRUE -dee,dee/dem/dijr Neutral FALSE dee dem dijr dijre dijrzelf FALSE FALSE TRUE -dij,dij/dem/dijr Neutral FALSE dij dem dijr dijre dijrzelf FALSE FALSE TRUE +die,die/die,die/diens,die/die/diens Neutral FALSE die die diens diense dienzelf FALSE FALSE TRUE +dee,dee/dem,dee/dem/dijr Neutral FALSE dee dem dijr dijre dijrzelf FALSE FALSE TRUE +dij,dij/dem,dij/dem/dijr Neutral FALSE dij dem dijr dijre dijrzelf FALSE FALSE TRUE hen/hens,hen/hen/hens Neutral FALSE hen hen hens hense henzelf FALSE FALSE TRUE -zhij,zhij/zhaar/zhaar Neutral FALSE zhij zhaar zhaar zhare zhaarself FALSE FALSE TRUE Based on the English pronoun "zhe/zher". -zem,zem/zeer/zeer Neutral FALSE zem zeer zeer zere zeerself FALSE FALSE TRUE Based on the English pronoun "ze/zir". +zhij,zhij/zhaar,zhij/zhaar/zhaar Neutral FALSE zhij zhaar zhaar zhare zhaarself FALSE FALSE TRUE Based on the English pronoun "zhe/zher". +zem,zem/zeer,zem/zeer/zeer Neutral FALSE zem zeer zeer zere zeerself FALSE FALSE TRUE Based on the English pronoun "ze/zir". diff --git a/src/classes.js b/src/classes.js index 5d400e11..f719f9bc 100644 --- a/src/classes.js +++ b/src/classes.js @@ -297,12 +297,14 @@ export class Pronoun { nameOptions() { const options = new Set(); const optionsN = this.morphemes[MORPHEMES[0]].split('&'); - const optionsG = this.morphemes[MORPHEMES[1]] === this.morphemes[MORPHEMES[0]] && MORPHEMES.length > 2 + const optionsG = this.morphemes[MORPHEMES[1]] === this.morphemes[MORPHEMES[0]] && MORPHEMES.length > 2 && !config.pronouns.threeForms ? this.morphemes[MORPHEMES[2]].split('&') : this.morphemes[MORPHEMES[1]].split('&'); for (let i in optionsN) { let nameOption = optionsN[i] + '/' + optionsG[i < optionsG.length - 1 ? i : optionsG.length - 1]; - if (this.thirdForm) { + if (config.pronouns.threeForms) { + nameOption += '/' + this.morphemes[MORPHEMES[2]].split('&')[i]; + } else if (this.thirdForm) { nameOption += '/' + this.morphemes[this.thirdForm].split('&')[i]; }
SubjectObjectPossessive determinerPossessive pronounnominative TODOaccusative TODOpronominal_poss TODOpredicative_poss TODO Reflexive