Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/apps/desktop/src/api/i18n_api.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
//! I18n API

use crate::api::app_state::AppState;
use log::{error, info};
use bitfun_core::service::i18n::{get_global_i18n_service, LocaleId};
use log::{error, info, warn};
use serde::{Deserialize, Serialize};
use serde_json::Value;
use tauri::State;
Expand Down Expand Up @@ -60,6 +61,20 @@ pub async fn i18n_set_language(
{
Ok(_) => {
info!("Language set to: {}", request.language);

// Sync the in-memory I18nService so bot/remote-connect responses
// use the newly selected language without requiring an app restart.
if let Some(locale_id) = LocaleId::from_str(&request.language) {
if let Some(i18n_service) = get_global_i18n_service().await {
if let Err(e) = i18n_service.set_locale(locale_id).await {
warn!(
"Failed to sync I18nService locale after language change: language={}, error={}",
request.language, e
);
}
}
}

#[cfg(target_os = "macos")]
{
let has_workspace = state.workspace_path.read().await.is_some();
Expand Down
16 changes: 16 additions & 0 deletions src/apps/desktop/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,22 @@ pub async fn run() {
return;
}

// Initialize global I18nService so bot/remote-connect language is always in sync.
{
use bitfun_core::service::config::get_global_config_service;
use bitfun_core::service::i18n::initialize_global_i18n_service;
match get_global_config_service().await {
Ok(config_service) => {
if let Err(e) = initialize_global_i18n_service(Some(config_service)).await {
log::error!("Failed to initialize global I18nService: {}", e);
}
}
Err(e) => {
log::error!("Failed to get config service for I18nService init: {}", e);
}
}
}

let startup_log_level = resolve_runtime_log_level(log_config.level).await;

if let Err(e) = AIClientFactory::initialize_global().await {
Expand Down
Loading