Skip to content

Commit deebbf0

Browse files
authored
Merge pull request #16 from Dawn3901/1.0.17
Add simplified Chinese language support
2 parents e103601 + d1a03d2 commit deebbf0

5 files changed

Lines changed: 1251 additions & 3 deletions

File tree

app/src/main/java/com/example/checklist_interactive/MainActivity.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,14 @@ class MainActivity : ComponentActivity() {
7676
private fun updateLocale(context: Context): Context {
7777
val prefsManager = PreferencesManager(context)
7878
val languageCode = prefsManager.getAppLanguage()
79-
val locale = Locale(languageCode)
80-
Locale.setDefault(locale)
79+
val locale = when {
80+
languageCode.contains("-") -> Locale.forLanguageTag(languageCode) // 处理 "zh-CN"
81+
languageCode.contains("_") -> {
82+
val parts = languageCode.split("_")
83+
if (parts.size > 1) Locale(parts[0], parts[1]) else Locale(languageCode) // 处理 "zh_CN"
84+
}
85+
else -> Locale(languageCode)
86+
}
8187

8288
val config = Configuration(context.resources.configuration)
8389
config.setLocale(locale)

app/src/main/java/com/example/checklist_interactive/ui/settings/SettingsScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,8 @@ fun SettingsScreen(
661661
val languages = listOf(
662662
"en" to stringResource(R.string.language_english),
663663
"de" to stringResource(R.string.language_german),
664-
"es" to stringResource(R.string.language_spanish)
664+
"es" to stringResource(R.string.language_spanish),
665+
"zh-CN" to stringResource(R.string.language_simplified_chinese),
665666
)
666667
var expandedLang by remember { mutableStateOf(false) }
667668
var selectedLang by remember { mutableStateOf(prefsManager.getAppLanguage()) }

app/src/main/res/values-es/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,7 @@
771771
<string name="language_english">Inglés</string>
772772
<string name="language_german">Alemán</string>
773773
<string name="language_spanish">Español</string>
774+
<string name="language_simplified_chinese">Chino Simplificado</string>
774775
<string name="settings_language_restart_message">Idioma guardado. Por favor reinicia la app para aplicar cambios.</string>
775776

776777
<!-- ═══════════════════════════════════════════════════════════════════════ -->

0 commit comments

Comments
 (0)