Merge remote-tracking branch 'origin/main'

This commit is contained in:
Andrea Vos 2023-02-24 17:37:52 +01:00
commit 7c1aa2cd71
7 changed files with 11 additions and 11 deletions

View File

@ -74,7 +74,7 @@
<ExpandableList :values="profile.names" :limit="16" class="list-unstyled" :static="static" :expand="expandLinks">
<template v-slot="s">
<Opinion :word="convertName(s.el.value)" :opinion="s.el.opinion" :escape="false" :customOpinions="profile.opinions"/>
<Opinion :word="convertName(s.el.value)" :opinion="s.el.opinion" :escape="false" :link="config.locale === 'tok' ? `${config.pronouns.prefix}/${s.el.value}` : null" :customOpinions="profile.opinions"/>
</template>
</ExpandableList>
</div>
@ -86,7 +86,7 @@
<ExpandableList :values="pronounOpinions" :limit="16" class="list-unstyled" :static="static" :expand="expandLinks">
<template v-slot="s">
<Opinion :word="typeof s.el.pronoun === 'string' ? s.el.pronoun : s.el.pronoun.name(glue)" :opinion="s.el.opinion" :link="`/${s.el.link}`" :customOpinions="profile.opinions"/>
<Opinion :word="typeof s.el.pronoun === 'string' ? s.el.pronoun : s.el.pronoun.name(glue)" :opinion="s.el.opinion" :link="`${config.pronouns.prefix || ''}/${s.el.link}`" :customOpinions="profile.opinions"/>
</template>
</ExpandableList>
</div>
@ -191,7 +191,7 @@
continue;
}
if (!link.startsWith(':')) {
if (!link.startsWith(':') && this.config.locale !== 'tok') {
link = link.toLowerCase();
}

View File

@ -17,6 +17,7 @@ pronouns:
prefix: '/li'
autoOpenGenerator: true
disableDescriptions: true
disableDisclaimer: true
pronunciation:
enabled: false

View File

@ -1,3 +1,2 @@
singular plural isHonorific
pilin mi la {pronoun} li pona mute. FALSE
mi wile e ilo pi {pronoun}. FALSE

1 singular plural isHonorific
2 pilin mi la {pronoun} li pona mute. FALSE
mi wile e ilo pi {pronoun}. FALSE

View File

@ -1,2 +1,2 @@
name pronouns description
Example names ona,jan Sewe,jan Tepo,jan Anatea TODO wording … Pronouns in Toki Pona aren't gendered, but you can share a link to usage of your name in sentences
Example names ona,jan Sewe,jan Tepo,jan Anateja TODO wording … Pronouns in Toki Pona aren't gendered, but you can share a link to usage of your name in sentences

1 name pronouns description
2 Example names ona,jan Sewe,jan Tepo,jan Anatea ona,jan Sewe,jan Tepo,jan Anateja TODO wording … Pronouns in Toki Pona aren't gendered, but you can share a link to usage of your name in sentences

View File

@ -1,5 +1,5 @@
key description normative pronoun plural pluralHonorific pronounceable history thirdForm smallForm sourcesInfo
ona TRUE ona FALSE FALSE TRUE
jan Sewe TRUE jan Sewe FALSE FALSE TRUE
jan Tepo TRUE jan Tepo FALSE FALSE TRUE
jan Anatea TRUE jan Anatea FALSE FALSE TRUE
ona FALSE ona FALSE FALSE TRUE
jan Sewe FALSE jan Sewe FALSE FALSE TRUE
jan Tepo FALSE jan Tepo FALSE FALSE TRUE
jan Anateja FALSE jan Anateja FALSE FALSE TRUE

Can't render this file because it has a wrong number of fields in line 2.

View File

@ -55,7 +55,7 @@
</section>
<section v-if="selectedPronoun.history">
<template v-for="part in selectedPronoun.history.replace(/\\@/g, '###').split('@')">
<template v-for="part in selectedPronoun.history.replace(/\\@/g, '###').split('@')" v-if="part !== '__generator__' || !config.pronouns.disableDisclaimer">
<div v-if="part === '__generator__'" class="alert alert-warning">
<Icon v="exclamation-triangle"/>
<T>pronouns.generated</T>

View File

@ -115,7 +115,7 @@
<T>home.generator.pronunciation</T>
</p>
-->
<div v-if="!usedBaseEquals" class="alert alert-warning">
<div v-if="!usedBaseEquals && !config.pronouns.disableDisclaimer" class="alert alert-warning">
<Icon v="exclamation-triangle"/>
<T>pronouns.generated</T>
</div>