github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove en-GB option since we don't actually localize different English locales

Browse source
This commit is contained in:
arkon 2021-07-02 09:02:28 -04:00
parent 0eadc028b6
commit 0cb042cd93
6 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -30,7 +30,7 @@ android {
minSdkVersion(AndroidConfig.minSdk)
targetSdkVersion(AndroidConfig.targetSdk)
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
versionCode = 64
versionCode = 65
versionName = "0.11.1"
buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")

5
app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
View file

@ -232,6 +232,11 @@ object Migrations {
putString(PreferenceKeys.librarySortingDirection, newSortingDirection.name)
}
}
if (oldVersion < 65) {
if (preferences.lang().get() in listOf("en-US", "en-GB")) {
preferences.lang().set("en")
}
}
return true
}

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
View file

@ -282,7 +282,7 @@ class PreferencesHelper(val context: Context) {
fun downloadNewCategories() = flowPrefs.getStringSet(Keys.downloadNewCategories, emptySet())
fun downloadNewCategoriesExclude() = flowPrefs.getStringSet(Keys.downloadNewCategoriesExclude, emptySet())
fun lang() = prefs.getString(Keys.lang, "")
fun lang() = flowPrefs.getString(Keys.lang, "")
fun defaultCategory() = prefs.getInt(Keys.defaultCategory, -1)

3
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
View file

@ -176,8 +176,7 @@ class SettingsGeneralController : SettingsController() {
"eo",
"es",
"es-419",
"en-US",
"en-GB",
"en",
"fa",
"fi",
"fil",

2
app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt
View file

@ -25,7 +25,7 @@ object LocaleHelper {
/**
* The application's locale. When it's null, the system locale is used.
*/
private var appLocale = getLocaleFromString(preferences.lang())
private var appLocale = getLocaleFromString(preferences.lang().get())
/**
* The currently applied locale. Used to avoid losing the selected language after a non locale