diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-03-25 12:29:06 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-03-25 12:29:06 +0400 |
| commit | 69265961749780e252e144d1f815c0fdda435b8a (patch) | |
| tree | afe54648b63dc0f9746d38cff81de247ca0ddf98 /source/blender/editors/object | |
| parent | 1b4c9e1ad40142fbf6a2d97303661a78527c134b (diff) | |
More new data names translation (most cases should be covered now).
Also done a few cleanup here and there...
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 16 | ||||
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 63582feadb7..b33c7212f0e 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -452,7 +452,7 @@ static int effector_add_exec(bContext *C, wmOperator *op) if (!ob) return OPERATOR_CANCELLED; - rename_id(&ob->id, DATA_("CurveGuide")); + rename_id(&ob->id, CTX_DATA_(BLF_I18NCONTEXT_ID_OBJECT, "CurveGuide")); ((Curve *)ob->data)->flag |= CU_PATH | CU_3D; ED_object_editmode_enter(C, 0); ED_object_new_primitive_matrix(C, ob, loc, rot, mat, FALSE); @@ -465,7 +465,7 @@ static int effector_add_exec(bContext *C, wmOperator *op) if (!ob) return OPERATOR_CANCELLED; - rename_id(&ob->id, DATA_("Field")); + rename_id(&ob->id, CTX_DATA_(BLF_I18NCONTEXT_ID_OBJECT, "Field")); if (ELEM(type, PFIELD_WIND, PFIELD_VORTEX)) ob->empty_drawtype = OB_SINGLE_ARROW; } @@ -822,13 +822,13 @@ void OBJECT_OT_drop_named_image(wmOperatorType *ot) static const char *get_lamp_defname(int type) { switch (type) { - case LA_LOCAL: return DATA_("Point"); - case LA_SUN: return DATA_("Sun"); - case LA_SPOT: return DATA_("Spot"); - case LA_HEMI: return DATA_("Hemi"); - case LA_AREA: return DATA_("Area"); + case LA_LOCAL: return CTX_DATA_(BLF_I18NCONTEXT_ID_LAMP, "Point"); + case LA_SUN: return CTX_DATA_(BLF_I18NCONTEXT_ID_LAMP, "Sun"); + case LA_SPOT: return CTX_DATA_(BLF_I18NCONTEXT_ID_LAMP, "Spot"); + case LA_HEMI: return CTX_DATA_(BLF_I18NCONTEXT_ID_LAMP, "Hemi"); + case LA_AREA: return CTX_DATA_(BLF_I18NCONTEXT_ID_LAMP, "Area"); default: - return DATA_("Lamp"); + return CTX_DATA_(BLF_I18NCONTEXT_ID_LAMP, "Lamp"); } } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 5abbb7124c0..bdf04dcd20d 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -52,6 +52,8 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BLF_translation.h" + #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_deform.h" @@ -135,7 +137,7 @@ bDeformGroup *ED_vgroup_add_name(Object *ob, const char *name) bDeformGroup *ED_vgroup_add(Object *ob) { - return ED_vgroup_add_name(ob, "Group"); + return ED_vgroup_add_name(ob, DATA_("Group")); } void ED_vgroup_delete(Object *ob, bDeformGroup *defgroup) |