Replace remaining Android-specific strings

Also renaming the helper composables so it's a bit easier to find/replace everything in forks. (cherry picked from commit 0d1bced1226878336f8156671ae0c224c02f2604) # Conflicts: # app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt # app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt # app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt # app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt # app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt # app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt # app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt # app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt # app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt # app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt # app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt # app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt # app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt # app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt # app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
2023-11-18 19:41:33 -05:00
parent 1eccf9fad8
commit 82098460ff
123 changed files with 708 additions and 701 deletions
@@ -48,7 +48,7 @@ import tachiyomi.core.preference.Preference
 import tachiyomi.core.preference.TriState
 import tachiyomi.core.preference.toggle
 import tachiyomi.presentation.core.components.material.padding
-import tachiyomi.presentation.core.i18n.localize
+import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.theme.header
 import tachiyomi.presentation.core.util.collectAsState

@@ -59,7 +59,7 @@ object SettingsItemsPaddings {

@Composable
 fun HeadingItem(labelRes: StringResource) {
-    HeadingItem(localize(labelRes))
+    HeadingItem(stringResource(labelRes))
 }

@Composable
@@ -5,29 +5,29 @@ import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.platform.LocalContext
 import dev.icerock.moko.resources.PluralsResource
 import dev.icerock.moko.resources.StringResource
-import tachiyomi.core.i18n.localize
-import tachiyomi.core.i18n.localizePlural
+import tachiyomi.core.i18n.pluralStringResource
+import tachiyomi.core.i18n.stringResource

@Composable
@ReadOnlyComposable
-fun localize(resource: StringResource): String {
-    return LocalContext.current.localize(resource)
+fun stringResource(resource: StringResource): String {
+    return LocalContext.current.stringResource(resource)
 }

@Composable
@ReadOnlyComposable
-fun localize(resource: StringResource, vararg args: Any): String {
-    return LocalContext.current.localize(resource, *args)
+fun stringResource(resource: StringResource, vararg args: Any): String {
+    return LocalContext.current.stringResource(resource, *args)
 }

@Composable
@ReadOnlyComposable
-fun localizePlural(resource: PluralsResource, count: Int): String {
-    return LocalContext.current.localizePlural(resource, count)
+fun pluralStringResource(resource: PluralsResource, count: Int): String {
+    return LocalContext.current.pluralStringResource(resource, count)
 }

@Composable
@ReadOnlyComposable
-fun localizePlural(resource: PluralsResource, count: Int, vararg args: Any): String {
-    return LocalContext.current.localizePlural(resource, count, *args)
+fun pluralStringResource(resource: PluralsResource, count: Int, vararg args: Any): String {
+    return LocalContext.current.pluralStringResource(resource, count, *args)
 }
@@ -25,7 +25,7 @@ import dev.icerock.moko.resources.StringResource
 import kotlinx.collections.immutable.ImmutableList
 import tachiyomi.presentation.core.components.ActionButton
 import tachiyomi.presentation.core.components.material.padding
-import tachiyomi.presentation.core.i18n.localize
+import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.secondaryItemAlpha
 import kotlin.random.Random

@@ -42,7 +42,7 @@ fun EmptyScreen(
    actions: ImmutableList<EmptyScreenAction>? = null,
 ) {
    EmptyScreen(
-        message = localize(stringRes),
+        message = stringResource(stringRes),
        modifier = modifier,
        actions = actions,
    )
@@ -89,7 +89,7 @@ fun EmptyScreen(
                actions.fastForEach {
                    ActionButton(
                        modifier = Modifier.weight(1f),
-                        title = localize(it.stringRes),
+                        title = stringResource(it.stringRes),
                        icon = it.icon,
                        onClick = it.onClick,
                    )