[Bf-blender-cvs] [15b848ef60c] master: Fix most (if not all) untranslated Panel-labels reported in T66731.

Bastien Montagne noreply at git.blender.org
Fri Aug 2 16:20:12 CEST 2019


Commit: 15b848ef60cba216c52bb7fa301c1eb4cf8b83b4
Author: Bastien Montagne
Date:   Fri Aug 2 15:01:02 2019 +0200
Branches: master
https://developer.blender.org/rB15b848ef60cba216c52bb7fa301c1eb4cf8b83b4

Fix most (if not all) untranslated Panel-labels reported in T66731.

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

M	source/blender/editors/interface/interface_layout.c
M	source/blender/windowmanager/intern/wm_operators.c

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

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index af992a89caa..25fedf8519a 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -5228,7 +5228,7 @@ static void ui_paneltype_draw_impl(bContext *C, PanelType *pt, uiLayout *layout,
       pt->draw_header(C, panel);
       panel->layout = NULL;
     }
-    uiItemL(row, pt->label, ICON_NONE);
+    uiItemL(row, CTX_IFACE_(pt->translation_context, pt->label), ICON_NONE);
   }
 
   panel->layout = layout;
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index ea1aa8ea4ea..c984191076c 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1824,7 +1824,8 @@ static const char *wm_call_menu_get_name(wmOperatorType *ot, PointerRNA *ptr)
   char idname[BKE_ST_MAXNAME];
   RNA_string_get(ptr, "name", idname);
   MenuType *mt = WM_menutype_find(idname, true);
-  return (mt) ? mt->label : ot->name;
+  return (mt) ? CTX_IFACE_(mt->translation_context, mt->label) :
+                CTX_IFACE_(ot->translation_context, ot->name);
 }
 
 static void WM_OT_call_menu(wmOperatorType *ot)
@@ -1888,7 +1889,8 @@ static const char *wm_call_panel_get_name(wmOperatorType *ot, PointerRNA *ptr)
   char idname[BKE_ST_MAXNAME];
   RNA_string_get(ptr, "name", idname);
   PanelType *pt = WM_paneltype_find(idname, true);
-  return (pt) ? pt->label : ot->name;
+  return (pt) ? CTX_IFACE_(pt->translation_context, pt->label) :
+                CTX_IFACE_(ot->translation_context, ot->name);
 }
 
 static void WM_OT_call_panel(wmOperatorType *ot)



More information about the Bf-blender-cvs mailing list