Skip to content
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.

Sign up for GitHub

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

[FIX] Credit "2024 봄학기 새터반 택시대제전 이벤트"를 만든 사람들의 순서를 전체 바로 다음에 오도록 수정 #742

Merged
merged 2 commits into from
Feb 22, 2024
Merged

[FIX] Credit "2024 봄학기 새터반 택시대제전 이벤트"를 만든 사람들의 순서를 전체 바로 다음에 오도록 수정 #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
addd06b
Fix: change order of credit
ybmin Feb 21, 2024
c2f6301
Merge branch 'dev' into #741-fix-2024-봄학기-새터반-택시-대제전-credit-순서-변경
kmc7468 Feb 22, 2024
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
10 changes: 5 additions & 5 deletions packages/web/src/components/ModalPopup/ModalCredit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ const ModalCredit = ({
name: t("page_credit.category_all"),
body: <BodyMembers values={members} />,
},
{
key: "2024SpringEvent",
name: t("page_credit.category_2024spring_event"),
body: <BodyMembers values={members2024SpringEvent} />,
},
{
key: "2023FallEvent",
name: t("page_credit.category_2023fall_event"),
Expand All @@ -139,11 +144,6 @@ const ModalCredit = ({
name: t("page_credit.category_2023spring_event"),
body: <BodyMembers values={members2023SpringEvent} />,
},
{
key: "2024SpringEvent",
name: t("page_credit.category_2024spring_event"),
body: <BodyMembers values={members2024SpringEvent} />,
},
],
[t]
);
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/pages/Mypage/langs/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
},
"page_credit": {
"category_all": "All",
"category_2024spring_event": "2024 Spring Freshman Class Taxi Event",
"category_2023fall_event": "2023 Fall Thanksgiving Event",
"category_2023spring_event": "2023 Spring Taxi Ride Verification Event",
"category_2024spring_event": "2024 Spring Freshman Class Taxi Event"
"category_2023spring_event": "2023 Spring Taxi Ride Verification Event"
},
"page_report": {
"inquiry": "If you have inquiries about the report details, please use the 'Contact us' menu.",
Expand Down
5 changes: 2 additions & 3 deletions packages/web/src/pages/Mypage/langs/ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@
},
"page_credit": {
"category_all": "전체",
"category_2024spring_event": "2024 봄학기 새터반 택시 대제전 이벤트",
"category_2024spring_event": "2024 봄학기 새터반 택시대제전 이벤트",
"category_2023fall_event": "2023 가을학기 한가위 송편 이벤트",
"category_2023spring_event": "2023 봄학기 택시 탑승 인증 이벤트",
"category_2024spring_event": "2024 봄학기 새터반 택시대제전"
"category_2023spring_event": "2023 봄학기 택시 탑승 인증 이벤트"
},
"page_report": {
"inquiry": "아래 신고 내역에 대해 문의하고 싶으신 경우 “채널톡 문의하기” 메뉴를 이용해주세요.",
Expand Down
Loading