From 00d9d58d77e538cede250496dfeb997e66a6e2aa Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Thu, 5 Jun 2025 18:54:21 +0200 Subject: [PATCH] I18n: Fix strange report formattings A few reports used string formatting in a way which made translation awkward, by splitting the message into several individually translated submessages, instead of just one message with formatting markers. Pull Request: https://projects.blender.org/blender/blender/pulls/139895 --- source/blender/editors/object/object_add.cc | 18 ++++++++---------- .../blender/editors/object/object_transform.cc | 11 +++++------ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index 57a78bbb96c..b4830f98fb4 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -4227,18 +4227,16 @@ static wmOperatorStatus object_convert_exec(bContext *C, wmOperator *op) if (incompatible_count == selected_editable_bases.size()) { BKE_reportf(op->reports, RPT_INFO, - "%s \"%s\"", - RPT_("None of the objects are compatible of conversion to"), - IFACE_(target_type_name)); + "None of the objects are compatible with a conversion to \"%s\"", + RPT_(target_type_name)); } else { - BKE_reportf(op->reports, - RPT_INFO, - "%s %d %s \"%s\"", - RPT_("The selection included"), - incompatible_count, - RPT_("object(s) types which don't support conversion to"), - IFACE_(target_type_name)); + BKE_reportf( + op->reports, + RPT_INFO, + "The selection included %d object type(s) which do not support conversion to \"%s\"", + incompatible_count, + RPT_(target_type_name)); } } diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index e21e49e9ecf..14fafdc8d1e 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -835,12 +835,11 @@ static wmOperatorStatus apply_objects_internal(bContext *C, /* correct for scale, note mul_m3_m3m3 has swapped args! */ BKE_object_scale_to_mat3(ob, tmat); if (!invert_m3_m3(timat, tmat)) { - BKE_reportf(reports, - RPT_WARNING, - "%s \"%s\" %s", - RPT_("Object"), - ob->id.name + 2, - RPT_("have non-invertable transformation matrix, not applying transform.")); + BKE_reportf( + reports, + RPT_WARNING, + "Object \"%s\" has a non-invertible transformation matrix, not applying transform", + ob->id.name + 2); has_non_invertable_matrix = true; continue; }