diff --git a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/AmSatRepository.kt b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/AmSatRepository.kt index 836ae5ab..19c97bfe 100644 --- a/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/AmSatRepository.kt +++ b/core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/AmSatRepository.kt @@ -199,11 +199,10 @@ class AmSatRepository( /** Build one SatStatus (3 days x 12 slots) per catalog satellite, slotting reports by age. */ private fun buildStatuses(names: List, reports: List, nowSec: Long): List { val byName = reports.groupBy { it.name } - val monthAbbr = arrayOf("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec") val utc = Calendar.getInstance(TimeZone.getTimeZone("UTC")) val labels = (0 until 3).map { d -> utc.timeInMillis = (nowSec - d * 86400L) * 1000 - "${monthAbbr[utc.get(Calendar.MONTH)]} ${utc.get(Calendar.DAY_OF_MONTH)}" + formatDayLabel(utc) } return names.map { name -> val slots = (0 until 36).map { slotIdx -> @@ -228,6 +227,15 @@ class AmSatRepository( } } + private fun formatDayLabel(calendar: Calendar): String { + return if (Locale.getDefault().language == Locale.CHINESE.language) { + "${calendar.get(Calendar.MONTH) + 1}月${calendar.get(Calendar.DAY_OF_MONTH)}日" + } else { + val monthAbbr = arrayOf("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec") + "${monthAbbr[calendar.get(Calendar.MONTH)]} ${calendar.get(Calendar.DAY_OF_MONTH)}" + } + } + private fun toSatReport(r: ApiReport): SatReport { val cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")) cal.timeInMillis = r.reportedTimeUtcSec * 1000 diff --git a/feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusScreen.kt b/feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusScreen.kt index ae7404b4..b301547b 100644 --- a/feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusScreen.kt +++ b/feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusScreen.kt @@ -608,12 +608,16 @@ private fun formatFetchedAt(utcMs: Long): String { val cal = Calendar.getInstance() cal.timeInMillis = utcMs val day = cal.get(Calendar.DAY_OF_MONTH) - val month = MONTH_ABBR[cal.get(Calendar.MONTH)] + val monthIndex = cal.get(Calendar.MONTH) val year = cal.get(Calendar.YEAR) val hh = cal.get(Calendar.HOUR_OF_DAY).toString().padStart(2, '0') val mm = cal.get(Calendar.MINUTE).toString().padStart(2, '0') val ss = cal.get(Calendar.SECOND).toString().padStart(2, '0') - return "$day$month $year - $hh:$mm:$ss" + return if (Locale.getDefault().language == Locale.CHINESE.language) { + "${year}年${monthIndex + 1}月${day}日 - $hh:$mm:$ss" + } else { + "$day${MONTH_ABBR[monthIndex]} $year - $hh:$mm:$ss" + } } private fun formatUtcNowForUpload(utcMs: Long): String { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 34e79ce7..cbeae1aa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] #noinspection UnusedVersionCatalogEntry -appVersionCode = "450" +appVersionCode = "451" #noinspection UnusedVersionCatalogEntry -appVersionName = "4.4.6-ba7opf.6" +appVersionName = "4.4.6-ba7opf.7" #noinspection UnusedVersionCatalogEntry compileSdk = "37" #noinspection UnusedVersionCatalogEntry