Repository navigation
refactor(i18n): show find, copy mode, and terminal notes through Fluent - #963
Merged
Merged
Conversation
Part of Phase 2 of docs/i18n.md. The find bar, copy mode, copying a
selection, notes on terminal text, and the notes text other views share
(agent_notes: the Send button, the queued line, and where a batch went)
now come from window-find.ftl, window-annotate.ftl, and agent-notes.ftl.
Errors there use localize(), the search fields' placeholders follow a
language change, and the queued-notes counts are selectors.
The reasons notes were kept for `browser feedback` were glued to a
shared suffix in Rust; each is now its own sentence, picked by a Kept
enum. The search count ("3 of 17", "No results") that find and copy mode
share in scrollback::match_count is a message too.
✅ Deploy Preview for herdr-ui canceled.
|
Collaborator
Author
|
|
[Medium impact] The PR appears safe to merge; no new actionable issues were found. SummaryMoves find, copy-mode, selection, and terminal-note text into Fluent messages.
The earlier unnumbered finding is fixed: Reviews (3) · Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." · Reviewed by Greptile |
5 of 7 tasks
…nguage The find migration left Search::send_failed and Search::answer saving the client error's Display text, which the find bar shows as is, so a full command queue or a dropped connection still read in English. Both now save its localized message, and the en-XA leak test draws a failed search.
Collaborator
Author
|
@greptileai review |
# Conflicts: # docs/i18n.md
Collaborator
Author
|
@greptileai review |
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
Part of Phase 2 of
docs/i18n.md, following #880, #926/#928, and #941. This PR covers the main window's find bar, copy mode, copying a selection, and notes on terminal text, plus the notes text other views share fromagent_notes. It is independent of #954 and #959, which cover other parts ofwindow/.window-find.ftl(find, copy mode, selection),window-annotate.ftl(the note card, its offer, and its flashes), andagent-notes.ftl(the Send button, the queued line, and where a batch went).// i18n: migrated:window/find,window/copy_mode,window/selection,window/annotate(andannotate/render),agent_notes, and the state modules they show from:copy_mode,find, andscrollback. The search count ("3 of 17", "17 found", "No results") that find and copy mode share is inscrollback::match_count, and is now messages.{error}these lines show useslocalize()instead ofDisplay.browser feedback" were glued to a shared suffix. Each is now its own sentence, picked by a newKeptenum.set_placeholder_with, so they follow a language change.en-XAleak tests:window/find/tests/en_xa.rs: the empty bar, a count, "No results", and copy mode's label.window/annotate/tests/en_xa.rs: the note card, and the card with a queued note and its flash.agent_notes/tests/en_xa.rs: the Send labels and queued lines.Keptreason picks its own sentence.docs/i18n.mdis left as onmain, because every open i18n PR edits its "What is left" list. One PR updates the list after they all merge.No visible change in English.
Screenshots
Native macOS captures, debug build, against an isolated sandbox
herdr server. The find bar and copy mode were opened withherdr-gpui run findandrun copy_mode, and the language was switched withherdr-gpui language set, so no synthetic input was used. The bottom edge with the status bar is cropped. A search count and the note card need typing, so they're covered by the leak tests and the manual checks below.The find field's placeholder and copy mode's corner label are messages. Under en-XB both mirror.
QA
just formatjust cion6709be511(macOS arm64, after mergingmain): passed, 16,406 tests, 0 faileden-XAand annotate it: the card, hint, Queue and Send, and the flash after Queue read in en-XAen-XAwith an agent: the Send button ("Send to agent", "Send N new", "Resend all") and "Queued until the agent is idle"just lint-linuxandjust lint-windowswere not run: nocfggate changed.