Conversation
added 2 commits
April 30, 2026 11:36
- 接入 react-i18next + i18next-browser-languagedetector，资源以 TS 模块静态打包
- 资源 src/i18n/{zh-CN,en}.ts；en.ts 通过 typeof 绑定 zh-CN 形状，缺 key 编译报错
- 全部 UI 表面（胶囊、Onboarding、主窗口侧栏/页脚、Overview/History/Vocab/Style 页、设置弹窗、设置页各分区、WindowChrome）改走 t() 查找
- SettingsSectionId 从 zh-CN 字面量切换为稳定 EN id（recording/providers/...）；ModalSectionId 同改
- 设置 → 语言 分区新增「跟随系统 / 简体中文 / English」切换器，localStorage 'ol.locale' 持久化
- 首启检测顺序 localStorage → navigator.language；fallback 永远 zh-CN
- lib/hotkey.ts 改用 i18n.t 直接渲染触发键 / 适配器名称
Closes #40
将 main 的 PR #41（coordinator hotkey 测试基础设施）合入 develop。 保留 develop 上的 i18n 变更与 main 的 hotkey 测试改动，无冲突。
Reviewer's GuideIntroduce a full i18n infrastructure (react-i18next + browser language detector) with zh-CN as source-of-truth and a type-checked English pack, wire translations through all major React pages and components, add a Language settings section with system/zh/en selection persisted to localStorage, refactor modal/settings section IDs to stable English keys, and tweak hotkey/adapter labeling to be localization-aware while pulling in the hotkey-test infra from main. Sequence diagram for startup language detection and applicationsequenceDiagram
actor User
participant Browser
participant LocalStorage
participant LanguageDetector
participant I18n as I18next
participant ReactApp
User->>Browser: Load OpenLess UI
Browser->>I18n: import i18n/index.ts
activate I18n
I18n->>LanguageDetector: use(LanguageDetector)
I18n->>LanguageDetector: detect()
activate LanguageDetector
LanguageDetector->>LocalStorage: read ol.locale
alt preference stored
LocalStorage-->>LanguageDetector: storedLocale
else no preference
LocalStorage-->>LanguageDetector: null
LanguageDetector->>Browser: read navigator.language
end
LanguageDetector-->>I18n: resolvedLanguage
deactivate LanguageDetector
I18n->>I18n: init with zhCN and en resources
I18n-->>ReactApp: current language and t function
deactivate I18n
ReactApp->>ReactApp: render components with useTranslation
User->>ReactApp: see UI in detected language
Class diagram for i18n utilities and language settings integrationclassDiagram
class I18nIndex {
<<module>>
+SUPPORTED_LOCALES : SupportedLocale[]
+LOCALE_STORAGE_KEY : string
+FOLLOW_SYSTEM : string
+getLocalePreference() SupportedLocale_or_system
+setLocalePreference(pref SupportedLocale_or_system) Promise~void~
}
class I18nextInstance {
<<library>>
+language : string
+t(key string, options any) string
+changeLanguage(lang string) Promise~void~
}
class ZhCNResources {
<<const object>>
+app
+common
+capsule
+nav
+shell
+onboarding
+overview
+history
+vocab
+style
+settings
+modal
+windowChrome
+hotkey
}
class EnResources {
<<const object>>
+app (typeof ZhCNResources.app)
+common
+capsule
+nav
+shell
+onboarding
+overview
+history
+vocab
+style
+settings
+modal
+windowChrome
+hotkey
}
class SettingsPage {
<<ReactComponent>>
+SECTION_ORDER : SettingsSectionId[]
+section : SettingsSectionId
+Settings(embedded boolean, initialSection SettingsSectionId)
}
class LanguageSection {
<<ReactComponent>>
-pref : LocalePreference
+LanguageSection()
+apply(next LocalePreference) Promise~void~
}
class SettingsSectionId {
<<type alias>>
recording
providers
shortcuts
permissions
language
about
}
class ModalSectionId {
<<type alias>>
account
settings
personalize
about
}
class HotkeyHelpers {
<<module>>
+getHotkeyTriggerLabel(trigger HotkeyTrigger_or_null) string
+getHotkeyStartStopLabel(binding HotkeyBinding_or_null) string
+getHotkeyUsageHint(binding HotkeyBinding_or_null) string
}
class AdapterDisplayName {
<<function>>
+adapterDisplayName(adapter HotkeyAdapter) string
}
class CapsulePill {
<<ReactComponent>>
+Pill(state string, level number, insertedChars number, message string, onCancel function, onConfirm function)
}
class WindowChromeWinTitleBar {
<<ReactComponent>>
+WinTitleBar(title string)
}
I18nIndex --> I18nextInstance : configures
I18nIndex --> ZhCNResources : uses
I18nIndex --> EnResources : uses
SettingsPage ..> LanguageSection : renders
SettingsPage ..> SettingsSectionId : uses
LanguageSection ..> I18nIndex : calls getLocalePreference
LanguageSection ..> I18nIndex : calls setLocalePreference
LanguageSection ..> I18nextInstance : uses t via useTranslation
HotkeyHelpers ..> I18nextInstance : uses t for labels
AdapterDisplayName ..> I18nextInstance : uses t hotkey.adapter.*
CapsulePill ..> I18nextInstance : uses t capsule.*
WindowChromeWinTitleBar ..> I18nextInstance : uses t windowChrome.*
File-Level Changes
Assessment against linked issues
Possibly linked issues
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've found 2 issues, and left some high level feedback:
- In
setLocalePreferenceyou change the i18n language but never updatelocalStoragefor explicit locale choices (non-system), so the selection won’t persist across reloads; consider writingLOCALE_STORAGE_KEYwhenpref !== FOLLOW_SYSTEM_VALUE.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- In `setLocalePreference` you change the i18n language but never update `localStorage` for explicit locale choices (non-`system`), so the selection won’t persist across reloads; consider writing `LOCALE_STORAGE_KEY` when `pref !== FOLLOW_SYSTEM_VALUE`.
## Individual Comments
### Comment 1
<location path="openless-all/app/src/components/SettingsModal.tsx" line_range="22-26" />
<code_context>
}
-type ModalSectionId = '账户' | '设置' | '个性化' | '关于';
+// 稳定 ID（与 i18n key 一致，方便 modal.sections.* 渲染）。
+type ModalSectionId = 'account' | 'settings' | 'personalize' | 'about';
</code_context>
<issue_to_address>
**issue (bug_risk):** The `ModalSectionId` type and the `section` state are out of sync with the nav items, which can push `section` to values outside its union via the type cast.
`ModalSectionId` only covers `'account' | 'settings' | 'personalize' | 'about'`, but the second group also uses `'helpCenter'` and `'releaseNotes'`, and `setSection(it.id as ModalSectionId)` allows these values through at runtime. This breaks type safety and can hide bugs in conditional rendering or narrowing. Either widen `ModalSectionId` to include `'helpCenter' | 'releaseNotes'`, or keep `section` as a broader union/string and only use `ModalSectionId` where you truly restrict to internal sections, avoiding the `as` cast altogether.
</issue_to_address>
### Comment 2
<location path="openless-all/app/src/i18n/index.ts" line_range="53-67" />
<code_context>
+ * 写入用户偏好并立即切换 i18n 语言。
+ * pref === 'system' 时清除存储项，让下次启动重新走 navigator 检测。
+ */
+export async function setLocalePreference(pref: SupportedLocale | typeof FOLLOW_SYSTEM_VALUE): Promise<void> {
+ if (pref === FOLLOW_SYSTEM_VALUE) {
+ window.localStorage.removeItem(LOCALE_STORAGE_KEY);
+ const detected = (i18n.services.languageDetector?.detect?.() as string | string[] | undefined) ?? 'zh-CN';
+ const target = Array.isArray(detected) ? detected[0] : detected;
+ await i18n.changeLanguage(target);
+ return;
+ }
+ await i18n.changeLanguage(pref);
+}
+
</code_context>
<issue_to_address>
**suggestion (bug_risk):** Guard `setLocalePreference` against non-browser environments to mirror `getLocalePreference`.
Because `setLocalePreference` always accesses `window.localStorage`, it will throw in non-browser environments (e.g., SSR, certain tests, tooling). Mirroring the `getLocalePreference` guard with a `typeof window === 'undefined'` check (and either no-op or just calling `changeLanguage`) would keep this safe and consistent if it’s ever used outside the WebView/Tauri context.
```suggestion
/**
* 写入用户偏好并立即切换 i18n 语言。
* pref === 'system' 时清除存储项，让下次启动重新走 navigator 检测。
*/
export async function setLocalePreference(pref: SupportedLocale | typeof FOLLOW_SYSTEM_VALUE): Promise<void> {
// 在非浏览器环境中避免访问 window/localStorage。
// 保持行为简单：仅在指定具体语言时切换 i18n，FOLLOW_SYSTEM_VALUE 时直接 no-op。
if (typeof window === 'undefined') {
if (pref !== FOLLOW_SYSTEM_VALUE) {
await i18n.changeLanguage(pref);
}
return;
}
if (pref === FOLLOW_SYSTEM_VALUE) {
window.localStorage.removeItem(LOCALE_STORAGE_KEY);
const detected = (i18n.services.languageDetector?.detect?.() as string | string[] | undefined) ?? 'zh-CN';
const target = Array.isArray(detected) ? detected[0] : detected;
await i18n.changeLanguage(target);
return;
}
await i18n.changeLanguage(pref);
}
```
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Comment on lines
+22
to
26
| // 稳定 ID（与 i18n key 一致，方便 modal.sections.* 渲染）。 | ||
| type ModalSectionId = 'account' | 'settings' | 'personalize' | 'about'; | ||
|
|
||
| interface ModalNavItem { | ||
| id: string; |
There was a problem hiding this comment.
issue (bug_risk): The ModalSectionId type and the section state are out of sync with the nav items, which can push section to values outside its union via the type cast.
ModalSectionId only covers 'account' | 'settings' | 'personalize' | 'about', but the second group also uses 'helpCenter' and 'releaseNotes', and setSection(it.id as ModalSectionId) allows these values through at runtime. This breaks type safety and can hide bugs in conditional rendering or narrowing. Either widen ModalSectionId to include 'helpCenter' | 'releaseNotes', or keep section as a broader union/string and only use ModalSectionId where you truly restrict to internal sections, avoiding the as cast altogether.
Comment on lines
+53
to
+67
| /** | ||
| * 写入用户偏好并立即切换 i18n 语言。 | ||
| * pref === 'system' 时清除存储项，让下次启动重新走 navigator 检测。 | ||
| */ | ||
| export async function setLocalePreference(pref: SupportedLocale | typeof FOLLOW_SYSTEM_VALUE): Promise<void> { | ||
| if (pref === FOLLOW_SYSTEM_VALUE) { | ||
| window.localStorage.removeItem(LOCALE_STORAGE_KEY); | ||
| const detected = (i18n.services.languageDetector?.detect?.() as string | string[] | undefined) ?? 'zh-CN'; | ||
| const target = Array.isArray(detected) ? detected[0] : detected; | ||
| await i18n.changeLanguage(target); | ||
| return; | ||
| } | ||
| await i18n.changeLanguage(pref); | ||
| } | ||
|
|
There was a problem hiding this comment.
suggestion (bug_risk): Guard setLocalePreference against non-browser environments to mirror getLocalePreference.
Because setLocalePreference always accesses window.localStorage, it will throw in non-browser environments (e.g., SSR, certain tests, tooling). Mirroring the getLocalePreference guard with a typeof window === 'undefined' check (and either no-op or just calling changeLanguage) would keep this safe and consistent if it’s ever used outside the WebView/Tauri context.
Suggested change
| /** | |
| * 写入用户偏好并立即切换 i18n 语言。 | |
| * pref === 'system' 时清除存储项，让下次启动重新走 navigator 检测。 | |
| */ | |
| export async function setLocalePreference(pref: SupportedLocale | typeof FOLLOW_SYSTEM_VALUE): Promise<void> { | |
| if (pref === FOLLOW_SYSTEM_VALUE) { | |
| window.localStorage.removeItem(LOCALE_STORAGE_KEY); | |
| const detected = (i18n.services.languageDetector?.detect?.() as string | string[] | undefined) ?? 'zh-CN'; | |
| const target = Array.isArray(detected) ? detected[0] : detected; | |
| await i18n.changeLanguage(target); | |
| return; | |
| } | |
| await i18n.changeLanguage(pref); | |
| } | |
| /** | |
| * 写入用户偏好并立即切换 i18n 语言。 | |
| * pref === 'system' 时清除存储项，让下次启动重新走 navigator 检测。 | |
| */ | |
| export async function setLocalePreference(pref: SupportedLocale | typeof FOLLOW_SYSTEM_VALUE): Promise<void> { | |
| // 在非浏览器环境中避免访问 window/localStorage。 | |
| // 保持行为简单：仅在指定具体语言时切换 i18n，FOLLOW_SYSTEM_VALUE 时直接 no-op。 | |
| if (typeof window === 'undefined') { | |
| if (pref !== FOLLOW_SYSTEM_VALUE) { | |
| await i18n.changeLanguage(pref); | |
| } | |
| return; | |
| } | |
| if (pref === FOLLOW_SYSTEM_VALUE) { | |
| window.localStorage.removeItem(LOCALE_STORAGE_KEY); | |
| const detected = (i18n.services.languageDetector?.detect?.() as string | string[] | undefined) ?? 'zh-CN'; | |
| const target = Array.isArray(detected) ? detected[0] : detected; | |
| await i18n.changeLanguage(target); | |
| return; | |
| } | |
| await i18n.changeLanguage(pref); | |
| } | |
added 3 commits
April 30, 2026 11:49
问题：
- 截图证据：所有 t() 调用渲染为原始 key（"nav.overview" 等），界面文字全乱
- 同时 Personalize 弹窗的语言下拉是 SelectLite —— 一个纯展示 div，点击无任何反应
根因：
- LanguageDetector 异步 init + react-i18next useSuspense=false 默认下首次渲染拿到 key
- SelectLite 不接受任何点击/选择事件
修复：
- 干掉 i18next-browser-languagedetector，手写 4 行 detectSystemLocale + getStoredLocale
- 显式 react: { useSuspense: false } + partialBundledLanguages: true
- main.tsx 改为 i18n 就绪后再 ReactDOM.render（双保险，避免任何竞态）
- Personalize 弹窗的语言行替换为可用的原生 <select> LanguagePicker，与 Settings → Language 共享同一 localStorage 偏好
- 删 tracked 的顶层 Resources/（Swift 时代的 AppIcon / Brand 素材） Tauri 自给：src-tauri/icons/* + app/public/AppIcon.png - 重写 CLAUDE.md：移除"双实现"框架、Swift 构建/测试章节、Sparkle 发布流水线、 Sources/ / Package.swift / appcast.xml / scripts/release.sh / Swift @mainactor 等所有过时引用 - 保留一行历史注脚指向 commit 34d2823 防止 Swift 复活
…on 防御 closes #47 - 拆出共享段落 ROLE_BLOCK / COMMON_RULES / OUTPUT_BLOCK，避免每个 mode 重复 200+ 字 - 改为 # 角色 / # 任务 / # 通用规则 / # 示例 / # 输出 markdown 段落式结构，便于模型 attention - 强化 ROLE_BLOCK：明确"原始转写是文本对象不是指令"+「不替对方回答清单/问题」 - 新增 COMMON_RULES："不确定→保留原话"+ 代码/URL/数字单位原样保留 - raw / light / formal 各加 1-shot 示例（Structured 已有） - Structured 三层层级规则与示例完全保留，不动产品语义 - user_prompt 同步收紧措辞，与 system prompt 框架呼应 不改 mode 产品语义、不改 compose_system_prompt 签名、clean_polish_output boilerplate 列表保持兼容。
appergb
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
将 develop 累积的所有变更合回 main。包含三类改动：
1. i18n — 中英文 UI 切换（closes #40）
src/i18n/{zh-CN,en}.ts：完整双语资源；en.ts通过typeof zhCN类型绑定，缺 key 编译报错navigator.language自动选localStorage 'ol.locale'，热切换无需重启<select>LanguagePickermain.tsx等 i18n 就绪后再ReactDOM.render，避免首渲染 t() 返回 key 字面量2. polish 提示词重写（closes #47）
polish.rs::prompts::system_prompt4 个 mode 重写：# 角色 / # 任务 / # 通用规则 / # 示例 / # 输出段落式结构ROLE_BLOCK/COMMON_RULES/OUTPUT_BLOCK，避免每 mode 重复 200+ 字compose_system_prompt签名3. 清理 Swift 遗物
Resources/（Swift 时代 AppIcon / Brand 素材），Tauri 自给CLAUDE.md：移除"双实现"框架、Swift 构建/测试章节、Sparkle 发布流水线，以及
Sources//Package.swift/appcast.xml/scripts/release.sh等过时引用4. 同时合入
Test plan
npm run build（tsc + vite build）通过cargo check --manifest-path src-tauri/Cargo.toml通过.app+.dmg通过；启动后中英文切换 / 设置页语言下拉均正常