From e8c17e7eb367786b9aa1569f9781e05fd80dbbf6 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Sat, 23 Jul 2022 19:29:37 +0200 Subject: [PATCH] [tok] remove pronouns other than "ona" --- locale/tok/config.suml | 91 +++------------------------ locale/tok/pronouns/Suggested.vue | 4 +- locale/tok/pronouns/pronounGroups.tsv | 5 +- locale/tok/pronouns/pronouns.tsv | 22 +------ locale/tok/translations.suml | 4 ++ routes/pronouns.vue | 2 +- 6 files changed, 17 insertions(+), 111 deletions(-) diff --git a/locale/tok/config.suml b/locale/tok/config.suml index b6971ae0d..a6bf50790 100644 --- a/locale/tok/config.suml +++ b/locale/tok/config.suml @@ -4,89 +4,16 @@ header: true pronouns: enabled: true - route: 'ona' - default: 'ala' - any: 'ale' + route: 'supa_ona' + default: 'ona' + any: false plurals: false honorifics: false - multiple: - name: 'ona mute' - description: > - tonsi mute li kepeken e ona mute. - ona li pona e nimi pi ni tu. - ona mute li pona e nimi pi tu ante. - examples: ['mije&meli', 'mije&tonsi', 'tonsi&meli'] - null: - description: > - {/apeja_e_ona=apeja e ona} / {/ona_ala=ona ala} / {/jan_pi_nimi_ona_ala=jan pi nimi ona ala} / {/ona_nimi=ona nimi} - history: > - jan mute li pona e ona ala, la nimi nimi e lon sitelen. - O lipu: {https://twitter.com/lypomania/status/1290274971642544128=lupi Lipomani}, - {https://lgbta.wikia.org/wiki/Nullpronominal=ona ala lon pu Esipiti} - morphemes: - pronoun_subject: 'ona #' - pronoun_adjective: '#' - reflexive: 'jan #' - examples: [':Sonja', ':N', ':Sa'] - template: 'o open e ijo, la o ante nimi sina e nimi ijo.' - routes: ['apeja_e_ona'] - ideas: - - - header: 'o kepeken ala e ona, la o kepeken e nimi.' - normative: true - examples: - - ['mi toki lon pini e ona mije.', 'mi toki lon pini e jan {/:Kai=Kai}.'] - - ['ona meli li suwi a.', 'jan {/:Sape=Sape} li suwi a.'] - - - - 'kama open e tenpo pini sona pi ona meli.' - - 'kama open e tenpo pini sona pi jan {/:Se=Se}.' - - - header: 'toki awen' - normative: true - examples: - - ['ona mije li kepeken e ilo.', 'ilo e kepeken.'] - - - - 'jan Wen li olin e soweli ona.' - - 'soweli Wen li olin.' - - - header: 'sitelen ante.' - normative: true - examples: - - ['Lior did it all by himself', 'Lior did it all without any help'] - - ['Gael talks in his sleep', 'Gael talks while sleeping'] - - - header: 'o ona li ijo' - normative: true - examples: - - ['ona meli li pini e ilo waso.', 'jan sona waso li pini e ilo waso.'] - - ['ni li jan Le. ona li olin e pali sitelen.', 'ni li jan Le, la li olin e pali sitelen.'] - - ['ona meli li toki e…', 'jan open li toki e…'] - - - header: 'o ala e ona' - normative: true - examples: - - ['sina esun e ijo pona pi ona meli?', 'sina esun e ijo pona?'] - - ['lon. mi esun e ijo pona pi ona meli, la mi kama pana ona meli e ni.', 'lon. mi esun e ijo pona, la mi kama pana e ni.'] - emoji: - description: 'ona nimi sitelen linluwi.' - history: '{https://lgbta.wikia.org/wiki/Emojiself_Pronouns=ona nimi sitelen linluwi} li toki linluwi, la toki ala pi linluwi ala.' - morphemes: - pronoun_subject: 'ona #' - pronoun_adjective: '#' - reflexive: 'jan #' - examples: ['💫', '💙'] - template: 'o open e ijo, la o ante sitelen sina e sitelen ijo.' - mirror: - route: 'jasima' - name: 'ona jasima' - description: > - jan pi ona jasima li wile nimi e ona pi sama jan toki. - example: - - 'jan nanpa wan li kepeken e ona jasima.' - - 'jan nanpa tu li kepeken e {/meli=ona meli}, la ona meli li toki e jan nanpa wan, la ona meli li nimi meli e ona meli.' - - 'jan nanpa tu wan li kepeken e {/mije=ona mije} e {/Fa=ona Fa}, la ona mije li toki e jan nanpa wan, la ona Fa li nimi Fa e ona mije e ona Fa.' - slashes: true - others: 'ona ante' + multiple: false + null: false + emoji: false + mirror: false + slashes: false pronunciation: enabled: true @@ -210,7 +137,7 @@ profile: - ['lukin pona', 'suwi', 'unpa mute', 'olin', 'pona'] - ['jan pona', 'jan olin', 'meli olin', 'mije olin', 'tonsi olin', 'mije mi', 'meli mi', 'tonsi mi', 'unpa e mi', 'jan suwi mute', 'jan olin mute', 'a olin'] flags: - defaultPronoun: 'ala' + defaultPronoun: 'ona' calendar: enabled: true diff --git a/locale/tok/pronouns/Suggested.vue b/locale/tok/pronouns/Suggested.vue index 75005ca99..f656b6c2c 100644 --- a/locale/tok/pronouns/Suggested.vue +++ b/locale/tok/pronouns/Suggested.vue @@ -5,9 +5,7 @@ home.pronouns

- Toki Pona uses just one 3rd person personal pronoun, “ona”, which is not gendered. - Gender may be specified in rare cases, like when talking explicitly about gender identity - or translating a text about a nonbinary character without erasing their identity expressed in the original version. + pronouns.intro

diff --git a/locale/tok/pronouns/pronounGroups.tsv b/locale/tok/pronouns/pronounGroups.tsv index 3c91f5993..047a23a73 100644 --- a/locale/tok/pronouns/pronounGroups.tsv +++ b/locale/tok/pronouns/pronounGroups.tsv @@ -1,5 +1,2 @@ name pronouns description -nimi pu ala,meli,mije ona ni li nimi e kulupu ale. jan Sonja li samu e ni. -nimi ku tonsi,kese ona tonsi li nimi e kulupu ku. tonsi li nimi e ku suli, la jan Inwin li samu e ni. ona kese li nimi e kulupu lon pini ku. pu mute li lanpan tonsi e kese. -nimi pi ona sin pu soweli,akesi,pipi,waso,wan,jan ona ni li jo e nimi toki pona, la ni li kepeken sin. -nimi pi ona sin Ai,Ko,Mika,Tonji,Nsi,Fa,Ni,Jani,Wi,Si ona ni li ku ala. ona ni li sama pona e ona ante. ona sina li ala e supa, la sina o kepeken e ilo anpa! +nimi pu ona ona ni li nimi e kulupu ale. jan Sonja li samu e ni. diff --git a/locale/tok/pronouns/pronouns.tsv b/locale/tok/pronouns/pronouns.tsv index f8af55149..694dcea25 100644 --- a/locale/tok/pronouns/pronouns.tsv +++ b/locale/tok/pronouns/pronouns.tsv @@ -1,22 +1,2 @@ key description normative pronoun_subject pronoun_adjective reflexive plural pluralHonorific pronounceable history thirdForm smallForm sourcesInfo -mije,ona mije ona pi mije TRUE ona mije mije jan mije FALSE FALSE TRUE -meli,ona meli ona pi meli TRUE ona meli meli jan meli FALSE FALSE TRUE -tonsi,ona tonsi ona pi tonsi TRUE ona tonsi tonsi jan tonsi FALSE FALSE TRUE kulupu pi toki pona li sona e wile namako. lon tenpo, nimi e “nimi pu namako”. -kese,ona kese ona pi kese TRUE ona kese kese jan kese FALSE FALSE TRUE toki Iwisi li pana e kese lon tenpo pini ku. -ala,ona ala,nimi ala ona pi nimi ala TRUE ona jan jan FALSE FALSE TRUE jan Sonja li wile o nimi e ona wan. lipu li jo e ona pi ona e ona pi jan Sonja. -wan,wan lili,jan wan jan pi wan lili FALSE jan wan jan jan ni FALSE FALSE TRUE -Ai,ona Ai ona pi Ai FALSE ona Ai Ai jan pi Ai FALSE FALSE TRUE jan Tawi Linsai li samu e lipu lon 1920, la ni li kepeken e kule wan tu pi jan ante. -Ko,ona Ko ona pi Ko FALSE ona Ko Ko jan pi Ko FALSE FALSE TRUE jan Mawi Owan li samu lon 1970 e nimi Into Elopa, “*ko.” -Mika,Tonji/Tenli/Monse,ona Mika ona pi jan Mika Piwa FALSE ona Tonji Tenli jan pi Monse FALSE FALSE TRUE samu e nimi Inli pi Mika Piwa (em). -Tonji,ona Tonji ona pi Tonji FALSE ona Tonji Tonji jan pi Tonji FALSE FALSE TRUE samu e nimi Inli pi Same Oke (em). -Nsi,ona Nsi ona pi Nsi FALSE ona Nsi Nsi jan pi Nsi FALSE FALSE TRUE o samu, lanpan “To” e tonsi. -Fa,ona Fa ona pi Fa FALSE ona Fa Fa jan pi Fa FALSE FALSE TRUE jan Satawas li asmu lon 2014. -jan ona pi jan FALSE jan jan jan FALSE FALSE TRUE jan Sasa Nupow li samu lon 1982 e nimi Inli pi (human), la nimi toki pona li jan. -Ni,ona Ni ona pi Ni FALSE ona Ni Ni jan pi Ni FALSE FALSE TRUE -soweli,ona soweli ona pi soweli FALSE ona soweli soweli jan jan soweli FALSE FALSE TRUE samu e soweli. -Jani,ona Jani ona pi Jani FALSE ona Jani Jani jan Jani FALSE FALSE TRUE samu e nimi Inli pi Sawe Kosa Konwe. ona li open e ona tonsi. o samu, namako ni e jan. -Wi,ona Wi ona pi Wi FALSE ona Wi Wi jan Wi FALSE FALSE TRUE -Si,ona Si ona pi Si FALSE ona Si Si jan Si FALSE FALSE TRUE samu e nimi Tosi (sie). -akesi,ona akesi ona pi akesi FALSE ona akesi akesi jan jan akesi FALSE FALSE TRUE samu e akesi. -waso,ona waso ona pi waso FALSE ona waso waso jan jan waso FALSE FALSE TRUE samu e waso. -pipi,ona pipi ona pi pipi FALSE ona pipi pipi jan jan pipi FALSE FALSE TRUE samu e pipi. +ona,ala,ona ala,nimi ala ona pi nimi ala TRUE ona jan jan FALSE FALSE TRUE jan Sonja li wile o nimi e ona wan. lipu li jo e ona pi ona e ona pi jan Sonja. diff --git a/locale/tok/translations.suml b/locale/tok/translations.suml index 1775dfe54..960b23415 100644 --- a/locale/tok/translations.suml +++ b/locale/tok/translations.suml @@ -80,6 +80,10 @@ pronouns: othersRaw: 'ante' or: 'anu' grammarTable: 'supa' + intro: > + Toki Pona uses just one 3rd person personal pronoun, “ona”, which is not gendered. + Gender may be specified in rare cases, like when talking explicitly about gender identity + or translating a text about a nonbinary character without erasing their identity expressed in the original version. sources: header: 'sona mute' diff --git a/routes/pronouns.vue b/routes/pronouns.vue index 0661021a5..61dddff8c 100644 --- a/routes/pronouns.vue +++ b/routes/pronouns.vue @@ -236,7 +236,7 @@ selectedMorpheme: '', customiseMultiple: false, - multiple: this.config.pronouns.multiple.examples[0].split('&'), + multiple: this.config.pronouns.multiple ? this.config.pronouns.multiple.examples[0].split('&') : [], customise: false,