Skip to content

Commit f191b19

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents a1486b8 + 143c6b9 commit f191b19

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

src/locale/English/translation.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,18 @@ const EnglishTranslation = {
216216
"영어": "English",
217217
"한국어": "Korean",
218218
"일본어": "Japanese",
219+
"교육": "Education",
220+
"데이터 과학": "Data Science",
221+
"라이브러리 / 코어": "Library / Core",
222+
"보안": "Security",
223+
"블록체인": "Blockchain",
224+
"실무": "Work",
225+
"오픈소스 / 커뮤니티": "Open Source / Community",
226+
"웹 서비스": "Web Service",
227+
"인공지능": "Artificial Intelligence",
228+
"일상 / 사회": "Daily life / Society",
229+
"자동화": "Automation",
230+
"컴퓨터 비전": "Computer Vision",
219231
}
220232

221233
export default EnglishTranslation

src/pages/Session/detail.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const SessionDetail: React.FC<{ session: APIPretalxSessions[0] }> = ({ session }
5656
<p>
5757
<TagContainer>
5858
<div style={{ margin: 0 }}>{t('태그')} :</div>
59-
{session.tags.map(tag => <Tag key={tag}>{tag}</Tag>)}
59+
{session.tags.map(tag => <Tag key={tag}>{t(tag)}</Tag>)}
6060
{session.do_not_record && <Tag>{t('녹화 불가')}</Tag>}
6161
</TagContainer>
6262
</p>

src/pages/Session/list.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const SessionItem: React.FC<{ session: APIPretalxSessions[0] }> = ({ session })
2929
<p>{session.abstract}</p>
3030
<SessionSpeakerContainer>by {session.speakers.map((speaker) => <kbd key={speaker.code}>{speaker.name}</kbd>)}</SessionSpeakerContainer>
3131
<TagContainer>
32-
{session.tags.map(tag => <Tag key={tag}>{tag}</Tag>)}
32+
{session.tags.map(tag => <Tag key={tag}>{t(tag)}</Tag>)}
3333
{session.do_not_record && <Tag>{t('녹화 불가')}</Tag>}
3434
</TagContainer>
3535
</SessionItemInfoContainer>
@@ -58,7 +58,7 @@ export const SessionListPage = () => {
5858
<TagFilterBtnContainer>
5959
<div>
6060
{tags.map((tag) => <TagFilterBtn key={tag} onClick={() => setOrUnsetTag(tag)} className={tag === currentTag ? 'selected' : ''}>
61-
{tag}
61+
{t(tag)}
6262
</TagFilterBtn>)}
6363
</div>
6464
</TagFilterBtnContainer>

0 commit comments

Comments
 (0)