diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailActivity.kt
index 96bab44f..308181fd 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailActivity.kt
@@ -424,7 +424,7 @@ internal fun Context.resolveGiftDetailText(text: GiftDetailText): String = when
Key.UNDELIVERABLE_LABEL -> R.string.gift_inbox_undeliverable
Key.UNDELIVERABLE_TITLE -> R.string.gift_detail_undeliverable_title
Key.UNDELIVERABLE_BODY -> R.string.gift_detail_undeliverable_body
- Key.CANCELED_LABEL -> R.string.gift_inbox_canceled
+ Key.CANCELED_LABEL -> R.string.gift_detail_canceled_header
Key.CANCELED_TITLE -> R.string.gift_detail_canceled_title
Key.CANCELED_BODY -> R.string.gift_detail_canceled_body
Key.DISPOSAL_NON_RETURN_GUIDANCE -> R.string.gift_detail_disposal_guidance
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 8b023e3f..c7230370 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -15,7 +15,7 @@
Your gift request has been canceled.
Register tracking
Request date
- Ship to
+ Receiving mailbox
Courier
Select a courier
Tracking number
@@ -45,7 +45,7 @@
Creator
Request received
Gift information
- Other member
+ Creator
Request number
Cans used
%1$d Cans
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 5240ff03..1ca95236 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -15,7 +15,7 @@
ギフトの申請がキャンセルされました。
追跡情報の登録
申請日
- 発送先
+ 受取私書箱
配送会社
配送会社を選択
追跡番号
@@ -45,7 +45,7 @@
クリエイター
申請受付
ギフト情報
- 相手のニックネーム
+ クリエイター
申請番号
使用した缶
%1$d缶
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e7ce6eb..10c91e60 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
선물 신청이 취소되었습니다.
운송장 등록
신청일
- 보낼 주소
+ 받는 사서함
택배사
택배사 선택
운송장 번호
@@ -45,7 +45,7 @@
크리에이터
신청 접수
선물 정보
- 상대 닉네임
+ 크리에이터
신청번호
사용한 캔
%1$d캔
diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailViewModelTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailViewModelTest.kt
index f9cfbd8f..f0d2c327 100644
--- a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailViewModelTest.kt
+++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftDetailViewModelTest.kt
@@ -273,12 +273,19 @@ class GiftDetailViewModelTest {
setLocale(Locale.KOREAN)
}
)
- listOf(Locale.KOREAN, Locale.ENGLISH, Locale.JAPANESE).forEach { locale ->
+ mapOf(
+ Locale.KOREAN to Triple("크리에이터", "취소 완료", "받는 사서함"),
+ Locale.ENGLISH to Triple("Creator", "Cancellation complete", "Receiving mailbox"),
+ Locale.JAPANESE to Triple("クリエイター", "キャンセル完了", "受取私書箱")
+ ).forEach { (locale, expected) ->
val localized = context.createConfigurationContext(
Configuration(context.resources.configuration).apply {
setLocale(locale)
}
)
+ assertEquals(expected.first, localized.getString(R.string.gift_detail_counterpart))
+ assertEquals(expected.second, localized.resolveGiftDetailText(GiftDetailText.Key.CANCELED_LABEL))
+ assertEquals(expected.third, localized.getString(R.string.gift_tracking_destination))
GiftDetailText.Key.entries.forEach { key ->
val text = localized.resolveGiftDetailText(key)
assertTrue(text.isNotBlank())