ADR-0019 §9 sweep (2/2): help blocks + modals + system notes
Final pass of the i18n migration sweep. Every user-visible
string in `src/` now flows through the catalog via `t!()`.
## Categories migrated in this commit
- **help.cli_banner** — the entire `cli::HELP_TEXT` const,
formerly a 40-line `&'static str`, is now a YAML block in
the catalog. The const is replaced by a thin
`cli::help_text() -> String` wrapper that performs the
catalog lookup. `main.rs` calls `help_text()` for both
`--help` output and the args-parse error path. The two
integration tests that referenced `HELP_TEXT` directly are
updated.
- **help.in_app_body** — the in-app `help` command's body is
one YAML block; `note_help` becomes 5 lines that iterate
the lines and emit each as its own output row (preserving
the renderer's "one logical line = one display row"
invariant for accurate scroll math).
- **modal.*** — load picker, rebuild confirm, and save-as
path-entry strings: rebuild_cancelled, load_cancelled,
generic_cancelled, load_picker_nothing,
path_entry_empty_name, path_entry_empty_path.
- **dsl.failed** — the `"<verb> <subject>" failed: <rendered>`
wrapper around the friendly-error layer's translated
message.
- **dsl.running** — the `running: <input>` echo line shown
above each command's response. (Note: the en-US prefix
"running: " is hardcoded in the parse-error caret-padding
calculation. Translators changing the prefix must keep the
width consistent — documented inline.)
- **advanced_mode.not_implemented** — the placeholder echo
shown when SQL hits the unimplemented advanced-mode path
(Q1 territory).
- **fatal.persistence** — the FATAL banner for
PersistenceFatal events (ADR-0015 §8).
- **project.{load_path_missing,saveas_target_exists,**
**import_zip_missing}** — runtime-side project-switch
validation errors that surface via ProjectSwitchFailed.
## Catalog start-up ordering
`main.rs` now calls `friendly::catalog()` at the very top
(before args parsing) so `help_text()` works in both the
success path and the args-error path. A corrupted build
artefact still fails loudly with a useful panic; the
practical risk is essentially zero since the catalog is
`include_str!`'d at compile time and validated by the unit
test before shipping.
## Remaining literals
The only `note_*` calls in `src/` that still pass plain
strings are inside `#[cfg(test)]` modules — synthetic test
fixtures, not user-visible. The codebase passes the "every
user-visible string flows through the catalog" bar.
## Tally
610 tests passing (no change in count — pure refactor).
Clippy clean with nursery lints.
## What this closes
ADR-0019 §9 (migration sweep) — done.
ADR-0019 itself is now fully implemented:
- §1-§5: catalog + translator + voice + verbosity ✓ (`eac7e5b`)
- §6: row pinpointing + schema enrichment ✓ (`431645a`)
- §9: migration sweep ✓ (this + `aff528a`)
- §10: anchor phrases preserved throughout ✓
- The five "Out of scope" items remain explicitly bounded
to future ADRs (advanced-mode SQL, settings persistence,
pluralisation, runtime locale, value formatting,
constraint management).
This commit is contained in:
@@ -118,6 +118,9 @@ pub const KEYS_AND_PLACEHOLDERS: &[(&str, &[&str])] = &[
|
||||
"error.type_mismatch.update.hint",
|
||||
&["table", "column", "expected_type"],
|
||||
),
|
||||
// ---- Help text ----
|
||||
("help.cli_banner", &[]),
|
||||
("help.in_app_body", &[]),
|
||||
// ---- Parse error rendering ----
|
||||
("parse.caret", &["padding"]),
|
||||
("parse.empty", &[]),
|
||||
@@ -128,10 +131,27 @@ pub const KEYS_AND_PLACEHOLDERS: &[(&str, &[&str])] = &[
|
||||
("project.export_usage", &[]),
|
||||
("project.import_empty_target", &[]),
|
||||
("project.import_usage", &[]),
|
||||
("project.import_zip_missing", &["path"]),
|
||||
("project.load_path_missing", &["path"]),
|
||||
("project.saveas_target_exists", &["path"]),
|
||||
("project.rebuild_failed", &["error"]),
|
||||
("project.rebuild_ok", &["summary"]),
|
||||
("project.switch_failed", &["error"]),
|
||||
("project.switched_ok", &["display_name"]),
|
||||
// ---- Advanced-mode placeholder ----
|
||||
("advanced_mode.not_implemented", &["input"]),
|
||||
// ---- DSL failure wrapper / running echo ----
|
||||
("dsl.failed", &["verb", "subject", "rendered"]),
|
||||
("dsl.running", &["input"]),
|
||||
// ---- Persistence-fatal banner ----
|
||||
("fatal.persistence", &["operation", "path", "message"]),
|
||||
// ---- Modal labels ----
|
||||
("modal.generic_cancelled", &["title"]),
|
||||
("modal.load_cancelled", &[]),
|
||||
("modal.load_picker_nothing", &[]),
|
||||
("modal.path_entry_empty_name", &[]),
|
||||
("modal.path_entry_empty_path", &[]),
|
||||
("modal.rebuild_cancelled", &[]),
|
||||
// ---- mode / messages banners ----
|
||||
("messages.set_short", &[]),
|
||||
("messages.set_verbose", &[]),
|
||||
|
||||
Reference in New Issue
Block a user