Replace remaining Android-specific strings

Also renaming the helper composables so it's a bit easier to find/replace everything
in forks.
This commit is contained in:
arkon
2023-11-18 19:41:33 -05:00
parent 46e734fc8e
commit 0d1bced122
165 changed files with 1179 additions and 1167 deletions

View File

@ -16,7 +16,7 @@ import kotlinx.serialization.json.decodeFromStream
import logcat.LogPriority
import nl.adaptivity.xmlutil.AndroidXmlReader
import nl.adaptivity.xmlutil.serialization.XML
import tachiyomi.core.i18n.localize
import tachiyomi.core.i18n.stringResource
import tachiyomi.core.metadata.comicinfo.COMIC_INFO_FILE
import tachiyomi.core.metadata.comicinfo.ComicInfo
import tachiyomi.core.metadata.comicinfo.copyFromComicInfo
@ -57,7 +57,7 @@ actual class LocalSource(
private val POPULAR_FILTERS = FilterList(OrderBy.Popular(context))
private val LATEST_FILTERS = FilterList(OrderBy.Latest(context))
override val name: String = context.localize(MR.strings.local_source)
override val name: String = context.stringResource(MR.strings.local_source)
override val id: Long = ID
@ -312,9 +312,9 @@ actual class LocalSource(
.map { dir -> File(dir, chapter.url) }
.find { it.exists() }
?.let(Format.Companion::valueOf)
?: throw Exception(context.localize(MR.strings.chapter_not_found))
?: throw Exception(context.stringResource(MR.strings.chapter_not_found))
} catch (e: Format.UnknownFormatException) {
throw Exception(context.localize(MR.strings.local_invalid_format))
throw Exception(context.stringResource(MR.strings.local_invalid_format))
} catch (e: Exception) {
throw e
}

View File

@ -2,12 +2,12 @@ package tachiyomi.source.local.filter
import android.content.Context
import eu.kanade.tachiyomi.source.model.Filter
import tachiyomi.core.i18n.localize
import tachiyomi.core.i18n.stringResource
import tachiyomi.i18n.MR
sealed class OrderBy(context: Context, selection: Selection) : Filter.Sort(
context.localize(MR.strings.local_filter_order_by),
arrayOf(context.localize(MR.strings.title), context.localize(MR.strings.date)),
context.stringResource(MR.strings.local_filter_order_by),
arrayOf(context.stringResource(MR.strings.title), context.stringResource(MR.strings.date)),
selection,
) {
class Popular(context: Context) : OrderBy(context, Selection(0, true))

View File

@ -2,7 +2,7 @@ package tachiyomi.source.local.io
import android.content.Context
import eu.kanade.tachiyomi.util.storage.DiskUtil
import tachiyomi.core.i18n.localize
import tachiyomi.core.i18n.stringResource
import tachiyomi.i18n.MR
import java.io.File
@ -10,7 +10,7 @@ actual class LocalSourceFileSystem(
private val context: Context,
) {
private val baseFolderLocation = "${context.localize(MR.strings.app_name)}${File.separator}local"
private val baseFolderLocation = "${context.stringResource(MR.strings.app_name)}${File.separator}local"
actual fun getBaseDirectories(): Sequence<File> {
return DiskUtil.getExternalStorages(context)