diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt index bd2e047e..cc78106d 100644 --- a/app/src/main/java/ani/dantotsu/Functions.kt +++ b/app/src/main/java/ani/dantotsu/Functions.kt @@ -994,7 +994,7 @@ fun sinceWhen(media: Media, view: ViewGroup) { if (media.status != "RELEASING" && media.status != "HIATUS") return CoroutineScope(Dispatchers.IO).launch { MangaUpdates().search(media.name ?: media.nameRomaji, media.startDate)?.let { - val latestChapter = MangaUpdates.getLatestChapter(it) + val latestChapter = MangaUpdates.getLatestChapter(view.context, it) val timeSince = (System.currentTimeMillis() - (it.metadata.series.lastUpdated!!.timestamp * 1000)) / 1000 diff --git a/app/src/main/java/ani/dantotsu/connections/bakaupdates/MangaUpdates.kt b/app/src/main/java/ani/dantotsu/connections/bakaupdates/MangaUpdates.kt index 9f24cfe7..83bd7104 100644 --- a/app/src/main/java/ani/dantotsu/connections/bakaupdates/MangaUpdates.kt +++ b/app/src/main/java/ani/dantotsu/connections/bakaupdates/MangaUpdates.kt @@ -1,5 +1,7 @@ package ani.dantotsu.connections.bakaupdates +import android.content.Context +import ani.dantotsu.R import ani.dantotsu.client import ani.dantotsu.connections.anilist.api.FuzzyDate import ani.dantotsu.tryWithSuspend @@ -43,9 +45,14 @@ class MangaUpdates { } companion object { - fun getLatestChapter(results: MangaUpdatesResponse.Results): String { - return results.metadata.series.latestChapter?.toString() - ?: results.record.chapter!!.substringAfterLast("-").trim() + fun getLatestChapter(context: Context, results: MangaUpdatesResponse.Results): String { + return results.metadata.series.latestChapter?.let { + context.getString(R.string.chapter_number, it) + } ?: results.record.chapter!!.substringAfterLast("-").trim().let { chapter -> + chapter.takeIf { + it.toIntOrNull() == null + } ?: context.getString(R.string.chapter_number, chapter.toInt()) + } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f4be17a..7cfb7824 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -503,7 +503,8 @@ Refresh Token : Failed to load Saved Token Refreshing Token Failed Episode %1$d will be released in - Chapter %1$s has been available for + Chapter %1$d + %1$s has been available for %1$d days %2$d hrs %3$d mins %4$d secs Score