Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

Sketch: the status line after a dimension is in the interface language (#8863) (#8879)

HiroKenEzcc047a29c1d9
diff --git a/assets/locales/pending/dimension-applied-status.json b/assets/locales/pending/dimension-applied-status.json
new file mode 100644
index 0000000000..76cd589d67
--- /dev/null
+++ b/assets/locales/pending/dimension-applied-status.json
@@ -0,0 +1,56 @@
+{
+ "ar": {
+ "sketch.dimension_added_driven": "الرسم يحدد هذا البُعد بالفعل، لذا أُضيف بُعدًا مُشتقًا (مرجعيًا)",
+ "sketch.dimension_applied": "تم تطبيق البُعد",
+ "sketch.dimension_applied_defined": "تم تطبيق البُعد؛ تم تعريف المعامل `{name}`",
+ "sketch.dimension_applied_renamed": "تم تطبيق البُعد؛ أصبح اسم المعامل `{name}`"
+ },
+ "de": {
+ "sketch.dimension_added_driven": "Die Skizze legt dieses Maß bereits fest, daher wurde es als abhängiges Maß (Referenzmaß) hinzugefügt",
+ "sketch.dimension_applied": "Maß angewendet",
+ "sketch.dimension_applied_defined": "Maß angewendet; Parameter `{name}` definiert",
+ "sketch.dimension_applied_renamed": "Maß angewendet; der Parameter heißt jetzt `{name}`"
+ },
+ "en": {
+ "sketch.dimension_added_driven": "The sketch already determines that dimension, so it was added as a driven (reference) dimension",
+ "sketch.dimension_applied": "Dimension applied",
+ "sketch.dimension_applied_defined": "Dimension applied; parameter `{name}` defined",
+ "sketch.dimension_applied_renamed": "Dimension applied; parameter named `{name}`"
+ },
+ "he": {
+ "sketch.dimension_added_driven": "הסקיצה כבר קובעת את המידה הזו, ולכן היא נוספה כמידה מונעת (מידת ייחוס)",
+ "sketch.dimension_applied": "המידה הוחלה",
+ "sketch.dimension_applied_defined": "המידה הוחלה; הפרמטר `{name}` הוגדר",
+ "sketch.dimension_applied_renamed": "המידה הוחלה; שם הפרמטר הוא כעת `{name}`"
+ },
+ "ja": {
+ "sketch.dimension_added_driven": "スケッチがすでにその寸法を決めているため、従動寸法(参照寸法)として追加しました",
+ "sketch.dimension_applied": "寸法を適用しました",
+ "sketch.dimension_applied_defined": "寸法を適用しました。パラメータ `{name}` を定義しました",
+ "sketch.dimension_applied_renamed": "寸法を適用しました。パラメータ名を `{name}` にしました"
+ },
+ "ko": {
+ "sketch.dimension_added_driven": "스케치가 이미 이 치수를 결정하므로 종속(참조) 치수로 추가했습니다",
+ "sketch.dimension_applied": "치수를 적용했습니다",
+ "sketch.dimension_applied_defined": "치수를 적용했습니다. 매개변수 `{name}`을(를) 정의했습니다",
+ "sketch.dimension_applied_renamed": "치수를 적용했습니다. 매개변수 이름을 `{name}`(으)로 지정했습니다"
+ },
+ "pl": {
+ "sketch.dimension_added_driven": "Szkic już określa ten wymiar, więc dodano go jako wymiar sterowany (referencyjny)",
+ "sketch.dimension_applied": "Wymiar zastosowany",
+ "sketch.dimension_applied_defined": "Wymiar zastosowany; zdefiniowano parametr `{name}`",
+ "sketch.dimension_applied_renamed": "Wymiar zastosowany; parametr nazywa się teraz `{name}`"
+ },
+ "vi": {
+ "sketch.dimension_added_driven": "Bản phác thảo đã xác định kích thước đó, nên nó được thêm vào dưới dạng kích thước tham chiếu",
+ "sketch.dimension_applied": "Đã áp dụng kích thước",
+ "sketch.dimension_applied_defined": "Đã áp dụng kích thước; đã định nghĩa tham số `{name}`",
+ "sketch.dimension_applied_renamed": "Đã áp dụng kích thước; tham số được đặt tên là `{name}`"
+ },
+ "zh": {
+ "sketch.dimension_added_driven": "草图已确定该尺寸,因此已将其添加为被驱动(参考)尺寸",
+ "sketch.dimension_applied": "已应用尺寸",
+ "sketch.dimension_applied_defined": "已应用尺寸;已定义参数 `{name}`",
+ "sketch.dimension_applied_renamed": "已应用尺寸;参数已命名为 `{name}`"
+ }
+}
diff --git a/crates/ui-egui/src/dim_view.rs b/crates/ui-egui/src/dim_view.rs
index bc5db1c7df..383d6e1591 100644
--- a/crates/ui-egui/src/dim_view.rs
+++ b/crates/ui-egui/src/dim_view.rs
@@ -150,7 +150,7 @@ pub fn begin_dimension(app: &mut SolveApp, entities: Vec<String>, at: Vec2) -> R
if draft.driven {
PLACEMENT.with(|preview| *preview.borrow_mut() = None);
app.run("sketch.dimension", json!({"entities": draft.entities, "text_at": [at.x, at.y], "driven": true}))?;
- app.set_status("The sketch already determines that dimension, so it was added as a driven (reference) dimension", false);
+ app.set_status(crate::i18n::tr("sketch.dimension_added_driven"), false);
return Ok(());
}
EDIT.with(|edit| {
@@ -952,12 +952,14 @@ fn edit_box(app: &mut SolveApp, ctx: &egui::Context) {
Ok(reply) => {
clear_picks(app);
// A new dimension defines its parameter; an edited one renames its own (#4071).
+ // The sentence comes from the catalog, so it reads in the interface language (#8863).
let named = reply.get("renamed").and_then(|r| r.get("to")).and_then(serde_json::Value::as_str);
- match (reply.get("defined").and_then(serde_json::Value::as_str), named) {
- (Some(name), _) => app.set_status(format!("Dimension applied; parameter `{name}` defined"), false),
- (None, Some(name)) => app.set_status(format!("Dimension applied; parameter named `{name}`"), false),
- (None, None) => app.set_status("Dimension applied", false),
- }
+ let status = match (reply.get("defined").and_then(serde_json::Value::as_str), named) {
+ (Some(name), _) => crate::i18n::format("sketch.dimension_applied_defined", &[("name", name)]),
+ (None, Some(name)) => crate::i18n::format("sketch.dimension_applied_renamed", &[("name", name)]),
+ (None, None) => crate::i18n::tr("sketch.dimension_applied").to_string(),
+ };
+ app.set_status(status, false);
}
}
}
diff --git a/crates/ui-egui/src/dimension_create_ui_tests.rs b/crates/ui-egui/src/dimension_create_ui_tests.rs
index d47072ee44..7484dd234f 100644
--- a/crates/ui-egui/src/dimension_create_ui_tests.rs
+++ b/crates/ui-egui/src/dimension_create_ui_tests.rs
@@ -1299,3 +1299,53 @@ fn editing_a_dimension_to_a_definition_names_its_parameter() {
let sk = doc.sketch(h.app.session.active_sketch.unwrap()).unwrap();
assert!(sk.constraints.iter().any(|c| c.param.as_deref() == Some("width") && c.kind.value().is_some_and(|v| (v - 30.0).abs() < 1e-6)));
}
+
+/// The status line after a dimension is applied reads in the interface language (#8863): a
+/// new parameter (`w = 40/2`), a plain value, a renamed parameter and a driven dimension, with
+/// the parameter name kept as typed.
+#[test]
+fn the_status_after_a_dimension_is_in_the_interface_language() {
+ let pl = crate::i18n::Locale::for_language("pl");
+ let en = crate::i18n::Locale::for_language("en");
+ let status = |h: &Harness| h.app.status.as_ref().map(|s| (s.0.clone(), s.2));
+ let polish = |mut h: Harness| {
+ h.app.preferences.language = "pl".into();
+ h.frames(2);
+ h
+ };
+ // A new parameter.
+ let mut h = polish(line([25., 0.]));
+ place(&mut h, &[[12.5, 0.]], [12.5, 8.]);
+ type_value(&mut h, "w = 40/2");
+ h.step(&json!({"key":"Enter"})).unwrap();
+ assert!(h.app.session.doc.param("w").is_some(), "{:?}", h.app.status);
+ assert_eq!(status(&h), Some(("Wymiar zastosowany; zdefiniowano parametr `w`".to_string(), false)));
+ // A plain value, then the same dimension renamed to `width = 30`.
+ let mut h = polish(line([25., 0.]));
+ place(&mut h, &[[12.5, 0.]], [12.5, 8.]);
+ type_value(&mut h, "25");
+ h.step(&json!({"key":"Enter"})).unwrap();
+ assert_eq!(status(&h), Some((pl.text("sketch.dimension_applied").to_string(), false)));
+ h.settle();
+ crate::dim_view::edit_param(&h.app, "d1");
+ h.settle();
+ type_value(&mut h, "width = 30");
+ h.step(&json!({"key":"Enter"})).unwrap();
+ assert!(h.app.session.doc.param("width").is_some(), "{:?}", h.app.status);
+ assert_eq!(status(&h), Some((pl.format("sketch.dimension_applied_renamed", &[("name", "width")]), false)));
+ // A dimension the sketch already determines is added as a driven one.
+ let mut h = polish(line([20., 0.]));
+ h.app.run("sketch.dimension", json!({"entities":["l1"],"value":"20 mm"})).unwrap();
+ h.settle();
+ h.step(&json!({"start":"sketch.dimension"})).unwrap();
+ h.step(&json!({"click":{"world":[10,0,0]}})).unwrap();
+ h.step(&json!({"move":{"world":[10,6,0]}})).unwrap();
+ h.settle();
+ h.step(&json!({"click":{"world":[10,6,0]}})).unwrap();
+ assert!(!crate::dim_view::editing(), "a driven dimension has no value to edit");
+ assert_eq!(status(&h), Some((pl.text("sketch.dimension_added_driven").to_string(), false)));
+ for id in ["sketch.dimension_applied", "sketch.dimension_applied_defined", "sketch.dimension_applied_renamed", "sketch.dimension_added_driven"] {
+ assert_ne!(pl.text(id), en.text(id), "{id}: the Polish catalog translates it");
+ }
+ crate::dim_view::cancel();
+}