Repository navigation
feat(i18n): land the menu and Security work merged into #937's branch - #989
Merged
Merged
Conversation
✅ Deploy Preview for herdr-ui canceled.
|
Collaborator
Author
|
@greptileai review |
[Medium impact] This PR appears safe to merge. SummaryMoves the pane menu’s Teleport text and Security errors into Fluent messages.
No actionable issues found. Tests and desktop checks were not run during this review. Reviews (1) · Last reviewed commit: "docs(i18n): record what the string migra..." · Reviewed by Greptile |
2 of 3 tasks
shin1ohno
added a commit
to shin1ohno/herdr-gpui
that referenced
this pull request
Nov 3, 2026
Brings in upstream's 30 commits, among them side-by-side agent chats in Herdr 2 panes (sheprd-labs#935), choosing the agent a new worktree opens in (sheprd-labs#948), the Vulkan driver hint (sheprd-labs#977), readable branch divergence counts (sheprd-labs#999), and the next round of i18n Fluent migrations with typed updater reasons (sheprd-labs#951-sheprd-labs#971, sheprd-labs#989). Conflicts: upstream's code wins and the iPad's needs are re-applied on top. Tests that moved into their own files keep this branch's iOS gates. The core terminal state keeps both upstream's pending spawn and the iPad's app-owned SSH workspace, and the iPad focus frame wraps upstream's pane body. The device picker keeps reading Herdr 2 state from the window on iPad and otherwise shows upstream's localized status. The updater stays disabled on iPadOS with upstream's Platform reason, the update panel keeps its iPadOS wording, and plan usage and the orchestrator stay off on iPad. Beyond the conflicts, upstream's changes needed these to build and pass on iPadOS: - Upstream marked app.rs and config.rs as i18n-migrated, which covers app/ios.rs and config/ipad_storage.rs. The theme load failure and the oversized config error get Fluent messages; debug names, the background task name and the diagnostics fallback are marked as data. - config.rs stays under 1,000 lines. The iPad migration warning and the platform read function move into ipad_storage.rs and files.rs. - The iPad startup loads and installs the remembered worktree landing, as the desktop's does since sheprd-labs#948. - Helpers only the desktop's control server and link handling use are compiled out on iOS: the usage English text, the window's link complaint, and, outside tests, Endpoint::status and focused_core_chat_key. Error and test modules for desktop-only link and checkout code are compiled out too. - The iPad sidebar test's chat target names its surface, and the updater's reason test expects the iPadOS reasons on iOS.
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.
Summary
Lands the two i18n PRs that were merged into #937's branch instead of
main, and records what the string migration leaves in English.mainunchanged apart fromdocs/i18n.md, which keepsmain's copy.agoand its errors throughlocalize()(i18n/errors/security.rs,error-security.ftl).mainthrough refactor(i18n): show pull requests and issues through Fluent #961 and refactor(i18n): show code search and worktree scripts through Fluent #962, which translated the same code with their own messages. This keepsmain's version and drops feat(i18n): show Security, code search, and orchestrator times through ago #940's duplicates:orchestrator-detail.ftland the now-unusedago::shortwith itsago-short-*messages.mainin3f18590e3, so it is not repeated here. fix(i18n): map the errors #905 added so the app builds again #937 can be closed after this merges.docs/i18n.md: "What is left" now lists what still shows English (a few unmarked small modules, errors still flattened withto_string(),chronoweekday and month names, Review's agent prompt) and what stays English by decision. The history table names the Phase 2 pull requests.Validation
python3 scripts/check-i18n.py: 5525 messages in 288 files are valid and usedgit diff --checkjust cion this commit: started locally on macOS arm64, not finished when this PR was opened. CI was not a merge gate for this series by request; failures are fixed onmainafterwards.Screenshots
None captured: no desktop session was used. The visible change is the pane menu's move to another device and Security's times, now from messages.
QA
main.