Skip to content

fix: {aoe} link #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 34 additions & 14 deletions i18n/registration/financial-aid.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand All @@ -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: '財務補助說明',
Expand Down Expand Up @@ -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: [
Expand All @@ -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: '台北時間',
},
},
})
82 changes: 68 additions & 14 deletions pages/registration/financial-aid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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: {
Expand Down