Skip to content

[Fix/#468] 축제 안내 문구 번역 추가 및 리뷰 작성 타입 오류 수정 #469

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

Merged
Hrepay merged 2 commits into from
Sep 29, 2026
Merged

[Fix/#468] 축제 안내 문구 번역 추가 및 리뷰 작성 타입 오류 수정 #469

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
f7ef9c2
[#468] 축제 제휴 안내 문구 영어·일본어·베트남어 번역 추가
Hrepay Sep 29, 2026
dab955e
[#468] 리뷰 작성 시 메뉴 수에 따라 리뷰 종류가 바뀌지 않도록 수정
Hrepay Sep 29, 2026
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
2 changes: 2 additions & 0 deletions EATSSU/App/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@
"map.map" = "Map";
/// MainMapView - "전체"
"map.all" = "All";
/// 축제 제휴 안내 말풍선
"map.festivalBannerMessage" = "See 2026 festival partner stores!\nNot valid with other partner deals.";
/// "축제"
"map.festival" = "Festival";
/// NoDepartmentSheetVC - "학과를 입력하고\n나만의 제휴를 확인해보세요!"
Expand Down
2 changes: 2 additions & 0 deletions EATSSU/App/Resources/ja.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@
"map.map" = "マップ";
/// MainMapView - "전체"
"map.all" = "すべて";
/// 축제 제휴 안내 말풍선
"map.festivalBannerMessage" = "2026学園祭の提携店をチェック！\n既存の提携とは併用できません。";
/// "축제"
"map.festival" = "学園祭";
/// NoDepartmentSheetVC - "학과를 입력하고\n나만의 제휴를 확인해보세요!"
Expand Down
2 changes: 2 additions & 0 deletions EATSSU/App/Resources/vi.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@
"map.map" = "Bản đồ";
/// MainMapView - "전체"
"map.all" = "Tất cả";
/// 축제 제휴 안내 말풍선
"map.festivalBannerMessage" = "Xem cửa hàng ưu đãi lễ hội 2026!\nKhông áp dụng cùng ưu đãi khác.";
/// "축제"
"map.festival" = "Lễ hội";
/// NoDepartmentSheetVC - "학과를 입력하고\n나만의 제휴를 확인해보세요!"
Expand Down
20 changes: 12 additions & 8 deletions EATSSU/App/Sources/Presentation/Review/ViewController/SetRateViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,9 @@ final class SetRateViewController: BaseViewController, UINavigationControllerDel
self.selectedList = list
self.validMenuIDList = idList
self.likedStates = Array(repeating: false, count: list.count)

if idList.count == 1 {
self.reviewType = .fixed
self.menuID = idList.first
} else {
self.reviewType = .variable
}

// 리뷰 종류(식단/메뉴)는 init에서 정한다. 메뉴 개수로 바꾸면
// 메뉴가 1개인 식단 리뷰가 메뉴 리뷰로 전송된다

setRateView.menuTableView.reloadData()
}

Expand Down Expand Up @@ -345,6 +340,12 @@ final class SetRateViewController: BaseViewController, UINavigationControllerDel
}
}

/// 제출을 진행하지 못했을 때 다시 제출할 수 있게 되돌린다
private func restoreSubmitState() {
isReviewSubmitted = false
setRateView.nextButton.isEnabled = true
}

/// 리뷰 작성/수정 완료 후 이전 화면
private func moveToReviewVC() {
if let myReviewVC = navigationController?.viewControllers.first(where: { $0 is MyReviewViewController }) as? MyReviewViewController {
Expand Down Expand Up @@ -404,6 +405,7 @@ extension SetRateViewController {
private func sendFixReview() {
guard let reviewId = reviewId else {
showToast(message: TextLiteral.Review.noReviewInfoForFix)
restoreSubmitState()
return
}

Expand Down Expand Up @@ -452,6 +454,7 @@ extension SetRateViewController {
private func sendMealReview() {
guard let mealId = mealID else {
showToast(message: TextLiteral.Review.noMealInfo)
restoreSubmitState()
return
}

Expand Down Expand Up @@ -503,6 +506,7 @@ extension SetRateViewController {
private func sendMenuReview() {
guard let menuId = menuID ?? validMenuIDList.first else {
showToast(message: TextLiteral.Review.noMenuInfo)
restoreSubmitState()
return
}

Expand Down
Loading