From a21152d2047fcf01fc052eb01dcf2b4c2463c392 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 18 Apr 2025 11:31:05 +0200
Subject: [PATCH] (fix)(english) fix loading of pronouns

---
 locale/ja/pronouns/EnglishTable.vue | 26 ++++++++++-------
 locale/pl/pronouns/EnglishTable.vue | 45 ++++++++---------------------
 locale/ru/pronouns/EnglishTable.vue | 38 ++++--------------------
 locale/ua/pronouns/EnglishTable.vue | 38 ++++--------------------
 pages/english.vue                   |  2 +-
 5 files changed, 41 insertions(+), 108 deletions(-)

diff --git a/locale/ja/pronouns/EnglishTable.vue b/locale/ja/pronouns/EnglishTable.vue
index 5658422ac..efddf851d 100644
--- a/locale/ja/pronouns/EnglishTable.vue
+++ b/locale/ja/pronouns/EnglishTable.vue
@@ -1,10 +1,24 @@
+<script setup lang="ts">
+interface TableRow {
+    pronoun: string;
+    formal?: boolean;
+    romanised: string;
+    ipa: string;
+    meaning: string;
+}
+
+defineProps<{
+    table: TableRow[];
+}>();
+</script>
+
 <template>
     <div class="table-responsive">
         <table class="table text-nowrap">
             <thead>
                 <tr>
                     <th>Japanese</th>
-                    <th v-if="t[0].formal !== undefined">
+                    <th v-if="table[0].formal !== undefined">
                         Formal?
                     </th>
                     <th>Romanised</th>
@@ -13,7 +27,7 @@
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="{ pronoun, formal, romanised, ipa, meaning } in t">
+                <tr v-for="{ pronoun, formal, romanised, ipa, meaning } in table">
                     <th>
                         <LinkedText :text="pronoun" />
                     </th>
@@ -34,11 +48,3 @@
         </table>
     </div>
 </template>
-
-<script>
-export default {
-    props: {
-        t: { required: true },
-    },
-};
-</script>
diff --git a/locale/pl/pronouns/EnglishTable.vue b/locale/pl/pronouns/EnglishTable.vue
index ad8751658..722189bfd 100644
--- a/locale/pl/pronouns/EnglishTable.vue
+++ b/locale/pl/pronouns/EnglishTable.vue
@@ -1,3 +1,14 @@
+<script setup lang="ts">
+import { loadPronouns } from '~/src/data.ts';
+
+defineProps<{
+    table: Record<string, string>;
+}>();
+
+const config = useConfig();
+const pronouns = await loadPronouns(config);
+</script>
+
 <template>
     <div class="table-responsive">
         <table class="table text-nowrap">
@@ -10,7 +21,7 @@
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="(description, pronoun) in t">
+                <tr v-for="(description, pronoun) in table">
                     <th>
                         <nuxt-link :to="`/${pronouns[pronoun].canonicalName}`">
                             {{ pronouns[pronoun].name() }}
@@ -45,35 +56,3 @@
         </table>
     </div>
 </template>
-
-<script>
-import { getPronoun } from '~/src/buildPronoun.ts';
-import { loadPronouns } from '~/src/data.ts';
-import { buildDict } from '~/src/helpers.ts';
-
-export default {
-    props: {
-        t: { required: true },
-    },
-    async setup() {
-        const config = useConfig();
-        const pronounsList = await loadPronouns(config);
-        return {
-            pronounsList,
-        };
-    },
-    data() {
-        const that = this;
-        return {
-            pronouns: buildDict(function* () {
-                for (const name in that.t) {
-                    if (!Object.hasOwn(that.t, name)) {
-                        continue;
-                    }
-                    yield [name, getPronoun(this.pronounsList, name)];
-                }
-            }),
-        };
-    },
-};
-</script>
diff --git a/locale/ru/pronouns/EnglishTable.vue b/locale/ru/pronouns/EnglishTable.vue
index 593e92d4f..d70d323c0 100644
--- a/locale/ru/pronouns/EnglishTable.vue
+++ b/locale/ru/pronouns/EnglishTable.vue
@@ -1,3 +1,9 @@
+<script setup lang="ts">
+defineProps<{
+    table: Record<string, string>;
+}>();
+</script>
+
 <template>
     <div class="table-responsive">
         <table class="table text-nowrap">
@@ -52,35 +58,3 @@
         </table>
     </div>
 </template>
-
-<script>
-import { getPronoun } from '~/src/buildPronoun.ts';
-import { loadPronouns } from '~/src/data.ts';
-import { buildDict } from '~/src/helpers.ts';
-
-export default {
-    props: {
-        t: { required: true },
-    },
-    async setup() {
-        const config = useConfig();
-        const pronounsList = await loadPronouns(config);
-        return {
-            pronounsList,
-        };
-    },
-    data() {
-        const that = this;
-        return {
-            pronouns: buildDict(function* () {
-                for (const name in that.t) {
-                    if (!Object.hasOwn(that.t, name)) {
-                        continue;
-                    }
-                    yield [name, getPronoun(this.pronounsList, name)];
-                }
-            }),
-        };
-    },
-};
-</script>
diff --git a/locale/ua/pronouns/EnglishTable.vue b/locale/ua/pronouns/EnglishTable.vue
index 593e92d4f..d70d323c0 100644
--- a/locale/ua/pronouns/EnglishTable.vue
+++ b/locale/ua/pronouns/EnglishTable.vue
@@ -1,3 +1,9 @@
+<script setup lang="ts">
+defineProps<{
+    table: Record<string, string>;
+}>();
+</script>
+
 <template>
     <div class="table-responsive">
         <table class="table text-nowrap">
@@ -52,35 +58,3 @@
         </table>
     </div>
 </template>
-
-<script>
-import { getPronoun } from '~/src/buildPronoun.ts';
-import { loadPronouns } from '~/src/data.ts';
-import { buildDict } from '~/src/helpers.ts';
-
-export default {
-    props: {
-        t: { required: true },
-    },
-    async setup() {
-        const config = useConfig();
-        const pronounsList = await loadPronouns(config);
-        return {
-            pronounsList,
-        };
-    },
-    data() {
-        const that = this;
-        return {
-            pronouns: buildDict(function* () {
-                for (const name in that.t) {
-                    if (!Object.hasOwn(that.t, name)) {
-                        continue;
-                    }
-                    yield [name, getPronoun(this.pronounsList, name)];
-                }
-            }),
-        };
-    },
-};
-</script>
diff --git a/pages/english.vue b/pages/english.vue
index 138114929..d638b702d 100644
--- a/pages/english.vue
+++ b/pages/english.vue
@@ -48,7 +48,7 @@ const config = useConfig();
             <p v-for="p in pronounGroup.description">
                 <LinkedText :text="p" />
             </p>
-            <EnglishTable v-if="pronounGroup.table" :t="pronounGroup.table" />
+            <EnglishTable v-if="pronounGroup.table" :table="pronounGroup.table" />
         </section>
     </Page>
 </template>