Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-05 04:19:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

refactor(i18n): restructure translation resources and update logger context

Browse Source 
Move translation files to new location and update resource structure to include translation namespace
Update logger context to include module prefix for better debugging
This commit is contained in:
icarus 2025-10-23 22:46:24 +08:00
parent b02678a714
commit 57206dd3b1
2 changed files with 78 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/utils/language.ts
View File

@ -5,31 +5,54 @@ import type { LanguageVarious } from '@shared/data/preference/preferenceTypes'
import { app } from 'electron' import { app } from 'electron'
import i18n from 'i18next' import i18n from 'i18next'
import EnUs from '../../renderer/src/i18n/locales/en-us.json'
import ZhCn from '../../renderer/src/i18n/locales/zh-cn.json'
import ZhTw from '../../renderer/src/i18n/locales/zh-tw.json'
// import deDE from '../../renderer/src/i18n/locales/de-de.json' // import deDE from '../../renderer/src/i18n/locales/de-de.json'
// import elGR from '../../renderer/src/i18n/locales/el-gr.json' // import elGR from '../../renderer/src/i18n/locales/el-gr.json'
import EnUs from '../../renderer/src/i18n/locales/en-us.json'
// import esES from '../../renderer/src/i18n/locales/es-es.json' // import esES from '../../renderer/src/i18n/locales/es-es.json'
// import frFR from '../../renderer/src/i18n/locales/fr-fr.json' // import frFR from '../../renderer/src/i18n/locales/fr-fr.json'
// import JaJP from '../../renderer/src/i18n/locales/ja-jp.json' // import JaJP from '../../renderer/src/i18n/locales/ja-jp.json'
// import ptPT from '../../renderer/src/i18n/locales/pt-pt.json' // import ptPT from '../../renderer/src/i18n/locales/pt-pt.json'
// import RuRu from '../../renderer/src/i18n/locales/ru-ru.json' // import RuRu from '../../renderer/src/i18n/locales/ru-ru.json'
import ZhCn from '../../renderer/src/i18n/locales/zh-cn.json' import deDE from '../../renderer/src/i18n/translate/de-de.json'
import ZhTw from '../../renderer/src/i18n/locales/zh-tw.json' import elGR from '../../renderer/src/i18n/translate/el-gr.json'
import esES from '../../renderer/src/i18n/translate/es-es.json'
import frFR from '../../renderer/src/i18n/translate/fr-fr.json'
import JaJP from '../../renderer/src/i18n/translate/ja-jp.json'
import ptPT from '../../renderer/src/i18n/translate/pt-pt.json'
import RuRu from '../../renderer/src/i18n/translate/ru-ru.json'
const logger = loggerService.withContext('i18n') const logger = loggerService.withContext('main:i18n')
const resources = Object.fromEntries([ // const resources = Object.fromEntries([
['en-us', EnUs], // ['en-us', EnUs],
['zh-cn', ZhCn], // ['zh-cn', ZhCn],
['zh-tw', ZhTw] // ['zh-tw', ZhTw],
// ['ja-JP', JaJP], // ['ja-JP', JaJP],
// ['ru-RU', RuRu], // ['ru-RU', RuRu],
// ['de-DE', deDE], // ['de-DE', deDE],
// ['el-GR', elGR], // ['el-GR', elGR],
// ['es-ES', esES], // ['es-ES', esES],
// ['fr-FR', frFR], // ['fr-FR', frFR],
// ['pt-PT', ptPT] // ['pt-PT', ptPT]
] as const) // ] as const)
const resources = Object.fromEntries(
(
[
['en-us', EnUs],
['zh-cn', ZhCn],
['zh-tw', ZhTw],
['ja-JP', JaJP],
['ru-RU', RuRu],
['de-DE', deDE],
['el-GR', elGR],
['es-ES', esES],
['fr-FR', frFR],
['pt-PT', ptPT]
] as const
).map(([key, translation]) => [key, { translation }])
)
export const getAppLanguage = (): LanguageVarious => { export const getAppLanguage = (): LanguageVarious => {
const language = preferenceService.get('app.language') const language = preferenceService.get('app.language')

55
src/renderer/src/i18n/index.ts
View File

@ -4,31 +4,54 @@ import { defaultLanguage } from '@shared/config/constant'
import i18n from 'i18next' import i18n from 'i18next'
import { initReactI18next } from 'react-i18next' import { initReactI18next } from 'react-i18next'
import enUS from './locales/en-us.json'
import zhCN from './locales/zh-cn.json'
import zhTW from './locales/zh-tw.json'
// import deDE from './locales/de-de.json' // import deDE from './locales/de-de.json'
// import elGR from './locales/el-gr.json' // import elGR from './locales/el-gr.json'
import enUS from './locales/en-us.json'
// import esES from './locales/es-es.json' // import esES from './locales/es-es.json'
// import frFR from './locales/fr-fr.json' // import frFR from './locales/fr-fr.json'
// import jaJP from './locales/ja-jp.json' // import jaJP from './locales/ja-jp.json'
// import ptPT from './locales/pt-pt.json' // import ptPT from './locales/pt-pt.json'
// import ruRU from './locales/ru-ru.json' // import ruRU from './locales/ru-ru.json'
import zhCN from './locales/zh-cn.json' import deDE from './translate/de-de.json'
import zhTW from './locales/zh-tw.json' import elGR from './translate/el-gr.json'
import esES from './translate/es-es.json'
import frFR from './translate/fr-fr.json'
import jaJP from './translate/ja-jp.json'
import ptPT from './translate/pt-pt.json'
import ruRU from './translate/ru-ru.json'
const logger = loggerService.withContext('I18N') const logger = loggerService.withContext('renderer:i18n')
const resources = Object.fromEntries([ // const resources = Object.fromEntries([
['en-US', enUS], // ['en-US', enUS],
// ['ja-JP', jaJP], // ['zh-CN', zhCN],
// ['ru-RU', ruRU], // ['zh-TW', zhTW],
['zh-CN', zhCN], // ['de-DE', deDE],
['zh-TW', zhTW] // ['el-GR', elGR],
// ['de-DE', deDE], // ['es-ES', esES],
// ['el-GR', elGR], // ['fr-FR', frFR],
// ['es-ES', esES], // ['ja-JP', jaJP],
// ['fr-FR', frFR], // ['pt-PT', ptPT],
// ['pt-PT', ptPT] // ['ru-RU', ruRU]
]) // ])
const resources = Object.fromEntries(
(
[
['en-US', enUS],
['zh-CN', zhCN],
['zh-TW', zhTW],
['de-DE', deDE],
['el-GR', elGR],
['es-ES', esES],
['fr-FR', frFR],
['ja-JP', jaJP],
['pt-PT', ptPT],
['ru-RU', ruRU]
] as const
).map(([key, translation]) => [key, { translation }])
)
export const getLanguage = async () => { export const getLanguage = async () => {
return (await preferenceService.get('app.language')) || navigator.language || defaultLanguage return (await preferenceService.get('app.language')) || navigator.language || defaultLanguage