fix(desktop): add history filter locale keys / 补齐历史筛选文案#3408
Merged
Conversation
esengine
added a commit
that referenced
this pull request
Jun 7, 2026
#3415) en.ts and zh.ts each carried two identical blocks of the ten history.filter* keys: an earlier history PR added them, then #3408 added the same set again. The two blocks merged cleanly as text (appended at different offsets) but produced duplicate object properties, so tsc and `wails build` failed with TS1117 (#3410). The desktop CI job stubs the embedded frontend and never runs tsc, so the duplicates passed every check. Removed the redundant second block in each file (identical values; kept the first). Verified tsc --noEmit is clean after the fix. Fixes #3410
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
2 participants
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.
Summary\n- Add the missing Chinese and English locale keys used by the redesigned history/trash filters.\n- Keep this copy fix separate from the process replay PR so that later diffs stay focused.\n\n## Verification\n- pnpm --dir desktop/frontend typecheck\n- git diff --check