danvics/Handy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(i18n): tray menu shows Simplified Chinese when Traditional Chinese is selected (#901)

Browse source 
The tray locale lookup truncated "zh-TW" to "zh", always hitting
Simplified Chinese. Now tries full locale first, then language prefix,
then English.

Follow-up fix for #796.

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: CJ Pais <cj@cjpais.com>
This commit is contained in:
Brandon Chen 2026-03-01 11:39:14 +08:00 committed by GitHub
parent 86263578dc
commit 2361b8511c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src-tauri/src/tray_i18n.rs
View file

@ -18,18 +18,16 @@ use std::collections::HashMap;
// Include the auto-generated TrayStrings struct and TRANSLATIONS static
include!(concat!(env!("OUT_DIR"), "/tray_translations.rs"));
/// Get the language code from a locale string (e.g., "en-US" -> "en")
fn get_language_code(locale: &str) -> &str {
locale.split(['-', '_']).next().unwrap_or("en")
}
/// Get localized tray menu strings based on the system locale
/// Get localized tray menu strings based on the system locale.
///
/// Lookup order: full locale (e.g. "zh-TW") → language code ("zh") → English.
pub fn get_tray_translations(locale: Option<String>) -> TrayStrings {
let lang = locale.as_deref().map(get_language_code).unwrap_or("en");
let locale_str = locale.as_deref().unwrap_or("en");
let lang_code = locale_str.split(['-', '_']).next().unwrap_or("en");
// Try requested language, fall back to English
TRANSLATIONS
.get(lang)
.get(locale_str)
.or_else(|| TRANSLATIONS.get(lang_code))
.or_else(|| TRANSLATIONS.get("en"))
.cloned()
.expect("English translations must exist")