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.
2025-11-04 08:08:55 +01:00 · 2023-06-24 10:38:34 -04:00
parent 2eca8511cb
commit f344831d58
17 changed files with 21 additions and 21 deletions
--- 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,
--- 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))
                }
            }
        },
--- 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 = {
--- 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 = {
--- 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))
            }
        },
    )
--- 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 = {
--- 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 = {
--- 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))
                    }
                },
            )
--- 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))
                            }
                        },
                    )
--- 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))
                }
            },
        )
--- 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 = {
--- 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 = {
--- 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 <T> TriStateListDialog(
                    onValueChanged(included, excluded)
                },
            ) {
-                Text(text = stringResource(android.R.string.ok))
+                Text(text = stringResource(R.string.action_ok))
            }
        },
    )
--- 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))
                }
            }
        },
--- 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 = {
--- 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))
                        }
                    },
                )
--- 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 = {