mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-15 05:27:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove Language class. App's language and hidden languages settings were reset

Browse Source
This commit is contained in:
len
2016-12-26 15:44:59 +01:00
parent 97fa659283
commit 1a3a1db4ff
23 changed files with 66 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/eu/kanade/tachiyomi/util/LocaleHelper.kt
View File

@@ -30,24 +30,21 @@ object LocaleHelper {
/**
* The application's locale. When it's null, the system locale is used.
*/
private var appLocale = getLocaleFromCode(preferences.lang())
private var appLocale = getLocaleFromString(preferences.lang())
/**
* Returns the locale for the value stored in preferences, or null if system language or unknown
* value is selected.
* Returns the locale for the value stored in preferences, or null if it's system language.
*
* @param pref the int value stored in preferences.
* @param pref the string value stored in preferences.
*/
private fun getLocaleFromCode(pref: Int): Locale? {
val code = when(pref) {
1 -> "en"
2 -> "es"
3 -> "it"
4 -> "pt"
else -> return null
fun getLocaleFromString(pref: String): Locale? {
if (pref.isNullOrEmpty()) {
return null
}
return Locale(code)
val parts = pref.split("_", "-")
val lang = parts[0]
val country = parts.getOrNull(1) ?: ""
return Locale(lang, country)
}
/**
@@ -55,8 +52,8 @@ object LocaleHelper {
*
* @param pref the new value stored in preferences.
*/
fun changeLocale(pref: Int) {
appLocale = getLocaleFromCode(pref)
fun changeLocale(pref: String) {
appLocale = getLocaleFromString(pref)
}
/**