Skip to content

[Fix/#459] 2학기 교내식당 운영시간 정보 갱신 #460

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 5 commits into from
Sep 13, 2026
Merged

[Fix/#459] 2학기 교내식당 운영시간 정보 갱신 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f1ac7a
[#459] 2학기 교내식당 운영시간 갱신 (학생·도담·기숙사·스낵코너 4개 언어)
Hrepay Sep 12, 2026
8d764ab
[#459] 교직원식당 점심 11:20 정정 및 공간개방 안내 삭제
Hrepay Sep 13, 2026
f877fc9
[#459] 교직원식당 점심 시각 11:30 유지 (공간개방 안내만 삭제)
Hrepay Sep 13, 2026
90139ac
[#459] 식당 정보 시트 배경이 투명해 뒤 화면이 비치는 문제 수정
Hrepay Sep 13, 2026
bfc2841
[#459] 식당 정보 시트 배경을 루트 뷰에 지정해 뒤 화면 비침 해결
Hrepay Sep 13, 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
20 changes: 10 additions & 10 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 @@ -641,32 +641,32 @@

/// "학생회관 3층"
"restaurantInfo.studentRestaurant.location" = "Student Union Building, 3F";
/// "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n14:00~17:00(공간 개방)"
"restaurantInfo.studentRestaurant.time" = "08:00~09:00(1,000-Won Breakfast)\n11:20~14:00(Lunch)\n14:00~17:00(Open Space Hours)";
/// "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n16:00~23:00(도서관 대체열람실)"
"restaurantInfo.studentRestaurant.time" = "08:00~09:00(1,000-Won Breakfast)\n11:20~14:00(Lunch)\n16:00~23:00(Temporary Library Study Room)";
/// "3개 코너 운영\n뚝배기, 덮밥, 양식\n주말 휴무"
"restaurantInfo.studentRestaurant.etc" = "3 Food Stations\nHot Pot(Ttukbaegi-style Meals), Rice Bowls, Western food\nClosed on weekends";
/// "신양관 2층"
"restaurantInfo.dodamRestaurant.location" = "Shinyang Hall, 2F";
/// "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)"
"restaurantInfo.dodamRestaurant.time" = "Weekdays\n11:20~14:00(Lunch)\n17:00~18:30(Dinner)\n\nWeekends\n11:20~13:30(Lunch)";
/// "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n19:30~23:00(도서관 대체열람실)\n\n주말\n11:20~13:30(점심)"
"restaurantInfo.dodamRestaurant.time" = "Weekdays\n11:20~14:00(Lunch)\n17:00~18:30(Dinner)\n19:30~23:00(Temporary Library Study Room)\n\nWeekends\n11:20~13:30(Lunch)";
/// "2개 코너 운영\n일반식, 웰빙코너"
"restaurantInfo.dodamRestaurant.etc" = "2 Food Stations\nStandard Meals, Healthy Meals";
/// "레지던스홀 지하 1층"
"restaurantInfo.dormitoryRestaurant.location" = "Residence Hall, B1";
/// "평일\n11:20~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)"
"restaurantInfo.dormitoryRestaurant.time" = "Weekdays\n11:20~13:50(Lunch)\n17:00~18:30(Dinner)\n\nWeekends\n11:20~13:30(Lunch)\n17:00~18:20(Dinner)";
/// "평일\n11:00~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)"
"restaurantInfo.dormitoryRestaurant.time" = "Weekdays\n11:00~13:50(Lunch)\n17:00~18:30(Dinner)\n\nWeekends\n11:20~13:30(Lunch)\n17:00~18:20(Dinner)";
/// "조식 미운영"
"restaurantInfo.dormitoryRestaurant.etc" = "Breakfast Not Available";
/// "전산관 지하 1층"
"restaurantInfo.facultyRestaurant.location" = "Jeonsan Hall, B1";
/// "11:30~14:00(점심)\n14:00~17:00(공간개방)"
"restaurantInfo.facultyRestaurant.time" = "11:30~14:00(Lunch)\n14:00~17:00(Open Space Hours)";
/// "11:30~14:00(점심)"
"restaurantInfo.facultyRestaurant.time" = "11:30~14:00(Lunch)";
/// "주말 휴무"
"restaurantInfo.facultyRestaurant.etc" = "Closed on weekends";
/// "학생회관 3층"
"restaurantInfo.snackCorner.location" = "Student Union Building, 3F";
/// "11:00~15:30(점심)"
"restaurantInfo.snackCorner.time" = "11:00~15:30(Lunch)";
/// "11:00~15:30(점심)\n16:00~23:00(도서관 대체열람실)"
"restaurantInfo.snackCorner.time" = "11:00~15:30(Lunch)\n16:00~23:00(Temporary Library Study Room)";
/// "분식류, 옛날도시락, 컵밥 등\n주말 휴무"
"restaurantInfo.snackCorner.etc" = "Bunsik(Korean Snacks), Old-school Lunch Box, Cup Rice, etc.\nClosed on weekends";

Expand Down
20 changes: 10 additions & 10 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 @@ -642,32 +642,32 @@

/// "학생회관 3층"
"restaurantInfo.studentRestaurant.location" = "学生会館 3階";
/// "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n14:00~17:00(공간 개방)"
"restaurantInfo.studentRestaurant.time" = "08:00~09:00(千ウォン朝食)\n11:20~14:00(昼食)\n14:00~17:00(スペース開放)";
/// "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n16:00~23:00(도서관 대체열람실)"
"restaurantInfo.studentRestaurant.time" = "08:00~09:00(千ウォン朝食)\n11:20~14:00(昼食)\n16:00~23:00(図書館臨時自習室)";
/// "3개 코너 운영\n뚝배기, 덮밥, 양식\n주말 휴무"
"restaurantInfo.studentRestaurant.etc" = "3つのコーナーを運営\nトゥッペギ料理、丼もの、洋食\n週末休業";
/// "신양관 2층"
"restaurantInfo.dodamRestaurant.location" = "信陽館 2階";
/// "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)"
"restaurantInfo.dodamRestaurant.time" = "平日\n11:20~14:00(昼食)\n17:00~18:30(夕食)\n \n週末\n11:20~13:30(昼食)";
/// "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n19:30~23:00(도서관 대체열람실)\n\n주말\n11:20~13:30(점심)"
"restaurantInfo.dodamRestaurant.time" = "平日\n11:20~14:00(昼食)\n17:00~18:30(夕食)\n19:30~23:00(図書館臨時自習室)\n \n週末\n11:20~13:30(昼食)";
/// "2개 코너 운영\n일반식, 웰빙코너"
"restaurantInfo.dodamRestaurant.etc" = "2つのコーナーを運営\n一般食、ヘルシーメニュー";
/// "레지던스홀 지하 1층"
"restaurantInfo.dormitoryRestaurant.location" = "レジデンスホール 地下1階";
/// "평일\n11:20~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)"
"restaurantInfo.dormitoryRestaurant.time" = "平日\n11:20~13:50(昼食)\n17:00~18:30(夕食)\n \n週末\n11:20~13:30(昼食)\n17:00~18:20(夕食)";
/// "평일\n11:00~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)"
"restaurantInfo.dormitoryRestaurant.time" = "平日\n11:00~13:50(昼食)\n17:00~18:30(夕食)\n \n週末\n11:20~13:30(昼食)\n17:00~18:20(夕食)";
/// "조식 미운영"
"restaurantInfo.dormitoryRestaurant.etc" = "朝食の提供なし";
/// "전산관 지하 1층"
"restaurantInfo.facultyRestaurant.location" = "電算館 地下1階";
/// "11:30~14:00(점심)\n14:00~17:00(공간개방)"
"restaurantInfo.facultyRestaurant.time" = "11:30~14:00(昼食)\n14:00~17:00(スペース開放)";
/// "11:30~14:00(점심)"
"restaurantInfo.facultyRestaurant.time" = "11:30~14:00(昼食)";
/// "주말 휴무"
"restaurantInfo.facultyRestaurant.etc" = "週末休業";
/// "학생회관 3층"
"restaurantInfo.snackCorner.location" = "学生会館 3階";
/// "11:00~15:30(점심)"
"restaurantInfo.snackCorner.time" = "11:00~15:30(昼食)";
/// "11:00~15:30(점심)\n16:00~23:00(도서관 대체열람실)"
"restaurantInfo.snackCorner.time" = "11:00~15:30(昼食)\n16:00~23:00(図書館臨時自習室)";
/// "분식류, 옛날도시락, 컵밥 등\n주말 휴무"
"restaurantInfo.snackCorner.etc" = "粉食類、昔ながらのお弁当、カップご飯など\n週末休業";

Expand Down
20 changes: 10 additions & 10 deletions EATSSU/App/Resources/ko.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,32 +642,32 @@

/// "학생회관 3층"
"restaurantInfo.studentRestaurant.location" = "학생회관 3층";
/// "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n14:00~17:00(공간 개방)"
"restaurantInfo.studentRestaurant.time" = "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n14:00~17:00(공간 개방)";
/// "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n16:00~23:00(도서관 대체열람실)"
"restaurantInfo.studentRestaurant.time" = "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n16:00~23:00(도서관 대체열람실)";
/// "3개 코너 운영\n뚝배기, 덮밥, 양식\n주말 휴무"
"restaurantInfo.studentRestaurant.etc" = "3개 코너 운영\n뚝배기, 덮밥, 양식\n주말 휴무";
/// "신양관 2층"
"restaurantInfo.dodamRestaurant.location" = "신양관 2층";
/// "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)"
"restaurantInfo.dodamRestaurant.time" = "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)";
/// "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n19:30~23:00(도서관 대체열람실)\n\n주말\n11:20~13:30(점심)"
"restaurantInfo.dodamRestaurant.time" = "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n19:30~23:00(도서관 대체열람실)\n\n주말\n11:20~13:30(점심)";
/// "2개 코너 운영\n일반식, 웰빙코너"
"restaurantInfo.dodamRestaurant.etc" = "2개 코너 운영\n일반식, 웰빙코너";
/// "레지던스홀 지하 1층"
"restaurantInfo.dormitoryRestaurant.location" = "레지던스홀 지하 1층";
/// "평일\n11:20~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)"
"restaurantInfo.dormitoryRestaurant.time" = "평일\n11:20~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)";
/// "평일\n11:00~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)"
"restaurantInfo.dormitoryRestaurant.time" = "평일\n11:00~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)";
/// "조식 미운영"
"restaurantInfo.dormitoryRestaurant.etc" = "조식 미운영";
/// "전산관 지하 1층"
"restaurantInfo.facultyRestaurant.location" = "전산관 지하 1층";
/// "11:30~14:00(점심)\n14:00~17:00(공간개방)"
"restaurantInfo.facultyRestaurant.time" = "11:30~14:00(점심)\n14:00~17:00(공간개방)";
/// "11:30~14:00(점심)"
"restaurantInfo.facultyRestaurant.time" = "11:30~14:00(점심)";
/// "주말 휴무"
"restaurantInfo.facultyRestaurant.etc" = "주말 휴무";
/// "학생회관 3층"
"restaurantInfo.snackCorner.location" = "학생회관 3층";
/// "11:00~15:30(점심)"
"restaurantInfo.snackCorner.time" = "11:00~15:30(점심)";
/// "11:00~15:30(점심)\n16:00~23:00(도서관 대체열람실)"
"restaurantInfo.snackCorner.time" = "11:00~15:30(점심)\n16:00~23:00(도서관 대체열람실)";
/// "분식류, 옛날도시락, 컵밥 등\n주말 휴무"
"restaurantInfo.snackCorner.etc" = "분식류, 옛날도시락, 컵밥 등\n주말 휴무";

Expand Down
20 changes: 10 additions & 10 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 @@ -642,32 +642,32 @@

/// "학생회관 3층"
"restaurantInfo.studentRestaurant.location" = "Tòa Student Union, tầng 3";
/// "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n14:00~17:00(공간 개방)"
"restaurantInfo.studentRestaurant.time" = "08:00~09:00(Bữa sáng 1.000 won)\n11:20~14:00(Bữa trưa)\n14:00~17:00(Giờ mở không gian)";
/// "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n16:00~23:00(도서관 대체열람실)"
"restaurantInfo.studentRestaurant.time" = "08:00~09:00(Bữa sáng 1.000 won)\n11:20~14:00(Bữa trưa)\n16:00~23:00(Phòng tự học tạm thời của thư viện)";
/// "3개 코너 운영\n뚝배기, 덮밥, 양식\n주말 휴무"
"restaurantInfo.studentRestaurant.etc" = "3 quầy phục vụ\nMón kiểu ttukbaegi, cơm tô, món Âu\nĐóng cửa cuối tuần";
/// "신양관 2층"
"restaurantInfo.dodamRestaurant.location" = "Tòa Shinyang, tầng 2";
/// "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)"
"restaurantInfo.dodamRestaurant.time" = "Ngày thường\n11:20~14:00(Bữa trưa)\n17:00~18:30(Bữa tối)\n \nCuối tuần\n11:20~13:30(Bữa trưa)";
/// "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n19:30~23:00(도서관 대체열람실)\n\n주말\n11:20~13:30(점심)"
"restaurantInfo.dodamRestaurant.time" = "Ngày thường\n11:20~14:00(Bữa trưa)\n17:00~18:30(Bữa tối)\n19:30~23:00(Phòng tự học tạm thời của thư viện)\n \nCuối tuần\n11:20~13:30(Bữa trưa)";
/// "2개 코너 운영\n일반식, 웰빙코너"
"restaurantInfo.dodamRestaurant.etc" = "2 quầy phục vụ\nSuất ăn thường, suất ăn lành mạnh";
/// "레지던스홀 지하 1층"
"restaurantInfo.dormitoryRestaurant.location" = "Residence Hall, tầng B1";
/// "평일\n11:20~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)"
"restaurantInfo.dormitoryRestaurant.time" = "Ngày thường\n11:20~13:50(Bữa trưa)\n17:00~18:30(Bữa tối)\n \nCuối tuần\n11:20~13:30(Bữa trưa)\n17:00~18:20(Bữa tối)";
/// "평일\n11:00~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)"
"restaurantInfo.dormitoryRestaurant.time" = "Ngày thường\n11:00~13:50(Bữa trưa)\n17:00~18:30(Bữa tối)\n \nCuối tuần\n11:20~13:30(Bữa trưa)\n17:00~18:20(Bữa tối)";
/// "조식 미운영"
"restaurantInfo.dormitoryRestaurant.etc" = "Không phục vụ bữa sáng";
/// "전산관 지하 1층"
"restaurantInfo.facultyRestaurant.location" = "Tòa Jeonsan, tầng B1";
/// "11:30~14:00(점심)\n14:00~17:00(공간개방)"
"restaurantInfo.facultyRestaurant.time" = "11:30~14:00(Bữa trưa)\n14:00~17:00(Giờ mở không gian)";
/// "11:30~14:00(점심)"
"restaurantInfo.facultyRestaurant.time" = "11:30~14:00(Bữa trưa)";
/// "주말 휴무"
"restaurantInfo.facultyRestaurant.etc" = "Đóng cửa cuối tuần";
/// "학생회관 3층"
"restaurantInfo.snackCorner.location" = "Tòa Student Union, tầng 3";
/// "11:00~15:30(점심)"
"restaurantInfo.snackCorner.time" = "11:00~15:30(Bữa trưa)";
/// "11:00~15:30(점심)\n16:00~23:00(도서관 대체열람실)"
"restaurantInfo.snackCorner.time" = "11:00~15:30(Bữa trưa)\n16:00~23:00(Phòng tự học tạm thời của thư viện)";
/// "분식류, 옛날도시락, 컵밥 등\n주말 휴무"
"restaurantInfo.snackCorner.etc" = "Bunsik(đồ ăn vặt Hàn Quốc), cơm hộp kiểu xưa, cơm ly, v.v.\nĐóng cửa cuối tuần";

Expand Down
3 changes: 3 additions & 0 deletions EATSSU/App/Sources/Presentation/Home/ViewController/RestaurantInfoViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ final class RestaurantInfoViewController: BaseViewController {
// MARK: - Functions

override func configureUI() {
// BaseViewController가 viewDidLoad 끝에서 view 배경을 systemBackground로 덮어쓰므로,
// 화면 전체를 덮는 루트 뷰에 흰색을 지정해 시트 뒤 화면이 비치지 않게 한다
restaurantInfoView.backgroundColor = .white
view.addSubview(restaurantInfoView)
}

Expand Down
10 changes: 5 additions & 5 deletions EATSSU/App/Sources/Utility/Literal/TextLiteral.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,11 +1328,11 @@ enum TextLiteral {
]

private static let fallbackTime: [String: String] = [
"studentRestaurant": "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n14:00~17:00(공간 개방)",
"dodamRestaurant": "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)",
"dormitoryRestaurant": "평일\n11:20~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)",
"facultyRestaurant": "11:30~14:00(점심)\n14:00~17:00(공간개방)",
"snackCorner": "11:00~15:30(점심)",
"studentRestaurant": "08:00~09:00(천원의아침밥)\n11:20~14:00(점심)\n16:00~23:00(도서관 대체열람실)",
"dodamRestaurant": "평일\n11:20~14:00(점심)\n17:00~18:30(저녁)\n19:30~23:00(도서관 대체열람실)\n\n주말\n11:20~13:30(점심)",
"dormitoryRestaurant": "평일\n11:00~13:50(점심)\n17:00~18:30(저녁)\n\n주말\n11:20~13:30(점심)\n17:00~18:20(저녁)",
"facultyRestaurant": "11:30~14:00(점심)",
"snackCorner": "11:00~15:30(점심)\n16:00~23:00(도서관 대체열람실)",
]

private static let fallbackEtc: [String: String] = [
Expand Down
Loading