From 82067dfd3a549787147801ccec397ba80c27b449 Mon Sep 17 00:00:00 2001
From: eddie wang <wang8119@gmail.com>
Date: Tue, 29 Apr 2025 00:46:23 +0800
Subject: [PATCH] fix: {aoe} link

---
 i18n/registration/financial-aid.i18n.js | 48 ++++++++++-----
 pages/registration/financial-aid.vue    | 82 ++++++++++++++++++++-----
 2 files changed, 102 insertions(+), 28 deletions(-)

diff --git a/i18n/registration/financial-aid.i18n.js b/i18n/registration/financial-aid.i18n.js
index 2c15b26ec..31b55a39a 100644
--- a/i18n/registration/financial-aid.i18n.js
+++ b/i18n/registration/financial-aid.i18n.js
@@ -61,13 +61,6 @@ export default genI18nMessages({
                 remark: '',
             },
         ],
-        applicationDeadline: 'Timeline',
-        DeadlineContent: [
-            '2025-04-01 23:50 (AoE) Financial aid application opens.',
-            '2025-06-20 23:50 (AoE) Financial aid application closes.',
-            '2025-07-01 23:50 (AoE) Financial aid application review results announcement.',
-            '2025-09-05 18:00 (Taipei Time) Disbursement sessions at PyCon TW.',
-        ],
         applicationHowTo: 'Application Process',
         remarkTitle: 'Remarks',
         remarkContent: [
@@ -90,6 +83,23 @@ export default genI18nMessages({
                 'PyCon Taiwan has a financial aid program to help friends in the community,' +
                 'financially or otherwise, so more people are able to join us in the big event.',
         },
+        info: {
+            applicationDeadline: {
+                title: 'Timeline',
+                description: [
+                    '2025-04-01 23:50 ({aoe0}) Financial aid application opens.',
+                    '2025-06-20 23:50 ({aoe1}) Financial aid application closes.',
+                    '2025-07-01 23:50 ({aoe2}) Financial aid application review results announcement.',
+                    '2025-09-05 18:00 ({taipeiTime}) Disbursement sessions at PyCon TW.',
+                ],
+            },
+        },
+        terms: {
+            aoe0: 'AoE',
+            aoe1: 'AoE',
+            aoe2: 'AoE',
+            taipeiTime: 'Taipei Time',
+        },
     },
     'zh-hant': {
         title: '財務補助說明',
@@ -145,13 +155,6 @@ export default genI18nMessages({
                 remark: '',
             },
         ],
-        applicationDeadline: '受理期限',
-        DeadlineContent: [
-            '2025-04-01 23:50 (AoE) 開始接受財務補助',
-            '2025-06-20 23:50 (AoE) 財務補助申請截止',
-            '2025-07-01 23:50 (AoE) 財務補助審查結果通知',
-            '2025-09-05 18:00 (台北時間) 大會當場支付',
-        ],
         applicationHowTo: '申請流程',
         remarkTitle: '備註',
         remarkContent: [
@@ -173,5 +176,22 @@ export default genI18nMessages({
             description:
                 'PyCon TW 規劃了財務補助方案，希望協助對會議有興趣但由於成本而難以參加的朋友們也能參與這次會議。',
         },
+        info: {
+            applicationDeadline: {
+                title: '受理期限',
+                description: [
+                    '2025-04-01 23:50 ({aoe0}) 開始接受財務補助',
+                    '2025-06-20 23:50 ({aoe1}) 財務補助申請截止',
+                    '2025-07-01 23:50 ({aoe2}) 財務補助審查結果通知',
+                    '2025-09-05 18:00 ({taipeiTime}) 大會當場支付',
+                ],
+            },
+        },
+        terms: {
+            aoe0: 'AoE',
+            aoe1: 'AoE',
+            aoe2: 'AoE',
+            taipeiTime: '台北時間',
+        },
     },
 })
diff --git a/pages/registration/financial-aid.vue b/pages/registration/financial-aid.vue
index ad1f61764..9adfc05ce 100644
--- a/pages/registration/financial-aid.vue
+++ b/pages/registration/financial-aid.vue
@@ -56,21 +56,43 @@
                 </template>
             </two-col-wrapper>
 
-            <two-col-wrapper>
-                <template #default>
-                    <p>{{ $t('applicationDeadline') }}</p>
-                </template>
-                <template #right-col>
-                    <ul class="list-disc">
-                        <li
-                            v-for="(content, i) in $t('DeadlineContent')"
-                            :key="`application_deadline_content_${i}`"
+            <div v-for="(section, i) in info" :key="`cfp.${i}`">
+                <two-col-wrapper>
+                    <div slot="default">
+                        <i18n
+                            :key="`info.${section.tag}.title`"
+                            :path="`info.${section.tag}.title`"
+                            class="title"
+                            tag="p"
                         >
-                            {{ content }}
-                        </li>
-                    </ul>
-                </template>
-            </two-col-wrapper>
+                        </i18n>
+                    </div>
+                    <div slot="right-col">
+                        <i18n
+                            v-for="(description, index) in $t(
+                                `info.${section.tag}.description`,
+                            )"
+                            :key="`info.${section.tag}.description.${index}`"
+                            :path="`info.${section.tag}.description.${index}`"
+                            :tag="`${section.isDescriptionList ? 'li' : 'div'}`"
+                        >
+                            <template
+                                v-for="link in section.links"
+                                :slot="link.slot"
+                            >
+                                <ext-link
+                                    v-if="link.isExternalLink"
+                                    :key="`${link.textKey}.external`"
+                                    :href="link.url"
+                                    highlight
+                                >
+                                    {{ $t(link.textKey) }}
+                                </ext-link>
+                            </template>
+                        </i18n>
+                    </div>
+                </two-col-wrapper>
+            </div>
 
             <two-col-wrapper class="spacing">
                 <template #default>
@@ -140,6 +162,38 @@ export default {
         return {
             applicationHowToZH: ApplicationHowToZH,
             applicationHowToEN: ApplicationHowToEN,
+            info: [
+                {
+                    tag: 'applicationDeadline',
+                    isDescriptionList: true,
+                    links: [
+                        {
+                            slot: 'aoe0',
+                            textKey: 'terms.aoe0',
+                            url: 'https://www.timeanddate.com/worldclock/converter.html?iso=20250401T235000&p1=tz_aoe&p2=241&p3=1440',
+                            isExternalLink: true,
+                        },
+                        {
+                            slot: 'aoe1',
+                            textKey: 'terms.aoe1',
+                            url: 'https://www.timeanddate.com/worldclock/converter.html?iso=20250620T235000&p1=tz_aoe&p2=241&p3=1440',
+                            isExternalLink: true,
+                        },
+                        {
+                            slot: 'aoe2',
+                            textKey: 'terms.aoe2',
+                            url: 'https://www.timeanddate.com/worldclock/converter.html?iso=20250701T235000&p1=tz_aoe&p2=241&p3=1440',
+                            isExternalLink: true,
+                        },
+                        {
+                            slot: 'taipeiTime',
+                            textKey: 'terms.taipeiTime',
+                            url: 'https://www.timeanddate.com/worldclock/converter.html?iso=20250905T180000&p1=tz_aoe&p2=241&p3=1440',
+                            isExternalLink: true,
+                        },
+                    ],
+                },
+            ],
         }
     },
     computed: {