diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-20 11:47:27 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-20 11:47:27 +0400 |
| commit | e49e403953067481e7d790bfa9e72edb9fa81406 (patch) | |
| tree | 7f9db2e1e0334f78ec28eb08c8807a6dd12c2baa /source/blender | |
| parent | 6d125e159d2c391fd92d20bd29bc5c8c33b7dcc2 (diff) | |
i18n: replace some bit checks from U.transopts with utility functions UI_translate*
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index a850fa993f0..2ff77d255c6 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -96,12 +96,20 @@ static void ui_free_but(const bContext *C, uiBut *but); 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) diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 22146a22b9b..55b30aec804 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -470,7 +470,7 @@ void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C) } } -#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); diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 3ee4c30192e..cd4cbc77c49 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -415,8 +415,8 @@ const char * BIF_menustringTransformOrientation(const bContext *C, const char *t 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); } |