From 04bc61a0d58267d3018b478b79fbd09e5920b629 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 16 May 2012 15:01:46 +0000 Subject: Nodes i18n: don't call gettext stuff twice for categories' names, when building Add menu. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now ui-names in foreach_nodeclass functions are only marked as translatable, it’s up to the callback to actually translate them or not! --- source/blender/nodes/composite/node_composite_tree.c | 20 ++++++++++---------- source/blender/nodes/shader/node_shader_tree.c | 18 +++++++++--------- source/blender/nodes/texture/node_texture_tree.c | 18 +++++++++--------- 3 files changed, 28 insertions(+), 28 deletions(-) (limited to 'source/blender/nodes') diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index b526c25e2dc..41b1204fba4 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -72,16 +72,16 @@ static void foreach_nodetree(Main *main, void *calldata, bNodeTreeCallback func) static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func) { - func(calldata, NODE_CLASS_INPUT, IFACE_("Input")); - func(calldata, NODE_CLASS_OUTPUT, IFACE_("Output")); - func(calldata, NODE_CLASS_OP_COLOR, IFACE_("Color")); - func(calldata, NODE_CLASS_OP_VECTOR, IFACE_("Vector")); - func(calldata, NODE_CLASS_OP_FILTER, IFACE_("Filter")); - func(calldata, NODE_CLASS_CONVERTOR, IFACE_("Convertor")); - func(calldata, NODE_CLASS_MATTE, IFACE_("Matte")); - func(calldata, NODE_CLASS_DISTORT, IFACE_("Distort")); - func(calldata, NODE_CLASS_GROUP, IFACE_("Group")); - func(calldata, NODE_CLASS_LAYOUT, IFACE_("Layout")); + func(calldata, NODE_CLASS_INPUT, N_("Input")); + func(calldata, NODE_CLASS_OUTPUT, N_("Output")); + func(calldata, NODE_CLASS_OP_COLOR, N_("Color")); + func(calldata, NODE_CLASS_OP_VECTOR, N_("Vector")); + func(calldata, NODE_CLASS_OP_FILTER, N_("Filter")); + func(calldata, NODE_CLASS_CONVERTOR, N_("Convertor")); + func(calldata, NODE_CLASS_MATTE, N_("Matte")); + func(calldata, NODE_CLASS_DISTORT, N_("Distort")); + func(calldata, NODE_CLASS_GROUP, N_("Group")); + func(calldata, NODE_CLASS_LAYOUT, N_("Layout")); } static void free_node_cache(bNodeTree *UNUSED(ntree), bNode *node) diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 716d31a8cd1..4794a66d064 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -80,19 +80,19 @@ static void foreach_nodetree(Main *main, void *calldata, bNodeTreeCallback func) static void foreach_nodeclass(Scene *scene, void *calldata, bNodeClassCallback func) { - func(calldata, NODE_CLASS_INPUT, IFACE_("Input")); - func(calldata, NODE_CLASS_OUTPUT, IFACE_("Output")); + func(calldata, NODE_CLASS_INPUT, N_("Input")); + func(calldata, NODE_CLASS_OUTPUT, N_("Output")); if (BKE_scene_use_new_shading_nodes(scene)) { - func(calldata, NODE_CLASS_SHADER, IFACE_("Shader")); - func(calldata, NODE_CLASS_TEXTURE, IFACE_("Texture")); + func(calldata, NODE_CLASS_SHADER, N_("Shader")); + func(calldata, NODE_CLASS_TEXTURE, N_("Texture")); } - func(calldata, NODE_CLASS_OP_COLOR, IFACE_("Color")); - func(calldata, NODE_CLASS_OP_VECTOR, IFACE_("Vector")); - func(calldata, NODE_CLASS_CONVERTOR, IFACE_("Convertor")); - func(calldata, NODE_CLASS_GROUP, IFACE_("Group")); - func(calldata, NODE_CLASS_LAYOUT, IFACE_("Layout")); + func(calldata, NODE_CLASS_OP_COLOR, N_("Color")); + func(calldata, NODE_CLASS_OP_VECTOR, N_("Vector")); + func(calldata, NODE_CLASS_CONVERTOR, N_("Convertor")); + func(calldata, NODE_CLASS_GROUP, N_("Group")); + func(calldata, NODE_CLASS_LAYOUT, N_("Layout")); } static void localize(bNodeTree *localtree, bNodeTree *UNUSED(ntree)) diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index add9fdb0b30..ba5682ee8ad 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -66,15 +66,15 @@ static void foreach_nodetree(Main *main, void *calldata, bNodeTreeCallback func) static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func) { - func(calldata, NODE_CLASS_INPUT, IFACE_("Input")); - func(calldata, NODE_CLASS_OUTPUT, IFACE_("Output")); - func(calldata, NODE_CLASS_OP_COLOR, IFACE_("Color")); - func(calldata, NODE_CLASS_PATTERN, IFACE_("Patterns")); - func(calldata, NODE_CLASS_TEXTURE, IFACE_("Textures")); - func(calldata, NODE_CLASS_CONVERTOR, IFACE_("Convertor")); - func(calldata, NODE_CLASS_DISTORT, IFACE_("Distort")); - func(calldata, NODE_CLASS_GROUP, IFACE_("Group")); - func(calldata, NODE_CLASS_LAYOUT, IFACE_("Layout")); + func(calldata, NODE_CLASS_INPUT, N_("Input")); + func(calldata, NODE_CLASS_OUTPUT, N_("Output")); + func(calldata, NODE_CLASS_OP_COLOR, N_("Color")); + func(calldata, NODE_CLASS_PATTERN, N_("Patterns")); + func(calldata, NODE_CLASS_TEXTURE, N_("Textures")); + func(calldata, NODE_CLASS_CONVERTOR, N_("Convertor")); + func(calldata, NODE_CLASS_DISTORT, N_("Distort")); + func(calldata, NODE_CLASS_GROUP, N_("Group")); + func(calldata, NODE_CLASS_LAYOUT, N_("Layout")); } static void localize(bNodeTree *localtree, bNodeTree *UNUSED(ntree)) -- cgit v1.2.3