[Bf-blender-cvs] [75838de] master: Fix i18n-related points in T47265 - mostly, fix non-translated items in enum-search popup menu.

[Bastien Montagne]

Commit: 75838de7c30ddb69ea27754d70bf05693b5acf52
Author: Bastien Montagne
Date:   Fri Jan 29 15:05:51 2016 +0100
Branches: master
https://developer.blender.org/rB75838de7c30ddb69ea27754d70bf05693b5acf52

Fix i18n-related points in T47265 - mostly, fix non-translated items in 
enum-search popup menu.

===================================================================

M       source/blender/editors/interface/interface.c
M       source/blender/editors/transform/transform.c

===================================================================

diff --git a/source/blender/editors/interface/interface.c 
b/source/blender/editors/interface/interface.c
index 9ac2117..4faae45 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -4322,7 +4322,7 @@ static void operator_enum_search_cb(const struct bContext 
*C, void *but, const c
                EnumPropertyItem *item, *item_array;
                bool do_free;
 
-               RNA_property_enum_items((bContext *)C, ptr, prop, &item_array, 
NULL, &do_free);
+               RNA_property_enum_items_gettexted((bContext *)C, ptr, prop, 
&item_array, NULL, &do_free);
 
                for (item = item_array; item->identifier; item++) {
                        /* note: need to give the index rather than the 
identifier because the enum can be freed */
diff --git a/source/blender/editors/transform/transform.c 
b/source/blender/editors/transform/transform.c
index f9d13ee..bc60a0c 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -4300,12 +4300,12 @@ static void headerTranslation(TransInfo *t, const float 
vec[3], char str[MAX_INF
 
                if ((snode->flag & SNODE_SKIP_INSOFFSET) == 0) {
                        const char *str_old = BLI_strdup(str);
-                       const char *str_dir = (snode->insert_ofs_dir == 
SNODE_INSERTOFS_DIR_RIGHT) ? "right" : "left";
+                       const char *str_dir = (snode->insert_ofs_dir == 
SNODE_INSERTOFS_DIR_RIGHT) ? IFACE_("right") : IFACE_("left");
                        char str_km[MAX_INFO_LEN];
 
                        WM_modalkeymap_items_to_string(t->keymap, 
TFM_MODAL_INSERTOFS_TOGGLE_DIR, true, sizeof(str_km), str_km);
 
-                       ofs += BLI_snprintf(str, MAX_INFO_LEN, "Auto-offset set 
to %s - press %s to toggle direction  |  %s",
+                       ofs += BLI_snprintf(str, MAX_INFO_LEN, 
IFACE_("Auto-offset set to %s - press %s to toggle direction  |  %s"),
                                            str_dir, str_km, str_old);
 
                        MEM_freeN((void *)str_old);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs