Skip to content

feat(i18n): land the menu and Security work merged into #937's branch - #989

Merged
penso merged 3 commits into
mainfrom
i18n/finish
Nov 1, 2026
Merged

penso merged 3 commits into
mainfrom
i18n/finish

Conversation

@penso

@penso penso commented Nov 1, 2026

Copy link
Copy Markdown
Collaborator

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.

Validation

  • python3 scripts/check-i18n.py: 5525 messages in 288 files are valid and used
  • git diff --check
  • just ci on 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 on main afterwards.

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

  • Open a pane's menu, choose Move to another device, and check the steps and summaries under QA > Pseudo-Locale > Accented (en-XA).
  • Open Security and check the alert and report times read as before in English, and are bracketed under en-XA.
  • Open Orchestrator and code search and check their times are unchanged from main.

penso added 3 commits November 1, 2026 13:50
Lands #938, which merged into #937's branch instead of main. docs/i18n.md keeps main's copy.
Lands the Security part of #940, which merged into #937's branch instead of main. Its code search and orchestrator times are already on main through #961 and #962, so this keeps main's version of those and drops the duplicate messages and the unused ago::short.
@netlify

netlify Bot commented Nov 1, 2026 •

Copy link
Copy Markdown

✅ Deploy Preview for herdr-ui canceled.

Name Link
🔨 Latest commit 59c06ec
🔍 Latest deploy log https://app.netlify.com/projects/herdr-ui/deploys/6ae7b5142b949c9b3f046b08

@penso

penso commented Nov 1, 2026

Copy link
Copy Markdown
Collaborator Author

@greptileai review

@greptile-apps

greptile-apps Bot commented Nov 1, 2026 •

Copy link
Copy Markdown

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] This PR appears safe to merge.

Summary

Moves the pane menu’s Teleport text and Security errors into Fluent messages.

  • Pane moves show translated reviews, progress, failures, and warnings.
  • Security uses shared relative times and translated read errors.
  • The i18n guide lists the remaining English text and migration history.

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

@penso
penso merged commit 7bc7090 into main Nov 1, 2026
5 checks passed
@penso
penso deleted the i18n/finish branch November 1, 2026 21:56
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant