[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55599] trunk/blender: I18n: various " new data translation" fixes...
Bastien Montagne
montagne29 at wanadoo.fr
Tue Mar 26 15:33:53 CET 2013
Revision: 55599
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55599
Author: mont29
Date: 2013-03-26 14:33:53 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
I18n: various "new data translation" fixes...
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/editors/render/SConscript
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_node/node_add.c
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/utils_spell_check.py 2013-03-26 12:45:10 UTC (rev 55598)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/utils_spell_check.py 2013-03-26 14:33:53 UTC (rev 55599)
@@ -374,6 +374,7 @@
"fluidsim",
"frameserver",
"enum",
+ "gpencil",
"idcol",
"keyframe", "keyframes", "keyframing", "keyframed",
"metaball", "metaballs", "mball",
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2013-03-26 12:45:10 UTC (rev 55598)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2013-03-26 14:33:53 UTC (rev 55599)
@@ -126,11 +126,11 @@
/* initialize the node name with the node label.
* note: do this after the initfunc so nodes get their data set which may be used in naming
* (node groups for example) */
- /* XXX Do not use nodeLabel() here, it returns translated content, which should *only* be used
- * in UI, *never* in data...
+ /* XXX Do not use nodeLabel() here, it returns translated content for UI, which should *only* be used
+ * in UI, *never* in data... Data have their own translation option!
* This solution may be a bit rougher than nodeLabel()'s returned string, but it's simpler
- * than adding a "no translate" flag to this func (and labelfunc() as well). */
- BLI_strncpy(node->name, ntype->ui_name, NODE_MAXSTR);
+ * than adding "do_translate" flags to this func (and labelfunc() as well). */
+ BLI_strncpy(node->name, DATA_(ntype->ui_name), NODE_MAXSTR);
nodeUniqueName(ntree, node);
node_add_sockets_from_type(ntree, node, ntype);
@@ -816,7 +816,7 @@
NODE_TYPES_BEGIN(ntype)
if (ntype->type == type) {
- idname = ntype->idname;
+ idname = DATA_(ntype->idname);
break;
}
NODE_TYPES_END
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2013-03-26 12:45:10 UTC (rev 55598)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2013-03-26 14:33:53 UTC (rev 55599)
@@ -43,6 +43,8 @@
#include "BLI_rand.h"
#include "BLI_utildefines.h"
+#include "BLF_translation.h"
+
#include "DNA_anim_types.h"
#include "DNA_curve_types.h"
#include "DNA_object_types.h"
@@ -229,7 +231,7 @@
bGPdata *gpd = (*gpd_ptr);
id_us_min(&gpd->id);
- *gpd_ptr = gpencil_data_addnew("GPencil");
+ *gpd_ptr = gpencil_data_addnew(DATA_("GPencil"));
}
/* notifiers */
@@ -312,10 +314,10 @@
return OPERATOR_CANCELLED;
}
if (*gpd_ptr == NULL)
- *gpd_ptr = gpencil_data_addnew("GPencil");
-
+ *gpd_ptr = gpencil_data_addnew(DATA_("GPencil"));
+
/* add new layer now */
- gpencil_layer_addnew(*gpd_ptr, "GP_Layer", 1);
+ gpencil_layer_addnew(*gpd_ptr, DATA_("GP_Layer"), 1);
/* notifiers */
WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
Modified: trunk/blender/source/blender/editors/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/render/CMakeLists.txt 2013-03-26 12:45:10 UTC (rev 55598)
+++ trunk/blender/source/blender/editors/render/CMakeLists.txt 2013-03-26 14:33:53 UTC (rev 55599)
@@ -68,4 +68,8 @@
add_definitions(-DWITH_HEADLESS)
endif()
+if(WITH_INTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/render/SConscript
===================================================================
--- trunk/blender/source/blender/editors/render/SConscript 2013-03-26 12:45:10 UTC (rev 55598)
+++ trunk/blender/source/blender/editors/render/SConscript 2013-03-26 14:33:53 UTC (rev 55599)
@@ -35,6 +35,8 @@
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
incs += ' ../../blenloader ../../bmesh ../../blenfont'
+defs = []
+
if env['OURPLATFORM'] == 'linux':
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'
@@ -54,4 +56,7 @@
if env['WITH_BF_OPENMP']:
env.Append(CFLAGS=['-DPARALLEL=1'])
-env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [], libtype=['core'], priority=[45])
+if env['WITH_BF_INTERNATIONAL']:
+ defs.append('WITH_INTERNATIONAL')
+
+env.BlenderLib('bf_editors_render', sources, Split(incs), defs, libtype=['core'], priority=[45])
Modified: trunk/blender/source/blender/editors/render/render_shading.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_shading.c 2013-03-26 12:45:10 UTC (rev 55598)
+++ trunk/blender/source/blender/editors/render/render_shading.c 2013-03-26 14:33:53 UTC (rev 55599)
@@ -428,10 +428,12 @@
PropertyRNA *prop;
/* add or copy texture */
- if (tex)
+ if (tex) {
tex = BKE_texture_copy(tex);
- else
+ }
+ else {
tex = add_texture(bmain, DATA_("Texture"));
+ }
/* hook into UI */
uiIDContextProperty(C, &ptr, &prop);
@@ -480,7 +482,7 @@
wo = BKE_world_copy(wo);
}
else {
- wo = add_world(bmain, "World");
+ wo = add_world(bmain, DATA_("World"));
if (BKE_scene_use_new_shading_nodes(scene)) {
ED_node_shader_default(C, &wo->id);
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c 2013-03-26 12:45:10 UTC (rev 55598)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c 2013-03-26 14:33:53 UTC (rev 55599)
@@ -1707,6 +1707,7 @@
}
/********************** new image operator *********************/
+#define IMA_DEF_NAME N_("Untitled")
static int image_new_exec(bContext *C, wmOperator *op)
{
@@ -1717,7 +1718,8 @@
Main *bmain;
PointerRNA ptr, idptr;
PropertyRNA *prop;
- char name[MAX_ID_NAME - 2];
+ char _name[MAX_ID_NAME - 2];
+ char *name = _name;
float color[4];
int width, height, floatbuf, gen_type, alpha;
@@ -1727,7 +1729,12 @@
obedit = CTX_data_edit_object(C);
bmain = CTX_data_main(C);
- RNA_string_get(op->ptr, "name", name);
+ prop = RNA_struct_find_property(op->ptr, "name");
+ RNA_property_string_get(op->ptr, prop, name);
+ if (!RNA_property_is_set(op->ptr, prop)) {
+ /* Default value, we can translate! */
+ name = (char *)DATA_(name);
+ }
width = RNA_int_get(op->ptr, "width");
height = RNA_int_get(op->ptr, "height");
floatbuf = RNA_boolean_get(op->ptr, "float");
@@ -1775,8 +1782,9 @@
/* XXX Note: the WM_operator_props_dialog_popup() doesn't work for uiIDContextProperty(), image is not being that way */
static int image_new_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
+ /* Better for user feedback. */
+ RNA_string_set(op->ptr, "name", DATA_(IMA_DEF_NAME));
return WM_operator_props_dialog_popup(C, op, 15 * UI_UNIT_X, 5 * UI_UNIT_Y);
-
}
void IMAGE_OT_new(wmOperatorType *ot)
@@ -1797,7 +1805,7 @@
ot->flag = OPTYPE_UNDO;
/* properties */
- RNA_def_string(ot->srna, "name", "untitled", MAX_ID_NAME - 2, "Name", "Image datablock name");
+ RNA_def_string(ot->srna, "name", IMA_DEF_NAME, MAX_ID_NAME - 2, "Name", "Image datablock name");
RNA_def_int(ot->srna, "width", 1024, 1, INT_MAX, "Width", "Image width", 1, 16384);
RNA_def_int(ot->srna, "height", 1024, 1, INT_MAX, "Height", "Image height", 1, 16384);
prop = RNA_def_float_color(ot->srna, "color", 4, NULL, 0.0f, FLT_MAX, "Color", "Default fill color", 0.0f, 1.0f);
@@ -1809,6 +1817,8 @@
RNA_def_boolean(ot->srna, "float", 0, "32 bit Float", "Create image with 32 bit floating point bit depth");
}
+#undef IMA_DEF_NAME
+
/********************* invert operators *********************/
static int image_invert_poll(bContext *C)
Modified: trunk/blender/source/blender/editors/space_node/node_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_add.c 2013-03-26 12:45:10 UTC (rev 55598)
+++ trunk/blender/source/blender/editors/space_node/node_add.c 2013-03-26 14:33:53 UTC (rev 55599)
@@ -83,7 +83,7 @@
/* generics */
node->locx = locx;
- node->locy = locy + 60.0f; // arbitrary.. so its visible, (0,0) is top of node
+ node->locy = locy + 60.0f; /* arbitrary... so its visible, (0,0) is top of node */
nodeSetSelected(node, TRUE);
/* node location is mapped */
@@ -436,7 +436,8 @@
PointerRNA ptr, idptr;
PropertyRNA *prop;
const char *idname;
- char treename[MAX_ID_NAME - 2] = "NodeTree";
+ char _treename[MAX_ID_NAME - 2];
+ char *treename = _treename;
if (RNA_struct_property_is_set(op->ptr, "type")) {
prop = RNA_struct_find_property(op->ptr, "type");
@@ -445,8 +446,12 @@
else if (snode)
idname = snode->tree_idname;
- if (RNA_struct_property_is_set(op->ptr, "name"))
+ if (RNA_struct_property_is_set(op->ptr, "name")) {
RNA_string_get(op->ptr, "name", treename);
+ }
+ else {
+ treename = (char *)DATA_("NodeTree");
+ }
if (!ntreeTypeFind(idname)) {
BKE_reportf(op->reports, RPT_ERROR, "Node tree type %s undefined", idname);
More information about the Bf-blender-cvs
mailing list