Mirrors/SnapEnhance
1
0
Fork 0
mirror of https://github.com/rhunk/SnapEnhance.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(app): two letters locale

Browse Source
This commit is contained in:
rhunk
2024-01-04 15:56:27 +01:00
parent 49bc15cf1b
commit d1c4b4febe
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/kotlin/me/rhunk/snapenhance/common/bridge/types/LocalePair.kt
View File

@ -1,6 +1,16 @@
package me.rhunk.snapenhance.common.bridge.types
import java.util.Locale
data class LocalePair(
val locale: String,
val content: String
)
) {
fun getLocale(): Locale {
if (locale.contains("_")) {
val split = locale.split("_")
return Locale(split[0], split[1])
}
return Locale(locale)
}
}

6
common/src/main/kotlin/me/rhunk/snapenhance/common/bridge/wrapper/LocaleWrapper.kt
View File

@ -19,7 +19,7 @@ class LocaleWrapper {
if (locale == DEFAULT_LOCALE) return locales
val compatibleLocale = context.resources.assets.list("lang")?.firstOrNull { it.startsWith(locale) }?.substring(0, 5) ?: return locales
val compatibleLocale = context.resources.assets.list("lang")?.firstOrNull { it.startsWith(locale) }?.substringBefore(".") ?: return locales
context.resources.assets.open("lang/$compatibleLocale.json").use { inputStream ->
locales.add(LocalePair(compatibleLocale, inputStream.bufferedReader().use { it.readText() }))
@ -29,7 +29,7 @@ class LocaleWrapper {
}
fun fetchAvailableLocales(context: Context): List<String> {
return context.resources.assets.list("lang")?.map { it.substring(0, 5) } ?: listOf()
return context.resources.assets.list("lang")?.map { it.substringBefore(".") }?.sorted() ?: listOf(DEFAULT_LOCALE)
}
}
@ -40,7 +40,7 @@ class LocaleWrapper {
lateinit var loadedLocale: Locale
private fun load(localePair: LocalePair) {
loadedLocale = localePair.locale.let { Locale(it.substring(0, 2), it.substring(3, 5)) }
loadedLocale = localePair.getLocale()
val translations = JsonParser.parseString(localePair.content).asJsonObject
if (translations == null || translations.isJsonNull) {