javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases 5 Wiki Activity

Make default category translatable (#5751)

Browse Source 
* Make default category translatable

* Replace duplicate strings with common one
This commit is contained in:
Andreas
2021-08-20 00:10:43 +02:00
committed by GitHub
parent 90ab04e81d
commit 3670d649b8
12 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
+2 -2
View File
@@ -96,7 +96,7 @@ class SettingsDownloadController : SettingsController() {
}
val dbCategories = db.getCategories().executeAsBlocking()
val categories = listOf(Category.createDefault()) + dbCategories
val categories = listOf(Category.createDefault(context)) + dbCategories
preferenceCategory {
titleRes = R.string.pref_category_auto_download
@@ -228,7 +228,7 @@ class SettingsDownloadController : SettingsController() {
override fun onCreateDialog(savedViewState: Bundle?): Dialog {
val dbCategories = db.getCategories().executeAsBlocking()
val categories = listOf(Category.createDefault()) + dbCategories
val categories = listOf(Category.createDefault(activity!!)) + dbCategories
val items = categories.map { it.name }
var selected = categories
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+1 -1
View File
@@ -103,7 +103,7 @@ class SettingsGeneralController : SettingsController() {
entries = entryValues.map { value ->
val formattedDate = preferences.dateFormat(value.toString()).format(now)
if (value == "") {
"${context.getString(R.string.system_default)} ($formattedDate)"
"${context.getString(R.string.label_default)} ($formattedDate)"
} else {
"$value ($formattedDate)"
}
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
+5 -5
View File
@@ -51,7 +51,7 @@ class SettingsLibraryController : SettingsController() {
titleRes = R.string.pref_category_library
val dbCategories = db.getCategories().executeAsBlocking()
val categories = listOf(Category.createDefault()) + dbCategories
val categories = listOf(Category.createDefault(context)) + dbCategories
preferenceCategory {
titleRes = R.string.pref_category_display
@@ -65,7 +65,7 @@ class SettingsLibraryController : SettingsController() {
fun getColumnValue(value: Int): String {
return if (value == 0) {
context.getString(R.string.default_columns)
context.getString(R.string.label_default)
} else {
value.toString()
}
@@ -313,7 +313,7 @@ class SettingsLibraryController : SettingsController() {
fun onViewCreated(binding: PrefLibraryColumnsBinding) {
with(binding.portraitColumns) {
displayedValues = arrayOf(context.getString(R.string.default_columns)) +
displayedValues = arrayOf(context.getString(R.string.label_default)) +
IntRange(1, 10).map(Int::toString)
value = portrait
@@ -322,7 +322,7 @@ class SettingsLibraryController : SettingsController() {
}
}
with(binding.landscapeColumns) {
displayedValues = arrayOf(context.getString(R.string.default_columns)) +
displayedValues = arrayOf(context.getString(R.string.label_default)) +
IntRange(1, 10).map(Int::toString)
value = landscape
@@ -340,7 +340,7 @@ class SettingsLibraryController : SettingsController() {
override fun onCreateDialog(savedViewState: Bundle?): Dialog {
val dbCategories = db.getCategories().executeAsBlocking()
val categories = listOf(Category.createDefault()) + dbCategories
val categories = listOf(Category.createDefault(activity!!)) + dbCategories
val items = categories.map { it.name }
var selected = categories