Repository navigation
fix: restore main's lint and localization checks after the nested-worktree delete dialog - #25684
Merged
Merged
Conversation
…alog #25668 added DeleteNestedWorktreesDialog and its preserved-branches toast with translate() keys under worktree.nestedRemoval, but not the matching en.json entries. verify-localization-catalogs and -extraction now fail on main, and on every PR that merges it. Entries generated by the catalog sync script from the code's own fallbacks.
#25668 imported from shared/worktree/removal twice in delete-worktree-failure-toast.tsx. The whole-tree lint gate (no-duplicate-imports, --deny-warnings) fails on it for main and every branch that merges main.
Contributor
|
Navigate logical layers of code changes, visualize relationships, and explore their blast radius.
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
brennanb2025
added a commit
that referenced
this pull request
Oct 5, 2026
No conflicts; brings main's lint and localization fix (#25684).
This was referenced Oct 5, 2026
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
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.
ELI5
#25668, which added the "Delete workspace and nested worktrees?" dialog, left two problems on main. Both fail CI checks on main itself and on every pull request that brings main in:
What Changed
src/renderer/src/i18n/locales/en.jsonhad noworktree.nestedRemoval.*entries.DeleteNestedWorktreesDialog.tsxandnested-worktree-preserved-branches-toast.tscalltranslate()with those 12 keys, soverify-localization-catalogsandverify-localization-extractionfail on main ate9ed75a5de1.verify-localization-catalog.mjs --fix) from the English fallback text already in the code, so the wording is exactly what users see today.delete-worktree-failure-toast.tsximported fromshared/worktree/removaltwice. The whole-tree lint gate (no-duplicate-imports,--deny-warnings) fails on it. The two imports are now one.Why
This is the repo's standard fix for a missing catalog entry: run the sync script, which copies each fallback into
en.json. Other languages fall back to English until they are translated, as with any new string.Linked Issue
N/A (main's localization checks fail since #25668)
Visual Proof
N/A: no visible change. The dialog already rendered these English strings through its fallbacks.
Testing
On this branch:
verify-localization-catalogs,verify-localization-catalog,verify-localization-extraction,generate-runtime-required-english-catalogandaudit-localization-coverage --checkall pass. On main ate9ed75a5de1, the catalogs and extraction checks fail, listing these 12 keys. The import merge is type-only; the same 2-line change passed web and node typechecks on #24905 at3b2ed2b5167, and oxlint--deny-warningspasses on the file. No behaviour changed, so there are no new tests. A check for duplicate keys found exactly one top-levelworktreeentry inen.json.AI Disclosure
Review
Agent skill upstream boundary
docs/reference/agent-skill-sharing-upstream-boundary.mdand copies or mechanically translates no upstream skill-installer source, tests, fixtures, registry entries, path tables, comments, or documentation.Notes
An English catalog entry change plus one import merge. No security, platform, SSH, mobile or compatibility impact.
Checklist
N/Awith reasonpnpm lint,pnpm typecheck,pnpm test, andpnpm buildpass (or CI will cover; local preferred)