Mirrors/SnapEnhance
1
0
Fork 0
mirror of https://github.com/rhunk/SnapEnhance.git synced 2025-05-29 21:10:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix locale format

Browse Source
This commit is contained in:
rhunk 2023-05-17 15:01:43 +02:00
parent 01e7b07e4b
commit 7fe7cbab09
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/src/main/assets/lang/en.json → app/src/main/assets/lang/en_US.json
View File

10
app/src/main/kotlin/me/rhunk/snapenhance/bridge/service/BridgeService.kt
View File

@ -34,7 +34,7 @@ class BridgeService : Service() {
runCatching { runCatching {
this@BridgeService.handleMessage(msg) this@BridgeService.handleMessage(msg)
}.onFailure { }.onFailure {
Logger.xposedLog("Failed to handle message", it) Logger.error("Failed to handle message", it)
} }
} }
}).binder }).binder
@ -77,7 +77,7 @@ class BridgeService : Service() {
} }
} }
else -> Logger.xposedLog("Unknown message type: " + msg.what) else -> Logger.log("Unknown message type: " + msg.what)
} }
} }
@ -105,7 +105,7 @@ class BridgeService : Service() {
reply(MessageLoggerResult(state, message).toMessage(BridgeMessageType.MESSAGE_LOGGER_RESULT.value)) reply(MessageLoggerResult(state, message).toMessage(BridgeMessageType.MESSAGE_LOGGER_RESULT.value))
} }
else -> { else -> {
Logger.xposedLog(Exception("Unknown message logger action: ${msg.action}")) Logger.log(Exception("Unknown message logger action: ${msg.action}"))
} }
} }
@ -113,8 +113,8 @@ class BridgeService : Service() {
} }
private fun handleLocaleRequest(msg: LocaleRequest, reply: (Message) -> Unit) { private fun handleLocaleRequest(msg: LocaleRequest, reply: (Message) -> Unit) {
val deviceLocale = Locale.getDefault().language val deviceLocale = Locale.getDefault().toString()
val compatibleLocale = resources.assets.list("lang")?.find { it.startsWith(deviceLocale) }?.substring(0, 2) ?: "en" val compatibleLocale = resources.assets.list("lang")?.find { it.startsWith(deviceLocale) }?.substring(0, 5) ?: "en_US"
resources.assets.open("lang/$compatibleLocale.json").use { inputStream -> resources.assets.open("lang/$compatibleLocale.json").use { inputStream ->
val json = inputStream.bufferedReader().use { it.readText() } val json = inputStream.bufferedReader().use { it.readText() }