diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt
index 4c5fe743..5bb07569 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt
@@ -125,7 +125,7 @@ class LiveRoomDetailFragment(
binding.tvTitle.text = response.title
binding.tvDate.text = response.beginDateTime.convertDateFormat(
from = "yyyy.MM.dd EEE hh:mm a",
- to = "yyyy년 MM월 dd일 (E) a hh시 mm분",
+ to = getString(R.string.screen_live_room_detail_date_format),
inputLocale = Locale.ENGLISH
)
@@ -156,7 +156,7 @@ class LiveRoomDetailFragment(
binding.ivShare2.setOnClickListener { shareRoom(response) }
if (response.channelName.isNullOrBlank()) {
- binding.tvParticipateExpression.setText(R.string.live_reservation_complete)
+ binding.tvParticipateExpression.setText(R.string.screen_live_room_reserver_label)
when {
response.manager.id == SharedPreferenceManager.userId -> {
binding.llStartDelete.visibility = View.VISIBLE
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailViewModel.kt
index 466c5c8d..367a2ddf 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailViewModel.kt
@@ -78,15 +78,20 @@ class LiveRoomDetailViewModel(private val repository: LiveRepository) : BaseView
val shareUrl = Utils.createOneLinkUrl(params = params)
+ val app = SodaLiveApplicationHolder.get()
val message = if (isPrivateRoom) {
- "${SharedPreferenceManager.nickname}님이 귀하를 " +
- "보이스온의 비공개라이브에 초대하였습니다.\n" +
- "※ 라이브 참여: $shareUrl\n" +
- "(입장 비밀번호 : $password)"
+ app.getString(
+ R.string.screen_live_room_share_message_private,
+ SharedPreferenceManager.nickname,
+ shareUrl,
+ password
+ )
} else {
- "${SharedPreferenceManager.nickname}님이 귀하를 " +
- "보이스온의 공개라이브에 초대하였습니다.\n" +
- "※ 라이브 참여: $shareUrl"
+ app.getString(
+ R.string.screen_live_room_share_message_public,
+ SharedPreferenceManager.nickname,
+ shareUrl
+ )
}
onSuccess(message)
diff --git a/app/src/main/res/layout/fragment_live_tag.xml b/app/src/main/res/layout/fragment_live_tag.xml
index d4f94301..d39f11d9 100644
--- a/app/src/main/res/layout/fragment_live_tag.xml
+++ b/app/src/main/res/layout/fragment_live_tag.xml
@@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
- android:text="관심사 선택"
+ android:text="@string/screen_live_tag_title"
android:textColor="@color/white"
android:textSize="18.3sp" />
@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_medium"
- android:text="최대 3개까지 선택 가능합니다."
+ android:text="@string/screen_live_tag_subtitle"
android:textColor="@color/color_777777"
android:textSize="13.3sp" />
@@ -65,7 +65,7 @@
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingVertical="16dp"
- android:text="확인"
+ android:text="@string/screen_live_tag_confirm"
android:textColor="@color/white"
android:textSize="18.3sp" />
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index cd0a2c6d..e6b213e1 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -429,6 +429,10 @@
You can select up to 3.
Confirm
An unknown error occurred. Please try again.
+ yyyy.MM.dd EEE hh:mm a
+ Reserved users
+ %1$s invited you to a private live on VoiceOn.\n\u203b Join: %2$s\n(Password: %3$s)
+ %1$s invited you to a public live on VoiceOn.\n\u203b Join: %2$s
Details
Login
Edit profile
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 650b9115..4fbf30b5 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -429,6 +429,10 @@
最大3つまで選択できます。
確認
不明なエラーが発生しました。もう一度お試しください。
+ yyyy年 MM月 dd日 (E) a hh時 mm分
+ 予約者
+ %1$sさんがVoiceOnの非公開ライブに招待しました。\n※ 参加: %2$s\n(入場パスワード: %3$s)
+ %1$sさんがVoiceOnの公開ライブに招待しました。\n※ 参加: %2$s
詳細
ログイン
プロフィール編集
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cb61fb7b..1e5a79bb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -428,6 +428,10 @@
최대 3개까지 선택 가능합니다.
확인
알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.
+ yyyy년 MM월 dd일 (E) a hh시 mm분
+ 예약자
+ %1$s님이 귀하를 보이스온의 비공개라이브에 초대하였습니다.\n※ 라이브 참여: %2$s\n(입장 비밀번호 : %3$s)
+ %1$s님이 귀하를 보이스온의 공개라이브에 초대하였습니다.\n※ 라이브 참여: %2$s
자세히
LOGIN
프로필 수정