[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40385] branches/soc-2011-garlic/source/ blender/editors: i18n: replace some bit checks from U. transopts with utility functions UI_translate*

[Sergey Sharybin]

Revision: 40385
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40385
Author:   nazgul
Date:     2011-09-20 07:47:27 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
i18n: replace some bit checks from U.transopts with utility functions UI_translate*

Modified Paths:
--------------
    branches/soc-2011-garlic/source/blender/editors/interface/interface.c
    branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-garlic/source/blender/editors/transform/transform_orientations.c

Modified: branches/soc-2011-garlic/source/blender/editors/interface/interface.c
===================================================================
--- branches/soc-2011-garlic/source/blender/editors/interface/interface.c	2011-09-20 07:39:25 UTC (rev 40384)
+++ branches/soc-2011-garlic/source/blender/editors/interface/interface.c	2011-09-20 07:47:27 UTC (rev 40385)
@@ -96,12 +96,20 @@
 
 int UI_translate_iface(void)
 {
+#ifdef INTERNATIONAL
 	return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_IFACE);
+#else
+	return 0;
+#endif
 }
 
 int UI_translate_tooltips(void)
 {
+#ifdef INTERNATIONAL
 	return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_TOOLTIPS);
+#else
+	return 0;
+#endif
 }
 
 const char *UI_translate_do_iface(const char *msgid)

Modified: branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_header.c	2011-09-20 07:39:25 UTC (rev 40384)
+++ branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_header.c	2011-09-20 07:47:27 UTC (rev 40385)
@@ -470,7 +470,7 @@
 	}
 }
 
-#define TIP_(msgid) (((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_TOOLTIPS))?BLF_gettext(msgid):(msgid))
+#define TIP_(msgid) UI_translate_do_tooltip(msgid)
 void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 {
 	bScreen *screen= CTX_wm_screen(C);

Modified: branches/soc-2011-garlic/source/blender/editors/transform/transform_orientations.c
===================================================================
--- branches/soc-2011-garlic/source/blender/editors/transform/transform_orientations.c	2011-09-20 07:39:25 UTC (rev 40384)
+++ branches/soc-2011-garlic/source/blender/editors/transform/transform_orientations.c	2011-09-20 07:47:27 UTC (rev 40385)
@@ -415,8 +415,8 @@
 	TransformOrientation *ts;
 	int i = V3D_MANIP_CUSTOM;
 	char *str_menu, *p;
-	
-	if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE)) {
+
+	if(UI_translate_iface()) {
 		title= BLF_gettext(title);
 		menu= BLF_gettext(menu);
 	}