Fix bugs related to invalid locale used for time formatting (#246)

mars885 · Oct 23, 2024 · d8a6be7 · d8a6be7
1 parent 0a582d4
commit d8a6be7
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/common-testing/src/main/java/com/paulrybitskyi/gamedge/common/testing/FakeLocaleProvider.kt b/common-testing/src/main/java/com/paulrybitskyi/gamedge/common/testing/FakeLocaleProvider.kt
@@ -0,0 +1,13 @@
+package com.paulrybitskyi.gamedge.common.testing
+
+import com.paulrybitskyi.gamedge.core.providers.LocaleProvider
+import java.util.Locale
+
+class FakeLocaleProvider(
+    private val locale: Locale = Locale.ENGLISH,
+) : LocaleProvider {
+
+    override fun getLocale(): Locale {
+        return locale
+    }
+}
diff --git a/...rc/main/java/com/paulrybitskyi/gamedge/core/formatters/ArticlePublicationDateFormatter.kt b/...rc/main/java/com/paulrybitskyi/gamedge/core/formatters/ArticlePublicationDateFormatter.kt
@@ -16,6 +16,7 @@
 
 package com.paulrybitskyi.gamedge.core.formatters
 
+import com.paulrybitskyi.gamedge.core.providers.LocaleProvider
 import com.paulrybitskyi.gamedge.core.providers.TimeFormat
 import com.paulrybitskyi.gamedge.core.providers.TimeFormatProvider
 import com.paulrybitskyi.gamedge.core.providers.TimeProvider
@@ -36,6 +37,7 @@ internal class ArticlePublicationDateFormatterImpl @Inject constructor(
     private val relativeDateFormatter: RelativeDateFormatter,
     private val timeProvider: TimeProvider,
     private val timeFormatProvider: TimeFormatProvider,
+    private val localeProvider: LocaleProvider,
 ) : ArticlePublicationDateFormatter {
 
     private companion object {
@@ -68,7 +70,9 @@ internal class ArticlePublicationDateFormatterImpl @Inject constructor(
 
     private fun formatAsAbsoluteDate(dateTime: LocalDateTime): String {
         val pattern = getAbsoluteDatePattern(dateTime)
-        val formattedDate = DateTimeFormatter.ofPattern(pattern).format(dateTime)
+        val formattedDate = DateTimeFormatter
+            .ofPattern(pattern, localeProvider.getLocale())
+            .format(dateTime)
 
         return formattedDate
     }

diff --git a/core/src/main/java/com/paulrybitskyi/gamedge/core/formatters/GameReleaseDateFormatter.kt b/core/src/main/java/com/paulrybitskyi/gamedge/core/formatters/GameReleaseDateFormatter.kt
@@ -20,6 +20,7 @@ import com.paulrybitskyi.gamedge.common.domain.games.entities.Game
 import com.paulrybitskyi.gamedge.common.domain.games.entities.ReleaseDate
 import com.paulrybitskyi.gamedge.common.domain.games.entities.ReleaseDateCategory
 import com.paulrybitskyi.gamedge.core.R
+import com.paulrybitskyi.gamedge.core.providers.LocaleProvider
 import com.paulrybitskyi.gamedge.core.providers.StringProvider
 import com.paulrybitskyi.hiltbinder.BindType
 import java.time.Instant
@@ -36,6 +37,7 @@ interface GameReleaseDateFormatter {
 internal class GameReleaseDateFormatterImpl @Inject constructor(
     private val stringProvider: StringProvider,
     private val relativeDateFormatter: RelativeDateFormatter,
+    private val localeProvider: LocaleProvider,
 ) : GameReleaseDateFormatter {
 
     private companion object {
@@ -76,7 +78,7 @@ internal class GameReleaseDateFormatterImpl @Inject constructor(
     private fun ReleaseDate.formatCompleteDate(): String {
         val releaseLocalDateTime = toLocalDateTime()
         val formattedReleaseDate = DateTimeFormatter
-            .ofPattern(COMPLETE_DATE_FORMATTING_PATTERN)
+            .ofPattern(COMPLETE_DATE_FORMATTING_PATTERN, localeProvider.getLocale())
             .format(releaseLocalDateTime)
 
         return buildString {
@@ -89,7 +91,7 @@ internal class GameReleaseDateFormatterImpl @Inject constructor(
 
     private fun ReleaseDate.formatDaylessDate(): String {
         return DateTimeFormatter
-            .ofPattern(DAYLESS_DATE_FORMATTING_PATTERN)
+            .ofPattern(DAYLESS_DATE_FORMATTING_PATTERN, localeProvider.getLocale())
             .format(toLocalDateTime())
     }
 

diff --git a/core/src/main/java/com/paulrybitskyi/gamedge/core/providers/LocaleProvider.kt b/core/src/main/java/com/paulrybitskyi/gamedge/core/providers/LocaleProvider.kt
@@ -0,0 +1,18 @@
+package com.paulrybitskyi.gamedge.core.providers
+
+import com.paulrybitskyi.hiltbinder.BindType
+import java.util.Locale
+import javax.inject.Inject
+
+interface LocaleProvider {
+    fun getLocale(): Locale
+}
+
+@BindType
+internal class LocaleProviderImpl @Inject constructor() : LocaleProvider {
+
+    override fun getLocale(): Locale {
+        // App only supports the English language
+        return Locale.ENGLISH
+    }
+}
diff --git a/core/src/test/java/com/paulrybitskyi/gamedge/core/ArticlePublicationDateFormatterImplTest.kt b/core/src/test/java/com/paulrybitskyi/gamedge/core/ArticlePublicationDateFormatterImplTest.kt
@@ -17,6 +17,7 @@
 package com.paulrybitskyi.gamedge.core
 
 import com.google.common.truth.Truth.assertThat
+import com.paulrybitskyi.gamedge.common.testing.FakeLocaleProvider
 import com.paulrybitskyi.gamedge.core.formatters.ArticlePublicationDateFormatterImpl
 import com.paulrybitskyi.gamedge.core.formatters.RelativeDateFormatter
 import com.paulrybitskyi.gamedge.core.providers.TimeFormat
@@ -50,6 +51,7 @@ internal class ArticlePublicationDateFormatterImplTest {
             relativeDateFormatter = relativeDateFormatter,
             timeProvider = timeProvider,
             timeFormatProvider = timeFormatProvider,
+            localeProvider = FakeLocaleProvider(),
         )
 
         every { relativeDateFormatter.formatRelativeDate(any()) } returns RELATIVE_DATE