admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use separate string for toRelativeString "Today"

Browse Source 
Apparently 0 quantity is ignored for some locales...

(cherry picked from commit 071bad1232)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
This commit is contained in:
arkon
2021-08-15 17:42:31 -04:00
committed by Jobobby04
parent 26e9b45687
commit 2f2352e938
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
+1 -1
View File
@@ -20,9 +20,9 @@ import eu.kanade.tachiyomi.data.library.LibraryUpdateService
import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Target
import eu.kanade.tachiyomi.data.preference.asImmediateFlow
import eu.kanade.tachiyomi.network.NetworkHelper
import eu.kanade.tachiyomi.network.PREF_DOH_ADGUARD
import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE
import eu.kanade.tachiyomi.network.PREF_DOH_GOOGLE
import eu.kanade.tachiyomi.network.PREF_DOH_ADGUARD
import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.SourceManager.Companion.DELEGATED_SOURCES
import eu.kanade.tachiyomi.ui.base.controller.DialogController
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
-1
View File
@@ -22,7 +22,6 @@ import kotlinx.coroutines.flow.launchIn
import java.util.Date
import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values
import androidx.preference.Preference
class SettingsGeneralController : SettingsController() {
app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt
+4 -2
View File
@@ -6,6 +6,7 @@ import java.text.DateFormat
import java.util.Calendar
import java.util.Date
import java.util.TimeZone
import kotlin.math.floor
fun Date.toDateTimestampString(dateFormatter: DateFormat): String {
val date = dateFormatter.format(this)
@@ -106,12 +107,13 @@ fun Date.toRelativeString(
): String {
val now = Date()
val difference = now.time - this.time
val days = difference / MILLISECONDS_IN_DAY
val days = floor(difference / MILLISECONDS_IN_DAY).toInt()
return when {
difference < 0 -> context.getString(R.string.recently)
difference < MILLISECONDS_IN_DAY -> context.getString(R.string.relative_time_today)
difference < MILLISECONDS_IN_DAY.times(range) -> context.resources.getQuantityString(
R.plurals.relative_time,
days.toInt(),
days,
days
)
else -> dateFormat.format(this)