Skip to content

Commit

Permalink
Merge branch 'main' into issue438-staff
Browse files Browse the repository at this point in the history
  • Loading branch information
josix committed Aug 26, 2023
2 parents 52b040b + dfc7996 commit 42f56f8
Show file tree
Hide file tree
Showing 42 changed files with 658 additions and 277 deletions.
4 changes: 2 additions & 2 deletions components/core/header/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import HomeIcon from './HomeIcon'
import NavBar from './nav-bar/NavBar'
import NavBarHamburger from './nav-bar/NavBarHamburger'
import ScrollableNavBar from './nav-bar/ScrollableNavBar'
import LocaleSwitch from './locale-switch/LocaleSwitch'
import ScrollableNavBar from './nav-bar/ScrollableNavBar'
export default {
name: 'CoreHeader',
components: {
Expand All @@ -47,7 +47,7 @@ export default {
}
.header__nav-bar {
@apply flex w-full items-center justify-between px-4;
@apply flex w-full items-center justify-between px-2;
pointer-events: auto; /*enable click-through ScrollableNavBar*/
}
.header-container,
Expand Down
3 changes: 2 additions & 1 deletion components/core/header/HomeIcon.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<locale-link
to="/"
class="core-homeIcon flex items-center justify-center py-2 md:px-8"
class="core-homeIcon flex items-center justify-center py-2 md:px-4"
customized
>
<img
Expand Down Expand Up @@ -35,5 +35,6 @@ export default {
<style scoped>
.core-homeIcon {
@apply text-pink-700;
flex-shrink: 0;
}
</style>
1 change: 1 addition & 0 deletions components/core/header/locale-switch/LocaleSwitch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export default {
<style lang="postcss" scoped>
.core-localeSwitch {
@apply font-bold;
flex-shrink: 0;
}
.core-localeSwitch:hover {
@apply text-pink-700;
Expand Down
2 changes: 1 addition & 1 deletion components/core/header/nav-bar/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export default {
'h-full': isLink,
'justify-center': isLink,
'items-center': isLink,
'px-8': isLink,
'px-4': isLink,
'py-2': isLink,
'bg-transparent': !isOnCurrentPath,
'--active': isOnCurrentPath,
Expand Down
2 changes: 1 addition & 1 deletion components/core/header/nav-bar/NavBarItemDropdown.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div
class="relative flex h-full items-center justify-center px-8 text-left"
class="relative flex h-full items-center justify-center px-5 text-left"
@mouseenter="showMenu"
@mouseleave="hideMenu"
>
Expand Down
2 changes: 1 addition & 1 deletion components/core/header/nav-bar/ScrollableNavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export default {
.core-scrollableNavBar,
.core-scrollableNavBar__scroll,
.core-scrollableNavBar__slot {
@apply h-full w-full;
@apply h-full max-w-full;
}
.core-scrollableNavBar__left-arrow,
.core-scrollableNavBar__right-arrow {
Expand Down
2 changes: 1 addition & 1 deletion configs/pageLanding.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const landingButtonConfig = {
path: '/conference/schedule',
textKey: 'checkEvents',
isPrimary: true,
isLarge: true,
isLarge: false,
},
BUY_TICKETS: {
isExternalLink: false,
Expand Down
7 changes: 4 additions & 3 deletions configs/pageTickets.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export const ticketSellingStatus = {
COMING_SOON: 'comingSoon',
SELLING: 'selling',
ENDED: 'ended',
SOLD_OUT: 'soldOut',
}

export const pageLinks = {
Expand Down Expand Up @@ -38,7 +39,7 @@ export const ticketInfoConfig = [
'invitationOfSpeakerNight',
'conferencePass',
],
statusI18nKey: ticketSellingStatus.SELLING,
statusI18nKey: ticketSellingStatus.SOLD_OUT,
link: pageLinks.kktixIndividual2023,
},
{
Expand Down Expand Up @@ -123,7 +124,7 @@ export const ticketInfoConfig = [
'lunchBoxAndDesserts',
'conferencePass',
],
statusI18nKey: ticketSellingStatus.APPLY,
statusI18nKey: ticketSellingStatus.SOLD_OUT,
link: pageLinks.groupBuyCorporateTicketsForm,
},
{
Expand All @@ -138,7 +139,7 @@ export const ticketInfoConfig = [
'lunchBoxAndDesserts',
'conferencePass',
],
statusI18nKey: ticketSellingStatus.SELLING,
statusI18nKey: ticketSellingStatus.SOLD_OUT,
link: pageLinks.kktixReserved2023,
},
]
19 changes: 9 additions & 10 deletions i18n/about/community.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ export default genI18nMessages({
tag: 'tainan',
title: 'Tainan - Tainan.py',
description:
'Joe, who moved to Tainan in 2013, founded Tainan.py. ' +
'Decided to co-organize a gathering with the MOSUT community in Tainan' +
' to become "Tainan.py × MOSUT". ' +
'The gathering is held once a month, usually on weekend afternoons. ' +
'Tainan.py will promote local delicacies, ' +
'so that everyone can enjoy the local flavors.',
'In 2013, Joe founded Tainan.py in Tainan. ' +
'After a pause due to the 2021 pandemic, Jesse joined in 2022, ' +
'revitalizing Tainan.py and establishing a Facebook fan page. ' +
'Meetings now occur twice a year, with occasional gatherings. ' +
"We're actively inviting new members to join and enjoy Tainan's " +
'cuisine while networking.',
},
{
tag: 'kaohsiung',
Expand Down Expand Up @@ -149,10 +149,9 @@ export default genI18nMessages({
tag: 'tainan',
title: '台南 - Tainan.py',
description:
'2013 年搬到台南的 Joe 成立了 Tainan.py。' +
'決定與同在台南的 MOSUT 社群合辦聚會,成為「Tainan.py × MOSUT」。' +
'聚會一個月一次,時間通常會在週末下午, Tainan.py 的中場休息時間,' +
'會推廣台南在地美食,讓大家邊交流邊品嘗在地風味。',
'2013 年 Joe 在台南成立了 Tainan.py' +
'經過 2021 年疫情的停辦,2022 年 Jesse 加入,重啟 Tainan.py,並有了 FB 粉絲專頁。' +
'目前半年一次聚會,偶有不定期聚會,誠招新成員加入,來 Tainan.py 邊交流邊品嘗台南美食吧!',
},
{
tag: 'kaohsiung',
Expand Down
38 changes: 32 additions & 6 deletions i18n/about/history.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ export default genI18nMessages({
'en-us': {
title: 'History of PyCon Taiwan',
pageAbstract:
'This year, in addition to inheriting ten years of community communication experience, ' +
'we have also made some new attempts, such as Podcasts and Young Inspirers sharing sessions. ' +
'It is hoped that the tenth anniversary of PyCon Taiwan can promote exchanges between' +
'the diverse ethnic groups and ignite different sparks.',
'After two years of anticipation, PyCon Taiwan returns to the physical conference for the first time. ' +
'We have invited past chairs and significant guests to participate in video projects, ' +
'celebrating the 11th anniversary of PyCon Taiwan. ' +
'This year also marks the first time we are hosting a Panel Discussion, ' +
'inviting three influential speakers to explore the inspiration and impact of generative AI on Python developers. ' +
'Additionally, we have prepared distinctive conference merchandise. ' +
'We hope PyCon Taiwan will provide participants with an unforgettable learning and networking experience.',
beforePyCon: {
title: 'Before PyCon Taiwan',
pyctw2008: '2008 PyCTW',
Expand Down Expand Up @@ -114,15 +117,29 @@ export default genI18nMessages({
'“Awesome Python Awesome Community” is our view of the “APAC” in PyCon APAC for 2022. ' +
'The Python community is not established overnight.We look forward to meeting with all the Python developers in APAC.',
},
pycon2023: {
title: '2023 “Rebirth”',
content:
'Having overcome the challenges of the pandemic, ' +
'PyCon Taiwan 2023 is poised to guide attendees from the virtual world back to physical conferences. ' +
'Over the past two years, developers have had fewer opportunities for face-to-face interactions. ' +
'This year, we are returning to Academia Sinica to host an in-person annual conference and several offline activities, ' +
'including meetups and sprints. Allowing participants to directly engage with speakers/project hosts, ' +
'once again experiencing the warmth of human interaction. ' +
'Furthermore, we have invited past chairs and Keynote speakers to record documentaries and ' +
'promotional videos and host panel discussions to infuse the Python community with innovative ideas and energy.',
},
terms: {
communityTrack: 'Community Track',
},
},
'zh-hant': {
title: 'PyCon Taiwan 年會歷史',
pageAbstract:
'今年除了傳承十年來的社群交流經驗,我們更做了一些新嘗試,像 Podcast 及 Young Inspirers 分享會。' +
'以期 PyCon Taiwan 十周年能促進不同族群間不一樣的火花。',
'PyCon Taiwan 經歷兩年的等待後,首次回歸實體年會舞台。' +
'我們邀請歷屆主席和重要嘉賓參與影片企劃,一同慶祝 PyCon Taiwan 十一週年,' +
'同時舉辦 Panel Discussion,邀請三位極具影響力的講者,探討生成式 AI 對於 Python 開發者的啟發與影響。' +
'此外,我們也準備了獨具特色的年會周邊紀念品。希望 PyCon Taiwan 能為參與者帶來難忘的學習與交流體驗。',
beforePyCon: {
title: 'PyCon Taiwan 之前',
pyctw2008: '2008 PyCTW',
Expand Down Expand Up @@ -201,6 +218,15 @@ export default genI18nMessages({
'「Awesome Python Awesome Community」是我們給 PyCon APAC 2022 的註解,Python 社群能有今天的規模並非一朝一夕,' +
'期待與 APAC 的 Python 開發者產生火花。',
},
pycon2023: {
title: '2023 重生',
content:
'經歷疫情的挑戰,PyCon Taiwan 2023 將帶著會眾們從虛擬世界重返實體會議。' +
'過去兩年,開發者們面對面交流的機會不如以往。' +
'今年,我們重新回到中研院舉辦實體年會,並搭配數個線下活動 meetup 及 sprints,' +
'讓會眾們能夠直接與講者/專案主持人互動,再次感受人與人之間交流的溫度,' +
'同時也邀請歷屆主席與 Keynote 錄製紀錄片與宣傳片,並舉辦 Panel,為 Python 社群帶來更多創新想法與能量。',
},
terms: {
communityTrack: '社群體驗式議程軌',
},
Expand Down
16 changes: 14 additions & 2 deletions i18n/about/staff.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ export default genI18nMessages({
key: 'program',
teamName: 'Program',
},
{
key: 'pycast',
teamName: 'PyCast',
},
{
key: 'development_web',
teamName: 'Development (web)',
Expand Down Expand Up @@ -68,14 +72,18 @@ export default genI18nMessages({
key: 'photography',
teamName: 'Photography',
},
{
key: 'pycast',
teamName: 'PyCast',
},
{
key: 'reviewer',
teamName: 'Review Committee',
},
],
og: {
title: 'Staff',
description: 'Staff of PyCon APAC 2022',
description: 'Staff of PyCon Taiwan 2023',
},
},
'zh-hant': {
Expand All @@ -93,6 +101,10 @@ export default genI18nMessages({
key: 'program',
teamName: '議程',
},
{
key: 'pycast',
teamName: 'PyCast',
},
{
key: 'development_web',
teamName: '開發(網站)',
Expand Down Expand Up @@ -152,7 +164,7 @@ export default genI18nMessages({
],
og: {
title: '工作人員',
description: 'PyCon APAC 2022 工作人員',
description: 'PyCon Taiwan 2023 工作人員',
},
},
})
2 changes: 2 additions & 0 deletions i18n/conference/panel-discussion.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export default genI18nMessages({
" Let's explore this exciting field together!",
terms: {
note: 'Speech Note',
slido: 'Slido Link',
},
},
'zh-hant': {
Expand All @@ -60,6 +61,7 @@ export default genI18nMessages({
'我們也將探討可能出現的問題與挑戰,例如倫理和數據隱私問題。讓我們一起在這個激動人心的領域探索前行吧!',
terms: {
note: '前往共筆',
slido: '前往 Slido',
},
},
})
24 changes: 11 additions & 13 deletions i18n/events/open-spaces.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,19 @@ export default genI18nMessages({
participate: {
title: 'How to participate',
description:
'It’s pretty easy: Just show up :){br}' +
'Instead of Academia Sinica, this year’s PyCon will be hosted online at Gather Town Service.{br}' +
'Therefore, the Open Space has its dedicated space. ' +
"It's pretty easy: Just show up :){br}" +
'Just find a subject that interests you, greet with the host, and enjoy!',
},
location: {
title: 'Location',
description: 'The open space area at gather town.',
description:
'There will be several tables on the aisles beside R4 (4th floor) and each has a board on it as its topic. ' +
'You can find your interested topic and use the memo to write down your thoughts and feedbacks. ' +
'If a topic is not listed yet, just write down what you would like to talk about on a non-topic board!',
},
time: {
title: 'Time',
description:
'Main session will be held at day 2 15:45 ~ 16:35, and its okay to be held at anytime during the conference{br}' +
'There can be up to 9 Open Spaces running in parallel. ' +
'There are no other conferences on day 2 (15:45 ~ 16:35) so that you can enjoy the Open Spaces well.',
description: 'Day 1: 12:05-17:10{br}Day 2: 12:05-17:10',
},
subjects: {
title: 'Topics',
Expand Down Expand Up @@ -86,18 +84,18 @@ export default genI18nMessages({
title: '如何參與',
description:
'很簡單:人到場就好了 :){br}' +
'不同於往年舉辦在中研院,本次 PyCon TW 首次在線上 Gather Town 舉辦。' +
'你只需要在 Open Space 區域找到有興趣的主題,友善的與主持人打個招呼,就可以坐下與大家一起參與了。',
'地點位於中研院的人文館,你只需要找到有興趣的主題,友善的與主持人打個招呼,就可以坐下與大家一起參與了。',
},
location: {
title: '活動地點',
description:
'Gather Town 的 Open Space 區域,總共九個開放空間同時舉行',
description: '中研院人文館 四樓側邊長廊 (共有兩側) 的白板區',
},
time: {
title: '活動時間',
description:
'第二天 15:45 ~ 16:35 有獨立時段,鼓勵可優先 Host 於此時段,其他時段亦可發起,將與議程同時進行!{br}',
'總計有超過四個多小時的時間可以讓會眾們盡情享受開放空間中盈滿熱情的交流和討論!{br}' +
'第一天 12:05-17:10{br}' +
'第二天 12:05-17:10',
},
subjects: {
title: '活動主題',
Expand Down
Loading

0 comments on commit 42f56f8

Please sign in to comment.