Merge pull request '라이브 룸 일시 포맷에 다국어 설정 적용' (#378) from test into main
Reviewed-on: #378
This commit is contained in:
@@ -70,7 +70,6 @@ import java.time.LocalDateTime
|
|||||||
import java.time.ZoneId
|
import java.time.ZoneId
|
||||||
import java.time.format.DateTimeFormatter
|
import java.time.format.DateTimeFormatter
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
import java.util.Locale
|
|
||||||
import java.util.concurrent.locks.ReentrantReadWriteLock
|
import java.util.concurrent.locks.ReentrantReadWriteLock
|
||||||
import kotlin.concurrent.write
|
import kotlin.concurrent.write
|
||||||
|
|
||||||
@@ -187,8 +186,8 @@ class LiveRoomService(
|
|||||||
.withZoneSameInstant(ZoneId.of(timezone))
|
.withZoneSameInstant(ZoneId.of(timezone))
|
||||||
.format(
|
.format(
|
||||||
DateTimeFormatter
|
DateTimeFormatter
|
||||||
.ofPattern("yyyy년 MM월 dd일 (E) a hh시 mm분")
|
.ofPattern(messageSource.getMessage("live.room.datetime_format", langContext.lang).orEmpty())
|
||||||
.withLocale(Locale.KOREAN)
|
.withLocale(langContext.lang.locale)
|
||||||
)
|
)
|
||||||
|
|
||||||
val beginDateTimeUtc = it.beginDateTime
|
val beginDateTimeUtc = it.beginDateTime
|
||||||
@@ -436,7 +435,11 @@ class LiveRoomService(
|
|||||||
val beginDateTime = room.beginDateTime
|
val beginDateTime = room.beginDateTime
|
||||||
.atZone(ZoneId.of("UTC"))
|
.atZone(ZoneId.of("UTC"))
|
||||||
.withZoneSameInstant(ZoneId.of(timezone))
|
.withZoneSameInstant(ZoneId.of(timezone))
|
||||||
.format(DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a"))
|
.format(
|
||||||
|
DateTimeFormatter
|
||||||
|
.ofPattern(messageSource.getMessage("live.room.datetime_format_detail", langContext.lang).orEmpty())
|
||||||
|
.withLocale(langContext.lang.locale)
|
||||||
|
)
|
||||||
|
|
||||||
val beginDateTimeUtc = room.beginDateTime
|
val beginDateTimeUtc = room.beginDateTime
|
||||||
.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
|
.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
|
||||||
|
|||||||
Reference in New Issue
Block a user