Skip to content

Commit

Permalink
Merge branch 'main' into feat/2024-staff
Browse files Browse the repository at this point in the history
  • Loading branch information
SivanYeh authored Aug 17, 2024
2 parents ce603df + 7af4dcb commit c4ff059
Show file tree
Hide file tree
Showing 26 changed files with 930 additions and 141 deletions.
13 changes: 13 additions & 0 deletions assets/css/tailwind.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@layer utilities {
.line-clamp-5 {
overflow: hidden;
display: -webkit-box;
line-clamp: 5;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
}
}
8 changes: 5 additions & 3 deletions components/core/header/nav-bar/NavBar.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default genI18nMessages({
panelDiscussion: 'Panel Discussion',
events: 'Events',
overview: 'Overview',
openSpaces: 'Open Spaces',
openSpaces: 'Open Space',
sprints: 'Sprints',
jobListings: 'Job Listings',
registration: 'Tickets',
Expand All @@ -33,7 +33,8 @@ export default genI18nMessages({
accommodation: 'Accommodation',
proposalSystemUrl: 'Proposal System',
codeOfConduct: 'Code of Conduct',
posterSession: 'Call for Poster',
cfpPoster: 'Propose a Poster',
posterSession: 'Poster Session',
},
'zh-hant': {
about: '關於',
Expand Down Expand Up @@ -67,6 +68,7 @@ export default genI18nMessages({
accommodation: '住宿資訊',
proposalSystemUrl: '投稿系統',
codeOfConduct: '行為準則',
posterSession: 'Poster 募集',
cfpPoster: '如何投稿海報',
posterSession: '海報環節',
},
})
3 changes: 2 additions & 1 deletion components/core/header/nav-bar/nav-bar-items.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default Object.freeze({
],
speaking: [
{ i18nKey: 'cfp', value: '/speaking/cfp' },
{ i18nKey: 'posterSession', value: '/speaking/poster-session' },
{ i18nKey: 'cfpPoster', value: '/speaking/cfp-poster' },
{ i18nKey: 'talk', value: '/speaking/talk' },
{ i18nKey: 'tutorial', value: '/speaking/tutorial' },
{ i18nKey: 'recording', value: '/speaking/recording' },
Expand All @@ -18,6 +18,7 @@ export default Object.freeze({
{ i18nKey: 'talks', value: '/conference/talks' },
{ i18nKey: 'tutorials', value: '/conference/tutorials' },
{ i18nKey: 'panelDiscussion', value: '/conference/panel-discussion' },
{ i18nKey: 'posterSession', value: '/conference/poster-session' },
],
events: [
{ i18nKey: 'sprints', value: '/events/sprints' },
Expand Down
2 changes: 2 additions & 0 deletions components/sponsors/SponsorCardCollection.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export default genI18nMessages({
'special-thanks': 'Special Thanks to',
'co-organizer': 'Co-organizer',
organizer: 'Organizer',
'sprint-coorganizer': 'Sprints Co-organizer',
},
'zh-hant': {
diamond: '鑽石級贊助',
Expand All @@ -22,5 +23,6 @@ export default genI18nMessages({
'special-thanks': '特別感謝',
'co-organizer': '協辦單位',
organizer: '主辦單位',
'sprint-coorganizer': '衝刺開發協辦單位',
},
})
27 changes: 26 additions & 1 deletion db.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,31 @@
"logo_url": "https://i.imgur.com/ARxWY48.gif"
}
]
},
{
"level_name": "sprint-coorganizer",
"sponsors": [
{
"name_en_us": "test",
"name_zh_hant": "測試",
"subtitle_en_us": "",
"subtitle_zh_hant": "",
"intro_en_us": "sponsor with empty logo & shouldn't be displayed",
"intro_zh_hant": "",
"website_url": "https://google.com",
"logo_url": ""
},
{
"name_en_us": "test",
"name_zh_hant": "測試",
"subtitle_en_us": "test",
"subtitle_zh_hant": "test",
"intro_en_us": "test",
"intro_zh_hant": "test",
"website_url": "https://google.com",
"logo_url": "https://i.imgur.com/ARxWY48.gif"
}
]
}
]
},
Expand Down Expand Up @@ -1143,7 +1168,7 @@
{
"event_id": 201,
"event_type": "custom",
"title": " Open Spaces",
"title": " Open Space",
"speakers": [],
"begin_time": "2022-09-04T07:45:00Z",
"end_time": "2022-09-04T08:35:00Z",
Expand Down
2 changes: 1 addition & 1 deletion i18n/about/code-of-conduct.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default genI18nMessages({
title: 'Show consideration',
descriptions: [
'Sexual contents in any form are inappropriate in any conference venue, ' +
'including but not limited to talks, open spaces, or social media. Words ' +
'including but not limited to talks, Open Space, or social media. Words ' +
'and actions originated from stereotypes are discouraged. Cell phones should ' +
'be set to silent or a mode that does not annoy others in the conference rooms.',
],
Expand Down
2 changes: 1 addition & 1 deletion i18n/about/history.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export default genI18nMessages({
'Last year, PyCon Taiwan guided attendees back to physical conferences from the virtual world. ' +
'In PyCon Taiwan 2024, we’re taking attendees to Kaohsiung! ' +
'Drawing inspiration from other Python Conferences worldwide, this year’s program ' +
'introduces Poster Sessions to bridge the gap between speakers and attendees. ' +
'introduces Poster Session to bridge the gap between speakers and attendees. ' +
'We aim to foster closer connections through face-to-face discussions, sparking creativity and exchanging ideas.',
},
terms: {
Expand Down
4 changes: 2 additions & 2 deletions i18n/about/index.i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default genI18nMessages({
'and at the same time to meet many friends from various parties in the exchange activities.',
activityDetails: [
'Speeches include: keynote speeches, general speeches, professional courses',
'Activities include: sprint, open space, lightning talk, JobFair, Poster Sessions, PyNight',
'Activities include: sprint, open space, lightning talk, JobFair, Poster Session, PyNight',
],
moreInfo:
'If you want to learn more about each event or want to register for the above events, ' +
Expand Down Expand Up @@ -69,7 +69,7 @@ export default genI18nMessages({
'可以說是非常多元有趣,讓你可以從演講中吸取知識的同時,還能在交流活動中結識許多各方好友。',
activityDetails: [
'演講包括:主題演講、一般演講、專業課程',
'交流活動包括:衝刺開發、開放空間、閃電秀、Poster Sessions、JobFair、PyNight',
'交流活動包括:衝刺開發、開放空間、閃電秀、海報環節、JobFair、PyNight',
],
moreInfo:
'若想要深入了解各活動或是想要報名以上活動,歡迎到議程總覽頁面觀看。',
Expand Down
Loading

0 comments on commit c4ff059

Please sign in to comment.