feat: desktop session follows the app language (#1971)

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-11-02 09:08:48 -05:00
1 parent 55362d68ef
commit b16b67e6c4
6 files changed
+234 -1

No files matched your search

@@ -0,0 +1,64 @@
package com.droiddeck.launcher.session
import java.util.Locale
object DesktopLocale {
const val DEFAULT = "C.UTF-8"
private val regions = mapOf(
"en" to "US", "id" to "ID", "ms" to "MY", "cs" to "CZ", "da" to "DK", "de" to "DE",
"es" to "ES", "fr" to "FR", "it" to "IT", "hu" to "HU", "nl" to "NL", "nb" to "NO",
"pl" to "PL", "pt" to "PT", "ro" to "RO", "fi" to "FI", "sv" to "SE", "vi" to "VN",
"tr" to "TR", "el" to "GR", "bg" to "BG", "ru" to "RU", "uk" to "UA", "ar" to "EG",
"hi" to "IN", "th" to "TH", "ja" to "JP", "ko" to "KR", "zh" to "CN",
)
private val systemRegions = mapOf(
"en" to setOf("US", "GB", "AU", "CA", "IN", "NZ", "IE", "ZA", "SG"),
"fr" to setOf("FR", "CA", "BE", "CH", "LU"),
"de" to setOf("DE", "AT", "CH", "LU"),
"it" to setOf("IT", "CH"),
"nl" to setOf("NL", "BE"),
"pt" to setOf("PT", "BR"),
"sv" to setOf("SE", "FI"),
"ar" to setOf("EG", "SA", "AE", "MA", "DZ", "TN", "JO", "KW", "IQ"),
)
private val traditionalRegions = setOf("TW", "HK", "MO")
fun lang(locale: Locale): String {
val language = when (locale.language) {
"in" -> "id"
"no", "nn" -> "nb"
else -> locale.language
}
val region = when {
language == "es" && SteamLanguage.forLocale(locale) == "latam" ->
locale.country.takeIf { it.length == 2 && it != "US" } ?: "MX"
language == "zh" -> chineseRegion(locale)
locale.country in systemRegions[language].orEmpty() -> locale.country
else -> regions[language] ?: return DEFAULT
}
return "${language}_$region.UTF-8"
}
private fun chineseRegion(locale: Locale): String = when {
locale.script == "Hans" -> "CN"
locale.script == "Hant" -> if (locale.country == "HK") "HK" else "TW"
locale.country == "HK" -> "HK"
locale.country in traditionalRegions -> "TW"
else -> "CN"
}
fun language(locale: Locale): String? {
val lang = lang(locale)
if (lang == DEFAULT) return null
val full = lang.removeSuffix(".UTF-8")
val short = full.substringBefore('_')
return when {
short == "en" -> full
full == "zh_HK" -> "zh_HK:zh_TW:zh"
else -> "$full:$short"
}
}
}
@@ -648,6 +648,10 @@ class SessionService : Service() {
}
if (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP) OfflineMode.apply(this, root)
if (SessionState.mode == MODE_DESKTOP) {
runCatching { com.droiddeck.launcher.runtime.DesktopLanguage.ensure(this, com.droiddeck.launcher.core.AppLanguage.effective(this)) }
.onFailure { Log.w(TAG, "desktop language pack: $it") }
}
val networkLink = LinuxNetworkLinkComponent(this, root)
networkLink.attach(this)
@@ -777,7 +781,13 @@ class SessionService : Service() {
guest.add("USER=root")
guest.add("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games")
guest.add("TERM=xterm-256color")
guest.add("LANG=C.UTF-8")
if (SessionState.mode == MODE_DESKTOP) {
val appLocale = com.droiddeck.launcher.core.AppLanguage.effective(this)
guest.add("LANG=" + DesktopLocale.lang(appLocale))
DesktopLocale.language(appLocale)?.let { guest.add("LANGUAGE=$it") }
} else {
guest.add("LANG=C.UTF-8")
}
guest.add("BL_STEAM_LANGUAGE=" + SteamLanguage.forLocale(
com.droiddeck.launcher.core.AppLanguage.effective(this),
com.droiddeck.launcher.core.AppLanguage.system(this).country,