Skip to content

Commit 10dd358

Browse files
committed
Merge pull request xiaoY233#64 from PandaYuuHa/fix/language-persistence
2 parents 7215512 + e22b202 commit 10dd358

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

src/renderer/src/i18n/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ i18n
2727
detection: {
2828
order: ['localStorage', 'navigator'],
2929
caches: ['localStorage'],
30-
lookupLocalStorage: 'chat2api-settings',
30+
lookupLocalStorage: 'i18nextLng',
3131
convertDetectedLanguage: (lng: string) => {
3232
if (lng.includes('zh')) return 'zh-CN'
3333
if (lng.includes('en')) return 'en-US'

src/renderer/src/stores/settingsStore.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,14 @@ export const useSettingsStore = create<SettingsState>()(
6767
}
6868
},
6969
language: 'en-US',
70-
setLanguage: (language) => {
70+
setLanguage: async (language) => {
7171
set({ language })
72-
i18n.changeLanguage(language)
72+
await i18n.changeLanguage(language)
73+
try {
74+
await window.electronAPI.config.update({ language: language })
75+
} catch (error) {
76+
console.error('Failed to update language:', error)
77+
}
7378
},
7479
autoStart: false,
7580
setAutoStart: async (enabled) => {
@@ -138,6 +143,7 @@ export const useSettingsStore = create<SettingsState>()(
138143
autoStart: config.autoStart,
139144
autoStartProxy: config.autoStartProxy,
140145
oauthProxyMode: config.oauthProxyMode || 'system',
146+
language: config.language || 'en-US',
141147
})
142148
} catch (error) {
143149
console.error('Failed to fetch config:', error)

src/shared/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ export interface AppConfig {
102102
oauthProxyMode: 'system' | 'none'
103103
sessionConfig: SessionConfig
104104
toolPromptConfig: ToolPromptConfig
105+
language: 'zh-CN' | 'en-US'
105106
}
106107

107108
export type LogLevel = 'debug' | 'info' | 'warn' | 'error'

0 commit comments

Comments
 (0)