Fix Local and Other lang sources showing up in seperate Other Categories (#6024)

* group LocalSource and Other lang source together

* use better kotlin syntactic sugar

* add lang "other" to local

* remove duplicate LocalSource entries in Browse

* linting

* revert unnecessary linting

was a manually adding change

* Revert previous two commit but not the most recent

This reverts commit 30250f2f82fc5e38a1b30c7b55c445efec23a114
This also reversts commit 359ed5a8cda91577216b593a4138280e971e0126

* better way to avoid duplicate Local Sources

* more linting by plugin

* `""` lang is no longer used anywhere
This commit is contained in:
nicki
2021-10-09 20:31:22 +05:30
committed by GitHub
parent a56997e98c
commit 2d1404d155
3 changed files with 4 additions and 5 deletions

View File

@@ -120,10 +120,9 @@ class SourcePresenter(
val disabledSourceIds = preferences.disabledSources().get()
return sourceManager.getCatalogueSources()
.filter { it.lang in languages }
.filter { it.lang in languages || it.id == LocalSource.ID }
.filterNot { it.id.toString() in disabledSourceIds }
.sortedBy { "(${it.lang}) ${it.name.lowercase()}" } +
sourceManager.get(LocalSource.ID) as LocalSource
.sortedBy { "(${it.lang}) ${it.name.lowercase()}" }
}
companion object {