griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

I18n: Extract and disambiguate a few messages

Browse Source 
Extract
- Cycles denoiser enum.
- Extensions user preferences UI.
- Node operator poll message from new node function.

Improve
- Split "(Enabled|Disabled) on startup, overriding the preference."
into two messages.

Disambiguate
- "Add" when describing the action of adding something should use the
  Operator context.
- "Dimensions", in noise textures.
- "Transform" as a noun, the matrix transform type of Geometry Nodes,
  as opposed to the verb to move things in space.
- "Parent" as a noun or verb (the parent of an object, to parent an
  object to another).

Some issues reported by Satoshi Yamasaki, deathblood, and Gabriel Gazzán.

Pull Request: https://projects.blender.org/blender/blender/pulls/122969
This commit is contained in:
Damien Picard
2024-06-13 12:15:55 +02:00
committed by Bastien Montagne
parent 77a69d04f2
commit f87d4e4e40
21 changed files with 106 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/animation/keyframing.cc
View File

@@ -767,7 +767,7 @@ static int clear_anim_v3d_invoke(bContext *C, wmOperator *op, const wmEvent * /*
op,
IFACE_("Remove animation from selected objects?"),
nullptr,
IFACE_("Remove"),
CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove"),
ALERT_ICON_NONE,
false);
}

10
source/blender/editors/geometry/geometry_attributes.cc
View File

@@ -279,7 +279,8 @@ static int geometry_attribute_add_invoke(bContext *C, wmOperator *op, const wmEv
if (!RNA_property_is_set(op->ptr, prop)) {
RNA_property_string_set(op->ptr, prop, DATA_("Attribute"));
}
return WM_operator_props_popup_confirm_ex(C, op, event, IFACE_("Add Attribute"), IFACE_("Add"));
return WM_operator_props_popup_confirm_ex(
C, op, event, IFACE_("Add Attribute"), CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Add"));
}
void GEOMETRY_OT_attribute_add(wmOperatorType *ot)
@@ -399,8 +400,11 @@ static int geometry_color_attribute_add_invoke(bContext *C, wmOperator *op, cons
if (!RNA_property_is_set(op->ptr, prop)) {
RNA_property_string_set(op->ptr, prop, DATA_("Color"));
}
return WM_operator_props_popup_confirm_ex(
C, op, event, IFACE_("Add Color Attribute"), IFACE_("Add"));
return WM_operator_props_popup_confirm_ex(C,
op,
event,
IFACE_("Add Color Attribute"),
CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Add"));
}
enum class ConvertAttributeMode {

6
source/blender/editors/gpencil_legacy/gpencil_utils.cc
View File

@@ -3430,7 +3430,11 @@ int ED_gpencil_new_layer_dialog(bContext *C, wmOperator *op)
bGPdata *gpd = static_cast<bGPdata *>(ob->data);
gpencil_layer_new_name_get(gpd, name, sizeof(name));
RNA_property_string_set(op->ptr, prop, name);
return WM_operator_props_dialog_popup(C, op, 200, IFACE_("Add New Layer"), IFACE_("Add"));
return WM_operator_props_dialog_popup(C,
op,
200,
IFACE_("Add New Layer"),
CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Add"));
}
}
return 0;

7
source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
View File

@@ -71,8 +71,11 @@ static int grease_pencil_layer_add_exec(bContext *C, wmOperator *op)
static int grease_pencil_layer_add_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
return WM_operator_props_popup_confirm_ex(
C, op, event, IFACE_("Add New Grease Pencil Layer"), IFACE_("Add"));
return WM_operator_props_popup_confirm_ex(C,
op,
event,
IFACE_("Add New Grease Pencil Layer"),
CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Add"));
}
static void GREASE_PENCIL_OT_layer_add(wmOperatorType *ot)

11
source/blender/editors/object/object_add.cc
View File

@@ -2964,11 +2964,12 @@ void OBJECT_OT_duplicates_make_real(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
RNA_def_boolean(ot->srna,
"use_base_parent",
false,
"Parent",
"Parent newly created objects to the original instancer");
ot->prop = RNA_def_boolean(ot->srna,
"use_base_parent",
false,
"Parent",
"Parent newly created objects to the original instancer");
RNA_def_property_translation_context(ot->prop, BLT_I18NCONTEXT_OPERATOR_DEFAULT);
RNA_def_boolean(
ot->srna, "use_hierarchy", false, "Keep Hierarchy", "Maintain parent child relationships");
}

3
source/blender/editors/sculpt_paint/paint_image_proj.cc
View File

@@ -6835,7 +6835,8 @@ static int texture_paint_add_texture_paint_slot_invoke(bContext *C,
default_paint_slot_color_get(type, ma, color);
RNA_float_set_array(op->ptr, "color", color);
return WM_operator_props_dialog_popup(C, op, 300, IFACE_("Add Paint Slot"), IFACE_("Add"));
return WM_operator_props_dialog_popup(
C, op, 300, IFACE_("Add Paint Slot"), CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Add"));
}
static void texture_paint_add_texture_paint_slot_ui(bContext *C, wmOperator *op)

6
source/blender/editors/space_image/image_ops.cc
View File

@@ -4257,7 +4257,11 @@ static int tile_add_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*
RNA_int_set(op->ptr, "count", 1);
RNA_string_set(op->ptr, "label", "");
return WM_operator_props_dialog_popup(C, op, 300, IFACE_("Add Tile to Image"), IFACE_("Add"));
return WM_operator_props_dialog_popup(C,
op,
300,
IFACE_("Add Tile to Image"),
CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Add"));
}
static void tile_add_draw(bContext * /*C*/, wmOperator *op)

2
source/blender/editors/space_node/node_templates.cc
View File

@@ -635,7 +635,7 @@ static void ui_template_node_link_menu(bContext *C, uiLayout *layout, void *but_
but = uiDefBut(block,
UI_BTYPE_BUT,
0,
IFACE_("Remove"),
CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove"),
0,
0,
UI_UNIT_X * 4,

1
source/blender/makesrna/intern/rna_brush.cc
View File

@@ -2248,6 +2248,7 @@ static void rna_def_curves_sculpt_options(BlenderRNA *brna)
RNA_def_property_enum_items(prop, density_mode_items);
RNA_def_property_ui_text(
prop, "Density Mode", "Determines whether the brush adds or removes curves");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_OPERATOR_DEFAULT);
prop = RNA_def_property(srna, "curve_parameter_falloff", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "CurveMapping");

5
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -5039,6 +5039,7 @@ static void def_sh_tex_noise(StructRNA *srna)
RNA_def_property_enum_sdna(prop, nullptr, "dimensions");
RNA_def_property_enum_items(prop, rna_enum_node_tex_dimensions_items);
RNA_def_property_ui_text(prop, "Dimensions", "Number of dimensions to output noise for");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_TEXTURE);
RNA_def_property_update(prop, 0, "rna_ShaderNode_socket_update");
prop = RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
@@ -5155,6 +5156,7 @@ static void def_sh_tex_voronoi(StructRNA *srna)
RNA_def_property_enum_sdna(prop, nullptr, "dimensions");
RNA_def_property_enum_items(prop, rna_enum_node_tex_dimensions_items);
RNA_def_property_ui_text(prop, "Dimensions", "Number of dimensions to output noise for");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_TEXTURE);
RNA_def_property_update(prop, 0, "rna_ShaderNode_socket_update");
prop = RNA_def_property(srna, "distance", PROP_ENUM, PROP_NONE);
@@ -5250,6 +5252,7 @@ static void def_sh_tex_white_noise(StructRNA *srna)
RNA_def_property_enum_sdna(prop, nullptr, "custom1");
RNA_def_property_enum_items(prop, rna_enum_node_tex_dimensions_items);
RNA_def_property_ui_text(prop, "Dimensions", "Number of dimensions to output noise for");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_TEXTURE);
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update");
}
@@ -8564,6 +8567,7 @@ static void def_cmp_cryptomatte_common(StructRNA *srna)
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_text(
prop, "Add", "Add object or material to matte, by picking a color from the Pick output");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_OPERATOR_DEFAULT);
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeCryptomatte_update_add");
prop = RNA_def_property(srna, "remove", PROP_FLOAT, PROP_COLOR);
@@ -8574,6 +8578,7 @@ static void def_cmp_cryptomatte_common(StructRNA *srna)
prop,
"Remove",
"Remove object or material from matte, by picking a color from the Pick output");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_OPERATOR_DEFAULT);
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeCryptomatte_update_remove");
}

2
source/blender/modifiers/intern/MOD_nodes.cc
View File

@@ -2242,7 +2242,7 @@ static void draw_named_attributes_panel(uiLayout *layout, NodesModifierData &nmd
usages.append(IFACE_("Write"));
}
if ((usage & geo_log::NamedAttributeUsage::Remove) != geo_log::NamedAttributeUsage::None) {
usages.append(IFACE_("Remove"));
usages.append(CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove"));
}
for (const int i : usages.index_range()) {
ss << usages[i];

5
source/blender/nodes/geometry/nodes/node_geo_get_named_grid.cc
View File

@@ -7,6 +7,8 @@
#include "BKE_volume.hh"
#include "BKE_volume_grid.hh"
#include "BLT_translation.hh"
#include "RNA_enum_types.hh"
#include "NOD_rna_define.hh"
@@ -20,7 +22,8 @@ static void node_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Geometry>("Volume");
b.add_input<decl::String>("Name");
b.add_input<decl::Bool>("Remove").default_value(true);
b.add_input<decl::Bool>("Remove").default_value(true).translation_context(
BLT_I18NCONTEXT_OPERATOR_DEFAULT);
b.add_output<decl::Geometry>("Volume");