From f344831d5877d1d0a7772b00f498ddfb6e86da04 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 24 Jun 2023 10:38:34 -0400 Subject: [PATCH] Use our own translation for "OK" I missed this in the PR that it came with, but I guess it'll be useful if we go multiplatform. --- .../eu/kanade/presentation/browse/ExtensionDetailsScreen.kt | 2 +- .../presentation/category/components/CategoryDialogs.kt | 6 +++--- .../presentation/history/components/HistoryDialogs.kt | 2 +- .../kanade/presentation/library/DeleteLibraryMangaDialog.kt | 2 +- .../eu/kanade/presentation/manga/ChapterSettingsDialog.kt | 2 +- .../eu/kanade/presentation/manga/components/MangaDialogs.kt | 2 +- .../more/settings/screen/ClearDatabaseScreen.kt | 2 +- .../more/settings/screen/SettingsAdvancedScreen.kt | 2 +- .../more/settings/screen/SettingsBackupScreen.kt | 4 ++-- .../more/settings/screen/SettingsLibraryScreen.kt | 2 +- .../more/settings/widget/EditTextPreferenceWidget.kt | 2 +- .../more/settings/widget/MultiSelectListPreferenceWidget.kt | 2 +- .../presentation/more/settings/widget/TriStateListDialog.kt | 2 +- .../eu/kanade/presentation/track/TrackInfoDialogSelector.kt | 4 ++-- .../java/eu/kanade/presentation/updates/UpdatesDialog.kt | 2 +- .../main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/reader/ReaderPageDialog.kt | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt index 530c31af38..31e103a59d 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt @@ -415,7 +415,7 @@ private fun NsfwWarningDialog( }, confirmButton = { TextButton(onClick = onClickConfirm) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, onDismissRequest = onClickConfirm, diff --git a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt index 27779e6938..ce0f59a7e1 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt @@ -113,7 +113,7 @@ fun CategoryRenameDialog( onDismissRequest() }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -163,7 +163,7 @@ fun CategoryDeleteDialog( onDelete() onDismissRequest() },) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -233,7 +233,7 @@ fun ChangeCategoryDialog( ) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } } }, diff --git a/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialogs.kt b/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialogs.kt index 587151eb45..55cd0aac4d 100644 --- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialogs.kt @@ -91,7 +91,7 @@ fun HistoryDeleteAllDialog( onDelete() onDismissRequest() },) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt index beb231baf6..1f6317a972 100644 --- a/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt @@ -53,7 +53,7 @@ fun DeleteLibraryMangaDialog( ) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, title = { diff --git a/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt index c0d5229999..665906e716 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt @@ -209,7 +209,7 @@ private fun SetAsDefaultDialog( onDismissRequest() }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt index 31abd353eb..9b23e87df7 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt @@ -26,7 +26,7 @@ fun DeleteChaptersDialog( onConfirm() }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, title = { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt index a295a5f85a..54580d96bd 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt @@ -83,7 +83,7 @@ class ClearDatabaseScreen : Screen() { } }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt index cff75a8765..c74437b855 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt @@ -387,7 +387,7 @@ object SettingsAdvancedScreen : SearchableSettings { uriHandler.openUri("https://shizuku.rikka.app/download") }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt index ff52ce1fba..aa6f699ea3 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt @@ -196,7 +196,7 @@ object SettingsBackupScreen : SearchableSettings { onConfirm(flag) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) @@ -249,7 +249,7 @@ object SettingsBackupScreen : SearchableSettings { }, confirmButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt index e009675763..6251574276 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt @@ -373,7 +373,7 @@ object SettingsLibraryScreen : SearchableSettings { }, confirmButton = { TextButton(onClick = { onValueChanged(leadValue, followValue) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/EditTextPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/EditTextPreferenceWidget.kt index 6191206ec6..d5cb689adf 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/EditTextPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/EditTextPreferenceWidget.kt @@ -83,7 +83,7 @@ fun EditTextPreferenceWidget( } }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt index 98b3d7f99f..74ed60e012 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt @@ -96,7 +96,7 @@ fun MultiSelectListPreferenceWidget( isDialogShown = false }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt index 5c810f9e8d..6983e206f0 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt @@ -137,7 +137,7 @@ fun TriStateListDialog( onValueChanged(included, excluded) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) diff --git a/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt index 53c985a6c6..ba2322ad85 100644 --- a/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt +++ b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt @@ -174,7 +174,7 @@ fun TrackDateSelector( Text(text = stringResource(android.R.string.cancel)) } TextButton(onClick = { onConfirm(pickerState.selectedDateMillis!!) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } } } @@ -212,7 +212,7 @@ private fun BaseSelector( Text(text = stringResource(android.R.string.cancel)) } TextButton(onClick = onConfirm) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } } }, diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt index 4a9f4d8626..45e28127e4 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt @@ -22,7 +22,7 @@ fun UpdatesDeleteConfirmationDialog( onConfirm() onDismissRequest() },) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 053e07eb9c..d92a60e749 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -254,7 +254,7 @@ class MainActivity : BaseActivity() { }, confirmButton = { TextButton(onClick = { showChangelog = false }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageDialog.kt index 531d12dbb2..b3b07be2a3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageDialog.kt @@ -89,7 +89,7 @@ private fun SetCoverDialog( }, confirmButton = { TextButton(onClick = onConfirm) { - Text(stringResource(android.R.string.ok)) + Text(stringResource(R.string.action_ok)) } }, dismissButton = {