diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
index 9bd30e878..d80abbd12 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.utils
 
 import android.annotation.SuppressLint
+import java.text.SimpleDateFormat
 import java.time.DayOfWeek.FRIDAY
 import java.time.DayOfWeek.MONDAY
 import java.time.DayOfWeek.SATURDAY
@@ -8,12 +9,12 @@ import java.time.DayOfWeek.SUNDAY
 import java.time.Instant.ofEpochMilli
 import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.LocalDateTime.now
 import java.time.LocalDateTime.ofInstant
 import java.time.Month
 import java.time.ZoneId
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter.ofPattern
-import java.time.format.TextStyle.FULL
 import java.time.temporal.TemporalAdjusters.firstInMonth
 import java.time.temporal.TemporalAdjusters.next
 import java.time.temporal.TemporalAdjusters.previous
@@ -33,24 +34,10 @@ fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = for
 
 @SuppressLint("DefaultLocale")
 fun Month.getFormattedName(): String {
-    return getDisplayName(FULL, Locale.getDefault())
-        .let {
-            when (it) {
-                "stycznia" -> "Styczeń"
-                "lutego" -> "Luty"
-                "marca" -> "Marzec"
-                "kwietnia" -> "Kwiecień"
-                "maja" -> "Maj"
-                "czerwca" -> "Czerwiec"
-                "lipca" -> "Lipiec"
-                "sierpnia" -> "Sierpień"
-                "września" -> "Wrzesień"
-                "października" -> "Październik"
-                "listopada" -> "Listopad"
-                "grudnia" -> "Grudzień"
-                else -> it
-            }
-        }.capitalize()
+    val formatter = SimpleDateFormat("LLLL", Locale.getDefault())
+
+    val date = now().withMonth(value)
+    return formatter.format(date.toInstant(ZoneOffset.UTC).toEpochMilli()).capitalize()
 }
 
 inline val LocalDate.nextSchoolDay: LocalDate
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
index 3336c0d9d..0ffbf78ec 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
@@ -50,15 +50,28 @@ class TimeExtensionTest {
     fun monthNameTest() {
         Locale.setDefault(Locale.forLanguageTag("PL"))
         assertEquals("Styczeń", JANUARY.getFormattedName())
-        Locale.setDefault(Locale.forLanguageTag("EN"))
+
+        Locale.setDefault(Locale.forLanguageTag("CS"))
+        assertEquals("Leden", JANUARY.getFormattedName())
+
+        Locale.setDefault(Locale.ENGLISH)
         assertEquals("January", JANUARY.getFormattedName())
+
+        Locale.setDefault(Locale.forLanguageTag("DE"))
+        assertEquals("Januar", JANUARY.getFormattedName())
+
+        Locale.setDefault(Locale.forLanguageTag("RU"))
+        assertEquals("Январь", JANUARY.getFormattedName())
+
+        Locale.setDefault(Locale.forLanguageTag("UK"))
+        assertEquals("Січень", JANUARY.getFormattedName())
     }
 
     @Test
     fun weekDayNameTest() {
         Locale.setDefault(Locale.forLanguageTag("PL"))
         assertEquals("poniedziałek", of(2018, 10, 1).weekDayName)
-        Locale.setDefault(Locale.forLanguageTag("EN"))
+        Locale.setDefault(Locale.ENGLISH)
         assertEquals("Monday", of(2018, 10, 1).weekDayName)
     }