github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2024-09-20 07:39:09 -05:00
Code

Fix translations of month name in attendance summary (#1091)

Browse Source
This commit is contained in:
Mikołaj Pich 2021-01-24 17:21:02 +01:00 committed by GitHub
parent a70ccbb0d0
commit 52d359827e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
View File

@ -1,6 +1,7 @@
package io.github.wulkanowy.utils package io.github.wulkanowy.utils
import android.annotation.SuppressLint import android.annotation.SuppressLint
import java.text.SimpleDateFormat
import java.time.DayOfWeek.FRIDAY import java.time.DayOfWeek.FRIDAY
import java.time.DayOfWeek.MONDAY import java.time.DayOfWeek.MONDAY
import java.time.DayOfWeek.SATURDAY import java.time.DayOfWeek.SATURDAY
@ -8,12 +9,12 @@ import java.time.DayOfWeek.SUNDAY
import java.time.Instant.ofEpochMilli import java.time.Instant.ofEpochMilli
import java.time.LocalDate import java.time.LocalDate
import java.time.LocalDateTime import java.time.LocalDateTime
import java.time.LocalDateTime.now
import java.time.LocalDateTime.ofInstant import java.time.LocalDateTime.ofInstant
import java.time.Month import java.time.Month
import java.time.ZoneId import java.time.ZoneId
import java.time.ZoneOffset import java.time.ZoneOffset
import java.time.format.DateTimeFormatter.ofPattern import java.time.format.DateTimeFormatter.ofPattern
import java.time.format.TextStyle.FULL
import java.time.temporal.TemporalAdjusters.firstInMonth import java.time.temporal.TemporalAdjusters.firstInMonth
import java.time.temporal.TemporalAdjusters.next import java.time.temporal.TemporalAdjusters.next
import java.time.temporal.TemporalAdjusters.previous import java.time.temporal.TemporalAdjusters.previous
@ -33,24 +34,10 @@ fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = for
@SuppressLint("DefaultLocale") @SuppressLint("DefaultLocale")
fun Month.getFormattedName(): String { fun Month.getFormattedName(): String {
return getDisplayName(FULL, Locale.getDefault()) val formatter = SimpleDateFormat("LLLL", Locale.getDefault())
.let {
when (it) { val date = now().withMonth(value)
"stycznia" -> "Styczeń" return formatter.format(date.toInstant(ZoneOffset.UTC).toEpochMilli()).capitalize()
"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()
} }
inline val LocalDate.nextSchoolDay: LocalDate inline val LocalDate.nextSchoolDay: LocalDate

17
app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
View File

@ -50,15 +50,28 @@ class TimeExtensionTest {
fun monthNameTest() { fun monthNameTest() {
Locale.setDefault(Locale.forLanguageTag("PL")) Locale.setDefault(Locale.forLanguageTag("PL"))
assertEquals("Styczeń", JANUARY.getFormattedName()) 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()) 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 @Test
fun weekDayNameTest() { fun weekDayNameTest() {
Locale.setDefault(Locale.forLanguageTag("PL")) Locale.setDefault(Locale.forLanguageTag("PL"))
assertEquals("poniedziałek", of(2018, 10, 1).weekDayName) assertEquals("poniedziałek", of(2018, 10, 1).weekDayName)
Locale.setDefault(Locale.forLanguageTag("EN")) Locale.setDefault(Locale.ENGLISH)
assertEquals("Monday", of(2018, 10, 1).weekDayName) assertEquals("Monday", of(2018, 10, 1).weekDayName)
} }