From 764ca0f8923dee9ee319991f5e11689a0566d7b7 Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 3 Dec 2025 17:32:16 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=94=94=EC=98=A4=20=EB=8C=93?= =?UTF-8?q?=EA=B8=80=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 댓글/답글 화면 문구를 ko/en/ja 리소스로 정리했습니다. --- .../comment/AudioContentCommentAdapter.kt | 7 ++-- .../AudioContentCommentListFragment.kt | 8 ++--- .../AudioContentCommentListViewModel.kt | 33 ++++++++++++------- .../AudioContentCommentReplyFragment.kt | 8 ++--- .../AudioContentCommentReplyViewModel.kt | 33 ++++++++++++------- .../fragment_audio_content_comment_list.xml | 6 ++-- .../fragment_audio_content_comment_reply.xml | 4 +-- app/src/main/res/values-en/strings.xml | 8 +++++ app/src/main/res/values-ja/strings.xml | 8 +++++ app/src/main/res/values/strings.xml | 8 +++++ 10 files changed, 84 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt index 6584bc06..7dc9255d 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt @@ -99,9 +99,12 @@ class AudioContentCommentAdapter( binding.tvCommentNickname.text = item.nickname binding.tvWriteReply.text = if (item.replyCount > 0) { - "답글 ${item.replyCount}개" + context.getString( + R.string.audio_content_comment_reply_count_format, + item.replyCount + ) } else { - "답글 쓰기" + context.getString(R.string.audio_content_comment_write_reply) } if ( diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListFragment.kt index f7c7a5f1..497f3d8c 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListFragment.kt @@ -106,9 +106,9 @@ class AudioContentCommentListFragment : BaseFragment get() = _totalCommentCount + private val unknownErrorMessage: String + get() = SodaLiveApplicationHolder.get().getString(R.string.common_error_unknown) + + private val noChangeMessage: String + get() = SodaLiveApplicationHolder.get().getString(R.string.audio_content_comment_no_change) + + private val inputRequiredMessage: String + get() = SodaLiveApplicationHolder.get().getString( + R.string.audio_content_comment_input_required + ) + var page = 1 private var isLast = false private val size = 10 @@ -59,9 +72,7 @@ class AudioContentCommentListViewModel( if (it.message != null) { _toastLiveData.postValue(it.message) } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) + _toastLiveData.postValue(unknownErrorMessage) } if (onFailure != null) { @@ -74,7 +85,7 @@ class AudioContentCommentListViewModel( { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) if (onFailure != null) { onFailure() } @@ -110,16 +121,14 @@ class AudioContentCommentListViewModel( if (it.message != null) { _toastLiveData.postValue(it.message) } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) + _toastLiveData.postValue(unknownErrorMessage) } } }, { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) } ) ) @@ -132,12 +141,12 @@ class AudioContentCommentListViewModel( isActive: Boolean? = null ) { if (comment == null && isActive == null) { - _toastLiveData.postValue("변경사항이 없습니다.") + _toastLiveData.postValue(noChangeMessage) return } if (comment != null && comment.isBlank()) { - _toastLiveData.postValue("내용을 입력하세요") + _toastLiveData.postValue(inputRequiredMessage) return } @@ -169,14 +178,14 @@ class AudioContentCommentListViewModel( isLast = false getCommentList(audioContentId) } else { - val message = it.message ?: "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." + val message = it.message ?: unknownErrorMessage _toastLiveData.postValue(message) } }, { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) } ) ) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentReplyFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentReplyFragment.kt index 9e959104..9adc1fa7 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentReplyFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentReplyFragment.kt @@ -112,9 +112,9 @@ class AudioContentCommentReplyFragment : BaseFragment> get() = _commentList + private val unknownErrorMessage: String + get() = SodaLiveApplicationHolder.get().getString(R.string.common_error_unknown) + + private val noChangeMessage: String + get() = SodaLiveApplicationHolder.get().getString(R.string.audio_content_comment_no_change) + + private val inputRequiredMessage: String + get() = SodaLiveApplicationHolder.get().getString( + R.string.audio_content_comment_input_required + ) + var page = 1 private var isLast = false private val size = 10 @@ -53,9 +66,7 @@ class AudioContentCommentReplyViewModel( if (it.message != null) { _toastLiveData.postValue(it.message) } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) + _toastLiveData.postValue(unknownErrorMessage) } if (onFailure != null) { @@ -68,7 +79,7 @@ class AudioContentCommentReplyViewModel( { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) if (onFailure != null) { onFailure() } @@ -104,16 +115,14 @@ class AudioContentCommentReplyViewModel( if (it.message != null) { _toastLiveData.postValue(it.message) } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) + _toastLiveData.postValue(unknownErrorMessage) } } }, { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) } ) ) @@ -126,12 +135,12 @@ class AudioContentCommentReplyViewModel( isActive: Boolean? = null ) { if (comment == null && isActive == null) { - _toastLiveData.postValue("변경사항이 없습니다.") + _toastLiveData.postValue(noChangeMessage) return } if (comment != null && comment.isBlank()) { - _toastLiveData.postValue("내용을 입력하세요") + _toastLiveData.postValue(inputRequiredMessage) return } @@ -163,14 +172,14 @@ class AudioContentCommentReplyViewModel( isLast = false getCommentReplyList(parentCommentId) } else { - val message = it.message ?: "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." + val message = it.message ?: unknownErrorMessage _toastLiveData.postValue(message) } }, { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) } ) ) diff --git a/app/src/main/res/layout/fragment_audio_content_comment_list.xml b/app/src/main/res/layout/fragment_audio_content_comment_list.xml index 614d29ab..e0b6be3b 100644 --- a/app/src/main/res/layout/fragment_audio_content_comment_list.xml +++ b/app/src/main/res/layout/fragment_audio_content_comment_list.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="댓글" + android:text="@string/screen_audio_content_detail_comment_title" android:textColor="@color/white" android:textSize="14.7sp" app:layout_constraintBottom_toBottomOf="@+id/iv_close" @@ -75,7 +75,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" android:layout_marginHorizontal="13.3dp" - android:text="비밀댓글" + android:text="@string/screen_audio_content_detail_comment_secret" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" android:visibility="gone" @@ -109,7 +109,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_232323_3bb9f1" - android:hint="댓글을 입력해 보세요" + android:hint="@string/screen_audio_content_detail_comment_hint" android:importantForAutofill="no" android:inputType="text|textMultiLine" android:paddingVertical="13.3dp" diff --git a/app/src/main/res/layout/fragment_audio_content_comment_reply.xml b/app/src/main/res/layout/fragment_audio_content_comment_reply.xml index 8162c453..b8d73883 100644 --- a/app/src/main/res/layout/fragment_audio_content_comment_reply.xml +++ b/app/src/main/res/layout/fragment_audio_content_comment_reply.xml @@ -20,7 +20,7 @@ android:drawablePadding="6.7dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center_vertical" - android:text="답글" + android:text="@string/audio_content_comment_reply_title" android:textColor="@color/white" android:textSize="14.7sp" app:drawableStartCompat="@drawable/ic_back" @@ -81,7 +81,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_round_corner_10_232323_3bb9f1" - android:hint="답글을 입력해 보세요" + android:hint="@string/audio_content_comment_reply_input_hint" android:importantForAutofill="no" android:inputType="text" android:paddingVertical="13.3dp" diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 72ad8dbe..9d63ac87 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -889,6 +889,14 @@ Delete playlist Delete \'%1$s\'? Deleted. + Replies + Write a reply + Write a reply + %1$d replies + Delete comment + Delete this comment? + No changes to update. + Enter content. New short content New free content New short content posted in the last two weeks. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fc18eb39..8c71ac3d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -889,6 +889,14 @@ プレイリストを削除 「%1$s」を削除しますか? 削除しました。 + 返信 + 返信を入力してください + 返信を書く + 返信 %1$d件 + コメント削除 + このコメントを削除しますか? + 変更事項がありません。 + 内容を入力してください。 新しい短編 新しい無料コンテンツ 過去2週間に登録された新しい短編です。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1ccba1b5..638fa393 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -888,6 +888,14 @@ 재생목록 삭제 \'%1$s\'을 삭제하시겠습니까? 삭제되었습니다. + 답글 + 답글을 입력해 보세요 + 답글 쓰기 + 답글 %1$d개 + 댓글 삭제 + 삭제하시겠습니까? + 변경사항이 없습니다. + 내용을 입력하세요 새로운 단편 새로운 무료 콘텐츠 ※ 최근 2주간 등록된 새로운 단편 입니다.