From cf069afdfd11d8200a57cf8a4307d0e664ac4ecc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 5 May 2014 15:09:29 +1000 Subject: Fix: T40016 ID Names translated in menus --- source/blender/editors/animation/anim_markers.c | 1 + source/blender/editors/object/object_add.c | 8 ++++++-- source/blender/editors/object/object_group.c | 1 + source/blender/editors/object/object_relations.c | 1 + source/blender/editors/sculpt_paint/paint_image_proj.c | 1 + source/blender/editors/space_nla/nla_edit.c | 1 + source/blender/editors/space_outliner/outliner_tools.c | 1 + source/blender/editors/space_sequencer/sequencer_add.c | 4 +++- 8 files changed, 15 insertions(+), 3 deletions(-) diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index d5a395cc58c..04363f61fd6 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -1418,6 +1418,7 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); RNA_def_enum_funcs(prop, RNA_scene_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 081da7c2c18..eaa89583bb6 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -984,6 +984,8 @@ static int group_instance_add_exec(bContext *C, wmOperator *op) /* only used as menu */ void OBJECT_OT_group_instance_add(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Add Group Instance"; ot->description = "Add a dupligroup instance"; @@ -999,8 +1001,10 @@ void OBJECT_OT_group_instance_add(wmOperatorType *ot) /* properties */ RNA_def_string(ot->srna, "name", "Group", MAX_ID_NAME - 2, "Name", "Group name to add"); - ot->prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); - RNA_def_enum_funcs(ot->prop, RNA_group_itemf); + prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); + RNA_def_enum_funcs(prop, RNA_group_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); + ot->prop = prop; ED_object_add_generic_props(ot, false); } diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index 5bd057f2922..6c69fce8a8f 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -527,6 +527,7 @@ void OBJECT_OT_group_link(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); RNA_def_enum_funcs(prop, RNA_group_local_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index f7da53f3e79..cd6fd54e72e 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1660,6 +1660,7 @@ void OBJECT_OT_make_links_scene(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); RNA_def_enum_funcs(prop, RNA_scene_local_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 8db21c9fffd..492857bd0bb 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4390,6 +4390,7 @@ void PAINT_OT_project_image(wmOperatorType *ot) prop = RNA_def_enum(ot->srna, "image", DummyRNA_NULL_items, 0, "Image", ""); RNA_def_enum_funcs(prop, RNA_image_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 4eea5de616c..328e0b69707 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -563,6 +563,7 @@ void NLA_OT_actionclip_add(wmOperatorType *ot) // TODO: this would be nicer as an ID-pointer... prop = RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, "Action", ""); RNA_def_enum_funcs(prop, RNA_action_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 5faa7b9cee9..8f5e2ad3693 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1067,6 +1067,7 @@ void OUTLINER_OT_action_set(wmOperatorType *ot) // TODO: this would be nicer as an ID-pointer... prop = RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, "Action", ""); RNA_def_enum_funcs(prop, RNA_action_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index edae81a9165..8fe9dbe3eb9 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -317,6 +317,7 @@ void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot) sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); prop = RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); RNA_def_enum_funcs(prop, RNA_scene_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } @@ -409,7 +410,7 @@ void SEQUENCER_OT_movieclip_strip_add(struct wmOperatorType *ot) sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); prop = RNA_def_enum(ot->srna, "clip", DummyRNA_NULL_items, 0, "Clip", ""); RNA_def_enum_funcs(prop, RNA_movieclip_itemf); - RNA_def_property_translation_context(prop, BLF_I18NCONTEXT_ID_MOVIECLIP); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } @@ -502,6 +503,7 @@ void SEQUENCER_OT_mask_strip_add(struct wmOperatorType *ot) sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); prop = RNA_def_enum(ot->srna, "mask", DummyRNA_NULL_items, 0, "Mask", ""); RNA_def_enum_funcs(prop, RNA_mask_itemf); + RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } -- cgit v1.2.3