Repository navigation
Conversation
… too The script error for answers left in `answers` and Liquify's warning about objects under the brush that it left as they were built their singular by adding an empty suffix, so no catalog template could match the singular form, and neither message had a catalog row for either count. - Both messages are now built from complete singular and plural English sentences; `it was` and `they were` are part of the sentence. The English the commands return does not change. - Every complete-message catalog has an `@msgplural` row for each, with the language's own count forms. The tool name and the list of kinds stay as written.
|
No actionable comments were generated in the recent review. Walkthrough
Merge Risk:
|
What and why
Two messages built their singular by adding an empty suffix to a word: the script error for answers left in
answers(crates/engine/src/script/mod.rs) and the warningobject.liquifygives when it leaves objects under the brush as they were (crates/engine/src/cmd/distortcmds.rs). A catalog placeholder never matches empty text, so a template written with the suffix could not match the singular, and neither message had a catalog row for either count. Both stayed English in every language.it wasandthey wereare part of the sentence instead of a separate argument. The English the commands return does not change.@msgpluralrow for each message, with the language's own count forms (three in Czech, Polish, Russian and Ukrainian, one in Japanese, Korean, Chinese, Georgian, Hungarian, Turkish and Vietnamese, two in the others). The Liquify tool name and the list of kinds stay in English, as they are onmain, since no catalog translates them as messages.docs/target-app-parity.mdhas one line for it.No public documentation covers these messages; their wording and translation are VectorCraft's own.
How it was tested
New tests:
i18n::tests::messages_with_one_or_several_items_translate_in_every_complete_catalog(vectorcraft-ui-egui): for 1, 2 and 5 answers and skipped objects, every complete-message catalog shows the message translated with its count and without the English words the test lists (answer, did, use, left, brush, was, they, were, reshapes, paths, only), and Czech uses its one, few and other forms. It fails without the change (removing the Czechanswersrow fails it oncswith the English shown).tests::script_dialogs::unused_answers_are_counted_in_the_singular_and_the_pluralandtests::distort::liquify_warns_about_one_or_several_skipped_objects(vectorcraft-engine): the exact English for one and two answers and for one and two skipped type objects. They pass onmaintoo, since the English is unchanged.Focused checks on the final tree, on Linux. The branch is one commit on
mainat1e4e3534f5and merges cleanly with it.cargo test -p vectorcraft-enginefiltered to the two new tests: 2 passed.cargo test -p vectorcraft-ui-egui --lib i18n: 116 passed.cargo clippy -p vectorcraft-engine --all-targets -- -D warningsandcargo clippy -p vectorcraft-ui-egui --all-targets -- -D warnings: exit 0, no lint warnings.cargo check --workspace --tests: passes.cargo xtask brands(no vendor names),layers(30 crates) andassets(337 files): pass.After merging
mainat8f8956f385, where Danish became a complete-message language, the branch adds the Danish rows for both messages (1bbca6efb5). On that head,cargo test -p vectorcraft-ui-egui --lib i18n(125 passed),cargo fmt --all -- --checkandcargo check --workspace --testspass.cargo fmt --all -- --checkreports onlycrates/svg/src/lib.rs:491, which this branch does not touch; it is unformatted onmainat1e4e3534f5, and open fmt: format crates/svg/src/lib.rs #7400 and Fix main CI after the craft-libs migration (fmt, wasm) #7407 format it.cargo xtask ciruns in this pull request's CI.It conflicts with open #7116, #7137, #7211 and #7399 in
crates/ui-egui/src/i18n/tests.rs, and with open #7353 indocs/target-app-parity.md.Checklist
cargo xtask cipasses (fmt, clippy, tests, assets, brands, layers, wasm).unwrap(),expect(),panic!,unreachable!,todo!orunimplemented!outside tests, and no unchecked indexing on data from files, parameters ormessages. Errors are returned as
Resultand shown to the user(why and how).
ASSETS.md.Summary by CodeRabbit