Merge branch 'main' into admin

components/VersionDropdown.vue

@@ -51,7 +51,7 @@
             return {
                 spellings: {
                     zh: {traditional: '繁體', simplified: '简体'},
-                    tok: {latin: 'Lasin', sitelen: 'sitelen pona'},
+                    tok: {latin: 'sitelen Lasina', sitelen: 'sitelen\xa0pona'},
                 }
             };
         },

locale/tok/config.suml

@@ -3,9 +3,9 @@ locale: 'tok'
 header: true
 
 pronouns:
-    enabled: true
+    enabled: false
-    route: 'supa_ona'
+    route: 'nimi'
-    default: 'ona'
+    default: 'jan'
     any: false
     plurals: false
     honorifics: false
@@ -14,22 +14,23 @@ pronouns:
     emoji: false
     mirror: false
     slashes: false
+    sentence:
+        prefixes: ['/li']
+        examples:
+            - 'nimi-mi.tk/li/jan Sonja'
 
 pronunciation:
-    enabled: true
+    enabled: false
     ipa: true
     voices:
-        PL:
+        TOK:
             language: 'es-US'
-            voice: 'Lupe'
+            voice: 'jan Lupe'
             engine: 'standard'
 
 sources:
-    enabled: true
+    enabled: false
-    route: 'lipu'
-    submit: true
     mergePronouns: {}
-    extraTypes: ['apeja e ona', 'nimi ijo']
 
 nouns:
     enabled: false
@@ -42,27 +43,13 @@ nouns:
     templates: true
 
 community:
-    route: 'nimi_ale'
+    route: 'kulupu-pi-nasin-toki'
 
 inclusive:
     enabled: false
 
 terminology:
-    enabled: true
+    enabled: false
-    published: true
-    categories:
-        - 'kule unpa'
-        - 'kule olin'
-        - 'kule nanpa tu wan'
-        - 'kule'
-        - 'lukin kule'
-        - 'jan li olin seme e jan'
-        - 'toki'
-        - 'suwi'
-        - 'alasa'
-        - 'ike (nimi apeja)'
-
-    route: 'nimi_ale'
 
 names:
     enabled: false
@@ -72,60 +59,37 @@ people:
 
 # optional, but would be nice to have
 english:
-    enabled: true
+    enabled: false
-    route: 'english'
-    pronounGroups:
-        -
-            name: 'Removing Ambiguity'
-            description:
-                - >
-                    toki pona has a single third-person pronoun, ona, that just means “it” or “they.”
-                    Often this can become vague. Most people solve this by adding the gender adjectives whenever there is a need,
-                    however, just like in English, there are people who have pronouns different from their gender,
-                    and some people don't like the neutral “ona” at all.
-            table: {mije: 'Masculine', meli: 'Feminine'}
 
 faq:
     enabled: true
-    route: 'seme_mute'
+    route: 'sona'
 
 links:
-    enabled: true
+    enabled: false
-    split: true
-    route: 'tawa'
-    blogRoute: 'lipu_lili'
-    links:
-        -
-            icon: 'globe-europe'
-            url: 'https://pronoun.is/'
-            headline: 'Pronoun.is'
-            extra: '– ni li pana sona e sitelen ni'
-    academic: []
-    mediaGuests: []
-    mediaMentions: []
-    recommended: []
-    blog: false
-    zine:
-        enabled: false
 
 contact:
     enabled: true
-    route: 'toki'
+    route: 'o-toki-tawa-mi'
     authors:
+        -
+            footerName: 'jan Tepo'
+            username: 'tbodt'
+            footerAreas: 'ante toki'
         -
             footerName: 'jan Sewe (soweli e wan esun)'
             username: 'GiggyMantis'
-            footerAreas: 'toki ante'
+            footerAreas: 'ante toki'
     team:
         enabled: true
-        route: 'kulupu_ni'
+        route: 'kulupu-pi-nasin-toki'
 
 support:
     enabled: true
 
 user:
     enabled: true
-    route: 'jan_mi'
+    route: 'mi'
     termsRoute: 'lawa'
     privacyRoute: 'privacy'  # TODO
 
@@ -135,22 +99,20 @@ profile:
     defaultWords:
         -
             header: ~
-            values: ['jan [nimi]', 'tonsi [nimi]', 'meli [nimi]', 'mije [nimi]']
+            values: []
         -
             header: ~
-            values: ['jan', 'mije', 'meli', 'tonsi', 'jan pona', 'mije lili', 'meli lili', 'tonsi lili', 'jan lili', 'pata', 'pata meli', 'pata mije', 'pata tonsi']
+            values: []
         -
             header: ~
-            values: ['lukin pona', 'suwi', 'unpa mute', 'olin', 'pona']
+            values: []
         -
             header: ~
-            values: ['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']
+            values: []
     flags:
         defaultPronoun: 'ona'
 
-calendar:
+calendar: enabled: false
-    enabled: true
-    route: 'mun_mute'
 
 census:
     enabled: false

locale/tok/pronouns/GrammarTables.vue

@@ -1,36 +1,2 @@
 <template>
-    <section>
-        <h2 class="h4">
-            <Icon v="spell-check"/>
-            <T>pronouns.grammarTable</T><T>quotation.colon</T>
-        </h2>
-
-        <div class="table-responsive">
-            <table class="table table-sm">
-                <thead>
-                <tr>
-                    <th>ona</th>
-                    <th>nimi</th>
-                    <th>ijo</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_subject" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_adjective" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="reflexive" :counter="counter"/></td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </section>
 </template>
-
-<script>
-    export default {
-        props: {
-            selectedPronoun: { required: true },
-            counter: { required: true },
-        }
-    }
-</script>

locale/tok/pronouns/examples.tsv

@@ -1,4 +1,3 @@
 singular	plural	isHonorific
-mi sona, la {pronoun_subject} li pona mute.		FALSE
+pilin mi la {pronoun} li pona mute.		FALSE
-mi lanpan e ilo {pronoun_adjective}.		FALSE
+mi wile e ilo {pi pronoun}.		FALSE
-{pronoun_subject} li toki e: mi {reflexive}.		FALSE

locale/tok/pronouns/morphemes.js

@@ -1,5 +1,3 @@
-export default [
+const MORPHEMES = [
-    'pronoun_subject',
+    'pronoun',
-    'pronoun_adjective',
-    'reflexive',
 ];

locale/tok/pronouns/pronounGroups.tsv

@@ -1,2 +1 @@
 name	pronouns	description
-nimi pu	ona	ona ni li nimi e kulupu ale. jan Sonja li samu e ni.

locale/tok/pronouns/pronouns.tsv

@@ -1,2 +1,2 @@
-key	description	normative	pronoun_subject	pronoun_adjective	reflexive	plural	pluralHonorific	pronounceable	history	thirdForm	smallForm	sourcesInfo
+key	description	normative	pronoun	plural	pluralHonorific	pronounceable	history	thirdForm	smallForm	sourcesInfo
-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.
+ona	nimi ona li ken toki e ijo ale	TRUE	ona	FALSE	FALSE	TRUE

pages/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <Homepage v-if="config.pronouns.enabled"/>
+    <Homepage v-if="config.header"/>
     <Select v-else/>
 </template>
 

routes/pronouns.vue

@@ -198,7 +198,7 @@
                         <LinkedText :text="config.pronouns.mirror.description"/>
                     </div>
                 </li>
-                <li class="list-group-item">
+                <li v-if="config.pronouns.any" class="list-group-item">
                     <p class="h5">
                         <nuxt-link :to="`/${config.pronouns.any}`"><T>pronouns.any.header</T></nuxt-link>
                     </p>