From 707dc351badc302acd001a27149448c18a223552 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 1 Dec 2025 12:20:15 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EB=AC=B8=EC=9E=90=EC=97=B4=20=EB=A6=AC=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/live/LiveFragment.kt | 42 +++++++++++-------- app/src/main/res/values-en/strings.xml | 10 +++++ app/src/main/res/values-ja/strings.xml | 10 +++++ app/src/main/res/values/strings.xml | 10 +++++ 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt index d5e1ce18..b4433da7 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt @@ -123,7 +123,7 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl setupView() - message = "라이브를 불러오고 있습니다." + message = getString(R.string.screen_live_loading) viewModel.getLiveMain() } @@ -209,7 +209,7 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl liveRecommendChannelAdapter.clear() liveReservationAdapter.clear() - message = "라이브를 불러오고 있습니다." + message = getString(R.string.screen_live_loading) viewModel.getLiveMain() } @@ -771,23 +771,23 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl LiveCancelDialog( activity = requireActivity(), layoutInflater = layoutInflater, - title = "예약취소", - hint = "취소사유를 입력하세요.", - confirmButtonTitle = "예약취소", + title = getString(R.string.screen_live_cancel_title), + hint = getString(R.string.screen_live_cancel_hint), + confirmButtonTitle = getString(R.string.screen_live_cancel_confirm), confirmButtonClick = { viewModel.cancelLive(roomId, it) { Toast.makeText( requireActivity(), - "예약이 취소되었습니다.", + getString(R.string.screen_live_cancel_success), Toast.LENGTH_LONG ).show() - message = "라이브를 불러오고 있습니다." + message = getString(R.string.screen_live_loading) liveNowAdapter.clear() liveReservationAdapter.clear() viewModel.getLiveMain() } }, - cancelButtonTitle = "닫기", + cancelButtonTitle = getString(R.string.dialog_close), cancelButtonClick = {} ).show(screenWidth) } @@ -795,7 +795,7 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl fun reservationRoom(roomId: Long) { viewModel.getRoomDetail(roomId) { if (it.manager.id == SharedPreferenceManager.userId) { - showToast("내가 만든 라이브는 예약할 수 없습니다.") + showToast(getString(R.string.screen_live_reservation_self_block)) } else { if (it.isPrivateRoom) { LiveRoomPasswordDialog( @@ -815,11 +815,17 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl LivePaymentDialog( activity = requireActivity(), layoutInflater = layoutInflater, - title = "${it.price.moneyFormat()}캔으로 예약", - desc = "'${it.title}' 라이브에 참여하기 위해 결제합니다.", - confirmButtonTitle = "예약하기", + title = getString( + R.string.screen_live_reservation_pay_title, + it.price.moneyFormat() + ), + desc = getString( + R.string.screen_live_reservation_pay_desc, + it.title + ), + confirmButtonTitle = getString(R.string.screen_live_reservation_confirm), confirmButtonClick = { processLiveReservation(roomId) }, - cancelButtonTitle = "취소", + cancelButtonTitle = getString(R.string.cancel), cancelButtonClick = {} ).show(screenWidth) } @@ -924,7 +930,7 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl LivePaymentDialog( activity = requireActivity(), layoutInflater = layoutInflater, - title = "유료 라이브 입장", + title = getString(R.string.live_paid_title), startDateTime = if (hours >= 1) { dateFormat.format(beginDate) } else { @@ -935,19 +941,19 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl } else { null }, - desc = "${it.price}캔을 차감하고\n라이브에 입장 하시겠습니까?", + desc = getString(R.string.live_paid_desc, it.price), desc2 = if (hours >= 1) { - "라이브를 시작한 지 ${hours}시간 ${mins}분이 지났습니다. 라이브에 입장 후 30분 이내에 라이브가 종료될 수도 있습니다." + getString(R.string.live_paid_warning, hours, mins) } else { null }, - confirmButtonTitle = "결제 후 입장", + confirmButtonTitle = getString(R.string.live_paid_confirm), confirmButtonClick = { handler.postDelayed({ viewModel.enterRoom(roomId, onEnterRoomSuccess) }, 300) }, - cancelButtonTitle = "취소", + cancelButtonTitle = getString(R.string.cancel), cancelButtonClick = {} ).show(screenWidth) } diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 39149a9b..f8194c52 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -126,4 +126,14 @@ Messages Text Voice + Loading live rooms… + Cancel reservation + Enter a reason for cancellation. + Cancel reservation + Reservation has been cancelled. + Close + You cannot reserve a live you created. + Reserve with %1$s cans + Pay to join the live \"%1$s\". + Reserve diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8c687f2c..f6322ad3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -126,4 +126,14 @@ メッセージ テキスト ボイス + ライブを読み込み中です。 + 予約キャンセル + キャンセル理由を入力してください。 + 予約をキャンセル + 予約がキャンセルされました。 + 閉じる + 自分が作成したライブは予約できません。 + %1$sCANで予約 + ライブ「%1$s」に参加するために決済します。 + 予約する diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cdf27a81..2aec1c7b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,4 +125,14 @@ 메시지 문자 음성 + 라이브를 불러오고 있습니다. + 예약취소 + 취소사유를 입력하세요. + 예약취소 + 예약이 취소되었습니다. + 닫기 + 내가 만든 라이브는 예약할 수 없습니다. + %1$s캔으로 예약 + \'%1$s\' 라이브에 참여하기 위해 결제합니다. + 예약하기