feat(i18n): localize native tray and app menus

This commit is contained in:
Abeautifulsnow authored and GitHub committed 2026-07-23 19:07:10 +08:00
1 parent b53f700dbe
commit 6115771b34
6 files changed
+219 -15

No files matched your search

Generated
+10
View File
@@ -1841,6 +1841,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sha2 0.10.9", "sha2 0.10.9",
"sys-locale",
"tauri", "tauri",
"tauri-build", "tauri-build",
"tauri-plugin-clipboard-manager", "tauri-plugin-clipboard-manager",
@@ -7871,6 +7872,15 @@ dependencies = [
"syn 2.0.117", "syn 2.0.117",
] ]
[[package]]
name = "sys-locale"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "sysinfo" name = "sysinfo"
version = "0.32.1" version = "0.32.1"
+13
View File
@@ -1,6 +1,7 @@
import { createI18n } from "vue-i18n"; import { createI18n } from "vue-i18n";
import en from "./locales/en"; import en from "./locales/en";
import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage"; import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";
import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
export type Locale = "en" | "es" | "it" | "ja" | "pt-BR" | "zh-CN" | "zh-TW"; export type Locale = "en" | "es" | "it" | "ja" | "pt-BR" | "zh-CN" | "zh-TW";
type LocaleMessages = Record<string, unknown>; type LocaleMessages = Record<string, unknown>;
@@ -87,14 +88,26 @@ export async function loadLocaleMessages(locale: Locale) {
loadedLocales.add(locale); loadedLocales.add(locale);
} }
async function syncLocaleToBackend(locale: Locale) {
if (!isTauriRuntime()) return;
try {
const { invoke } = await import("@tauri-apps/api/core");
await invoke("set_app_locale", { locale });
} catch (error) {
console.warn("[DBX][i18n] failed to sync locale to backend", error);
}
}
export async function loadSavedLocale() { export async function loadSavedLocale() {
await loadLocaleMessages(initialLocale); await loadLocaleMessages(initialLocale);
void syncLocaleToBackend(initialLocale);
} }
export async function setLocale(locale: Locale) { export async function setLocale(locale: Locale) {
await loadLocaleMessages(locale); await loadLocaleMessages(locale);
i18nGlobal.locale.value = locale; i18nGlobal.locale.value = locale;
safeLocalStorageSet("dbx-locale", locale); safeLocalStorageSet("dbx-locale", locale);
void syncLocaleToBackend(locale);
} }
export function currentLocale(): Locale { export function currentLocale(): Locale {
+1
View File
@@ -64,6 +64,7 @@ dbx-core = { path = "../crates/dbx-core", default-features = false }
axum = { version = "0.8", features = ["ws"] } axum = { version = "0.8", features = ["ws"] }
font-kit = "0.14.3" font-kit = "0.14.3"
tauri-plugin-clipboard-manager = "2.3.2" tauri-plugin-clipboard-manager = "2.3.2"
sys-locale = "0.3"
[target.'cfg(target_os = "macos")'.dependencies] [target.'cfg(target_os = "macos")'.dependencies]
objc2 = { version = "0.6.4", default-features = false, features = ["std"] } objc2 = { version = "0.6.4", default-features = false, features = ["std"] }
+8 -1
View File
@@ -8,7 +8,8 @@ use tauri::{AppHandle, Manager, State, Window};
use super::connection::AppState; use super::connection::AppState;
use crate::{ use crate::{
apply_debug_log_level, apply_desktop_settings, hide_main_window_for_close, request_app_close, CloseBehaviorState, apply_debug_log_level, apply_desktop_settings, hide_main_window_for_close, refresh_native_menus, request_app_close,
AppLocaleState, CloseBehaviorState,
}; };
const DEVELOPMENT_OPEN_TABS_STATE_KEY: &str = "development_open_tabs"; const DEVELOPMENT_OPEN_TABS_STATE_KEY: &str = "development_open_tabs";
@@ -57,6 +58,12 @@ pub async fn load_max_agent_turns(state: State<'_, Arc<AppState>>) -> Result<u32
state.storage.load_max_agent_turns().await state.storage.load_max_agent_turns().await
} }
#[tauri::command]
pub fn set_app_locale(app: AppHandle, locale_state: State<'_, AppLocaleState>, locale: String) -> Result<(), String> {
locale_state.set(locale);
refresh_native_menus(&app).map_err(|err| format!("failed to refresh native menus: {err}"))
}
#[tauri::command] #[tauri::command]
pub async fn save_max_agent_turns(state: State<'_, Arc<AppState>>, max_agent_turns: u32) -> Result<(), String> { pub async fn save_max_agent_turns(state: State<'_, Arc<AppState>>, max_agent_turns: u32) -> Result<(), String> {
state.storage.save_max_agent_turns(max_agent_turns).await state.storage.save_max_agent_turns(max_agent_turns).await
+6 -5
View File
@@ -906,12 +906,13 @@ mod tests {
#[cfg(windows)] #[cfg(windows)]
use super::first_windows_command_path; use super::first_windows_command_path;
#[cfg(not(windows))] #[cfg(not(windows))]
use super::{bash_login_script, canonical_runtime_path, NodeRuntimeCandidate}; use super::{bash_login_script, NodeRuntimeCandidate};
use super::{ use super::{
is_mcp_compatible_node_version, mcp_command_for_runtime, mcp_native_binary_path_for, mcp_package, canonical_runtime_path, is_mcp_compatible_node_version, mcp_command_for_runtime, mcp_native_binary_path_for,
normalized_reported_path, npm_cli_candidates, parse_minimum_node_version, parse_node_version, prefer_runtime, mcp_package, normalized_reported_path, npm_cli_candidates, parse_minimum_node_version, parse_node_version,
prefixed_output_path, require_managed_mcp_command, resolve_managed_mcp_command, stdout_after_shell_marker, prefer_runtime, prefixed_output_path, require_managed_mcp_command, resolve_managed_mcp_command,
NodeRuntime, NodeVersion, MCP_MIN_NODE_VERSION_REQUIREMENT, MCP_PACKAGE_NAME, SHELL_COMMAND_MARKER, stdout_after_shell_marker, NodeRuntime, NodeVersion, MCP_MIN_NODE_VERSION_REQUIREMENT, MCP_PACKAGE_NAME,
SHELL_COMMAND_MARKER,
}; };
#[cfg(not(windows))] #[cfg(not(windows))]
use super::{shell_command_script, shell_quote}; use super::{shell_command_script, shell_quote};
+181 -9
View File
@@ -60,6 +60,30 @@ impl CloseBehaviorState {
self.frontend_ready.load(Ordering::Acquire) self.frontend_ready.load(Ordering::Acquire)
} }
} }
/// UI language pushed from the frontend i18n layer; native menus follow it and
/// fall back to the OS locale until the first `set_app_locale` call arrives.
pub struct AppLocaleState {
locale: std::sync::Mutex<Option<String>>,
}
impl AppLocaleState {
fn new() -> Self {
Self { locale: std::sync::Mutex::new(None) }
}
pub(crate) fn set(&self, locale: String) {
*self.locale.lock().unwrap_or_else(|poisoned| poisoned.into_inner()) = Some(locale);
}
fn get(&self) -> String {
self.locale
.lock()
.unwrap_or_else(|poisoned| poisoned.into_inner())
.clone()
.unwrap_or_else(|| sys_locale::get_locale().unwrap_or_default())
}
}
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
const MACOS_TRAY_ICON: tauri::image::Image<'_> = tauri::include_image!("icons/tray-macos-template.png"); const MACOS_TRAY_ICON: tauri::image::Image<'_> = tauri::include_image!("icons/tray-macos-template.png");
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
@@ -144,9 +168,20 @@ fn build_app_menu<R: tauri::Runtime>(app_handle: &tauri::AppHandle<R>) -> tauri:
icon: Some(ABOUT_APP_ICON), icon: Some(ABOUT_APP_ICON),
..Default::default() ..Default::default()
}; };
let copy_support_info_item = let copy_support_info_item = MenuItem::with_id(
MenuItem::with_id(app_handle, APP_MENU_COPY_SUPPORT_INFO_ID, "Copy Support Info", true, None::<&str>)?; app_handle,
let quit_item = MenuItem::with_id(app_handle, APP_MENU_QUIT_ID, format!("Quit {app_name}"), true, Some("Cmd+Q"))?; APP_MENU_COPY_SUPPORT_INFO_ID,
app_menu_copy_support_info_label(&current_app_locale(app_handle)),
true,
None::<&str>,
)?;
let quit_item = MenuItem::with_id(
app_handle,
APP_MENU_QUIT_ID,
app_menu_quit_label(&current_app_locale(app_handle), &app_name),
true,
Some("Cmd+Q"),
)?;
Menu::with_items( Menu::with_items(
app_handle, app_handle,
@@ -484,12 +519,114 @@ fn open_connection_deep_links(app: &tauri::AppHandle, links: Vec<String>) {
show_main_window(app); show_main_window(app);
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum LocaleFamily {
English,
SimplifiedChinese,
TraditionalChinese,
Japanese,
Spanish,
Italian,
Portuguese,
}
// Mirrors the frontend language mapping in apps/desktop/src/i18n/index.ts
// (localeFromLanguageTag) so native menus agree with the UI language.
fn locale_family(locale: &str) -> LocaleFamily {
let normalized = locale.replace('_', "-").to_ascii_lowercase();
let is_language = |language: &str| normalized == language || normalized.starts_with(&format!("{language}-"));
if is_language("zh") {
if normalized.contains("hant")
|| normalized.starts_with("zh-tw")
|| normalized.starts_with("zh-hk")
|| normalized.starts_with("zh-mo")
{
LocaleFamily::TraditionalChinese
} else {
LocaleFamily::SimplifiedChinese
}
} else if is_language("ja") {
LocaleFamily::Japanese
} else if is_language("es") {
LocaleFamily::Spanish
} else if is_language("it") {
LocaleFamily::Italian
} else if is_language("pt") {
LocaleFamily::Portuguese
} else {
LocaleFamily::English
}
}
fn tray_menu_labels_for_locale(locale: &str) -> (&'static str, &'static str) {
match locale_family(locale) {
LocaleFamily::SimplifiedChinese => ("显示 DBX", "退出 DBX"),
LocaleFamily::TraditionalChinese => ("顯示 DBX", "退出 DBX"),
LocaleFamily::Japanese => ("DBXを表示", "DBXを終了"),
LocaleFamily::Spanish => ("Mostrar DBX", "Salir de DBX"),
LocaleFamily::Italian => ("Mostra DBX", "Esci da DBX"),
LocaleFamily::Portuguese => ("Mostrar DBX", "Sair do DBX"),
LocaleFamily::English => ("Show DBX", "Quit DBX"),
}
}
// Matches the frontend supportInfoCopy translations in apps/desktop/src/i18n/locales/*.ts.
#[cfg_attr(not(target_os = "macos"), allow(dead_code))]
fn app_menu_copy_support_info_label(locale: &str) -> &'static str {
match locale_family(locale) {
LocaleFamily::SimplifiedChinese => "复制支持信息",
LocaleFamily::TraditionalChinese => "複製支援資訊",
LocaleFamily::Japanese => "サポート情報をコピー",
LocaleFamily::Spanish => "Copiar información",
LocaleFamily::Italian => "Copia informazioni",
LocaleFamily::Portuguese => "Copiar informações",
LocaleFamily::English => "Copy Support Info",
}
}
#[cfg_attr(not(target_os = "macos"), allow(dead_code))]
fn app_menu_quit_label(locale: &str, app_name: &str) -> String {
match locale_family(locale) {
LocaleFamily::SimplifiedChinese | LocaleFamily::TraditionalChinese => format!("退出 {app_name}"),
LocaleFamily::Japanese => format!("{app_name}を終了"),
LocaleFamily::Spanish => format!("Salir de {app_name}"),
LocaleFamily::Italian => format!("Esci da {app_name}"),
LocaleFamily::Portuguese => format!("Sair do {app_name}"),
LocaleFamily::English => format!("Quit {app_name}"),
}
}
fn current_app_locale<R: tauri::Runtime, M: Manager<R>>(manager: &M) -> String {
match manager.try_state::<AppLocaleState>() {
Some(state) => state.get(),
None => sys_locale::get_locale().unwrap_or_default(),
}
}
fn build_tray_menu<R: tauri::Runtime, M: Manager<R>>(manager: &M) -> tauri::Result<tauri::menu::Menu<R>> {
let (show_label, quit_label) = tray_menu_labels_for_locale(&current_app_locale(manager));
MenuBuilder::new(manager).text("show", show_label).separator().text("quit", quit_label).build()
}
/// Rebuilds the tray menu (and the macOS app menu) so native labels follow the
/// UI language after the frontend reports a locale change.
pub(crate) fn refresh_native_menus(app: &tauri::AppHandle) -> tauri::Result<()> {
if let Some(tray) = app.tray_by_id(DESKTOP_TRAY_ID) {
tray.set_menu(Some(build_tray_menu(app)?))?;
}
#[cfg(target_os = "macos")]
{
let _ = app.set_menu(build_app_menu(app)?)?;
}
Ok(())
}
#[cfg_attr(not(any(target_os = "macos", target_os = "windows")), allow(dead_code))] #[cfg_attr(not(any(target_os = "macos", target_os = "windows")), allow(dead_code))]
fn setup_desktop_tray<R: tauri::Runtime, M: Manager<R>>( fn setup_desktop_tray<R: tauri::Runtime, M: Manager<R>>(
manager: &M, manager: &M,
_icon_theme: DesktopIconTheme, _icon_theme: DesktopIconTheme,
) -> tauri::Result<()> { ) -> tauri::Result<()> {
let menu = MenuBuilder::new(manager).text("show", "Show DBX").separator().text("quit", "Quit DBX").build()?; let menu = build_tray_menu(manager)?;
let mut tray = let mut tray =
TrayIconBuilder::<R>::with_id(DESKTOP_TRAY_ID).tooltip("DBX").menu(&menu).show_menu_on_left_click(false); TrayIconBuilder::<R>::with_id(DESKTOP_TRAY_ID).tooltip("DBX").menu(&menu).show_menu_on_left_click(false);
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
@@ -635,17 +772,50 @@ pub(crate) fn apply_desktop_settings(app: &tauri::AppHandle, desktop_settings: &
#[allow(clippy::items_after_test_module)] #[allow(clippy::items_after_test_module)]
mod tests { mod tests {
use super::{ use super::{
linux_appimage_system_gtk_immodules_cache, linux_appimage_wayland_backend_override, app_menu_copy_support_info_label, app_menu_quit_label, linux_appimage_system_gtk_immodules_cache,
linux_nvidia_driver_from_state, linux_selected_drm_render_device, linux_webkit_rendering_workarounds, linux_appimage_wayland_backend_override, linux_nvidia_driver_from_state, linux_selected_drm_render_device,
native_window_decorations_override, should_confirm_app_exit_request, should_enable_single_instance, linux_webkit_rendering_workarounds, native_window_decorations_override, should_confirm_app_exit_request,
should_fallback_to_native_quit, should_hide_window_on_close, should_setup_desktop_tray, should_enable_single_instance, should_fallback_to_native_quit, should_hide_window_on_close,
should_show_main_window_after_setup, uses_application_level_icon, LinuxDrmRenderDevice, LinuxNvidiaDriver, should_setup_desktop_tray, should_show_main_window_after_setup, tray_menu_labels_for_locale,
uses_application_level_icon, LinuxDrmRenderDevice, LinuxNvidiaDriver,
}; };
use std::ffi::OsStr; use std::ffi::OsStr;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
const TEST_GTK3_IMMODULES_CACHE: &str = "/usr/lib/test/gtk-3.0/3.0.0/immodules.cache"; const TEST_GTK3_IMMODULES_CACHE: &str = "/usr/lib/test/gtk-3.0/3.0.0/immodules.cache";
#[test]
fn tray_menu_labels_follow_locale() {
assert_eq!(tray_menu_labels_for_locale("zh-CN"), ("显示 DBX", "退出 DBX"));
assert_eq!(tray_menu_labels_for_locale("zh_CN"), ("显示 DBX", "退出 DBX"));
assert_eq!(tray_menu_labels_for_locale("zh-Hans-CN"), ("显示 DBX", "退出 DBX"));
assert_eq!(tray_menu_labels_for_locale("zh"), ("显示 DBX", "退出 DBX"));
assert_eq!(tray_menu_labels_for_locale("zh-TW"), ("顯示 DBX", "退出 DBX"));
assert_eq!(tray_menu_labels_for_locale("zh-Hant-HK"), ("顯示 DBX", "退出 DBX"));
assert_eq!(tray_menu_labels_for_locale("zh-MO"), ("顯示 DBX", "退出 DBX"));
assert_eq!(tray_menu_labels_for_locale("ja-JP"), ("DBXを表示", "DBXを終了"));
assert_eq!(tray_menu_labels_for_locale("es-ES"), ("Mostrar DBX", "Salir de DBX"));
assert_eq!(tray_menu_labels_for_locale("it-IT"), ("Mostra DBX", "Esci da DBX"));
assert_eq!(tray_menu_labels_for_locale("pt-BR"), ("Mostrar DBX", "Sair do DBX"));
assert_eq!(tray_menu_labels_for_locale("en-US"), ("Show DBX", "Quit DBX"));
// Unknown and empty locales fall back to English; "ita" must not match "it".
assert_eq!(tray_menu_labels_for_locale("ko-KR"), ("Show DBX", "Quit DBX"));
assert_eq!(tray_menu_labels_for_locale("ita"), ("Show DBX", "Quit DBX"));
assert_eq!(tray_menu_labels_for_locale(""), ("Show DBX", "Quit DBX"));
}
#[test]
fn app_menu_labels_follow_locale() {
assert_eq!(app_menu_quit_label("zh-CN", "DBX"), "退出 DBX");
assert_eq!(app_menu_quit_label("zh-TW", "DBX"), "退出 DBX");
assert_eq!(app_menu_quit_label("ja-JP", "DBX"), "DBXを終了");
assert_eq!(app_menu_quit_label("en-US", "DBX"), "Quit DBX");
assert_eq!(app_menu_quit_label("", "DBX"), "Quit DBX");
assert_eq!(app_menu_copy_support_info_label("zh-CN"), "复制支持信息");
assert_eq!(app_menu_copy_support_info_label("zh-TW"), "複製支援資訊");
assert_eq!(app_menu_copy_support_info_label("en-US"), "Copy Support Info");
}
#[test] #[test]
fn hides_window_on_close_for_windows_and_macos() { fn hides_window_on_close_for_windows_and_macos() {
assert!(should_hide_window_on_close("windows")); assert!(should_hide_window_on_close("windows"));
@@ -974,6 +1144,7 @@ pub fn run() {
builder builder
.manage(CloseBehaviorState::new()) .manage(CloseBehaviorState::new())
.manage(AppLocaleState::new())
.on_page_load(|webview, payload| { .on_page_load(|webview, payload| {
if payload.event() == PageLoadEvent::Started { if payload.event() == PageLoadEvent::Started {
if let Some(state) = webview.app_handle().try_state::<CloseBehaviorState>() { if let Some(state) = webview.app_handle().try_state::<CloseBehaviorState>() {
@@ -1128,6 +1299,7 @@ pub fn run() {
commands::app_settings::save_desktop_settings, commands::app_settings::save_desktop_settings,
commands::app_settings::load_max_agent_turns, commands::app_settings::load_max_agent_turns,
commands::app_settings::save_max_agent_turns, commands::app_settings::save_max_agent_turns,
commands::app_settings::set_app_locale,
commands::app_settings::complete_app_close, commands::app_settings::complete_app_close,
commands::app_settings::mark_frontend_ready, commands::app_settings::mark_frontend_ready,
commands::app_settings::request_app_close_from_window_controls, commands::app_settings::request_app_close_from_window_controls,