i18n: code clean-up

- Move all translation-related declarations to BLF_translation.h
- Reverted some changes to match trunk svn rev40365

source/blender/blenfont/BLF_api.h

@@ -34,7 +34,6 @@
 #ifndef BLF_API_H
 #define BLF_API_H
 
-#include <stdlib.h>
 struct rctf;
 
 int BLF_init(int points, int dpi);
@@ -42,8 +41,6 @@ void BLF_exit(void);
 
 void BLF_cache_clear(void);
 
-const char* BLF_gettext(const char *msgid);
-
 int BLF_load(const char *name);
 int BLF_load_mem(const char *name, unsigned char *mem, int mem_size);
 
@@ -181,20 +178,6 @@ void BLF_buffer_col(int fontid, float r, float g, float b, float a);
  */
 void BLF_draw_buffer(int fontid, const char *str);
 
-/*
- * Search the path directory to the locale files, this try all
- * the case for Linux, Win and Mac.
- */
-void BLF_lang_init(void);
-
-/* Set the current locale. */
-void BLF_lang_set(const char *);
-
-/* Set the current encoding name. */
-void BLF_lang_encoding_name(const char *str);
-
-void BLF_lang_encoding(const char *str);
-
 /* Add a path to the font dir paths. */
 void BLF_dir_add(const char *path);
 
@@ -219,7 +202,4 @@ void BLF_dir_free(char **dirs, int count);
 extern int blf_mono_font;
 extern int blf_mono_font_render; // dont mess drawing with render threads.
 
-#define _(msgid) BLF_gettext(msgid)
-#define N_(msgid) msgid
-
 #endif /* BLF_API_H */

source/blender/blenfont/CMakeLists.txt

@@ -42,9 +42,11 @@ set(SRC
 	intern/blf_font.c
 	intern/blf_glyph.c
 	intern/blf_lang.c
+	intern/blf_translation.c
 	intern/blf_util.c
 
 	BLF_api.h
+	BLF_translation.h
 	intern/blf_internal.h
 	intern/blf_internal_types.h
 )
@@ -56,9 +58,5 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DINTERNATIONAL)
 endif()
 
-if(WIN32 AND NOT UNIX)
-	add_definitions(-DUSE_GETTEXT_DLL)
-endif()
-
 blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
 

source/blender/blenfont/SConscript

@@ -13,7 +13,6 @@ defs = []
 
 if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross':
     defs.append('_WIN32')
-    defs.append('USE_GETTEXT_DLL')
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('INTERNATIONAL')

source/blender/blenfont/intern/blf.c

@@ -34,11 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#ifdef INTERNATIONAL
-#include <libintl.h>
-#endif
-
 #include <math.h>
 
 #include <ft2build.h>
@@ -304,17 +299,6 @@ void BLF_enable(int fontid, int option)
 	}
 }
 
-const char* BLF_gettext(const char *msgid)
-{
-#ifdef INTERNATIONAL
-	if( msgid[0] )
-		return gettext( msgid );
-	return "";
-#else
-	return msgid;
-#endif
-}
-
 void BLF_disable(int fontid, int option)
 {
 	FontBLF *font= BLF_get(fontid);

source/blender/blenkernel/BKE_font.h

@@ -89,10 +89,6 @@ void wcs2utf8s(char *dst, const wchar_t *src);
 size_t wcsleninu8(wchar_t *src);
 size_t utf8towchar(wchar_t *w, const char *c);
 
-#ifdef INTERNATIONAL
-unsigned char *BKE_font_get_unifont(int *unifont_size);
-#endif
-
 #ifdef __cplusplus
 }
 #endif

source/blender/blenkernel/CMakeLists.txt

@@ -361,10 +361,6 @@ if(WITH_GAMEENGINE)
 	)
 endif()
 
-if(WITH_INTERNATIONAL)
-	add_definitions(-DINTERNATIONAL)
-endif()
-
 if(MSVC)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 endif()

source/blender/blenkernel/SConscript

@@ -97,9 +97,6 @@ if env['WITH_BF_GAMEENGINE']:
 else:
     sources.remove('intern' + os.sep + 'navmesh_conversion.cpp')
 
-if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

source/blender/blenkernel/intern/font.c

@@ -255,29 +255,6 @@ static PackedFile *get_builtin_packedfile(void)
 	}
 }
 
-#ifdef INTERNATIONAL
-const char unifont_filename[]="droidsans.ttf.gz";
-static unsigned char *unifont_ttf= NULL;
-static int unifont_size= 0;
-
-unsigned char *BKE_font_get_unifont(int *unifont_size_r)
-{
-	if(unifont_ttf==NULL) {
-		char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
-		char unifont_path[1024];
-
-		BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename);
-
-		unifont_ttf= BLI_ungzip_to_mem(unifont_path, &unifont_size);
-	}
-
-	*unifont_size_r= unifont_size;
-
-	return unifont_ttf;
-}
-
-#endif
-
 void free_ttfont(void)
 {
 	struct TmpFont *tf;
@@ -288,11 +265,6 @@ void free_ttfont(void)
 		tf->vfont= NULL;
 	}
 	BLI_freelistN(&ttfdata);
-
-#ifdef INTERNATIONAL
-	if(unifont_ttf)
-		MEM_freeN(unifont_ttf);
-#endif
 }
 
 struct TmpFont *vfont_find_tmpfont(VFont *vfont)

source/blender/editors/armature/poselib.c

@@ -43,7 +43,7 @@
 #include "BLI_dlrbTree.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"

source/blender/editors/interface/interface.c

@@ -55,6 +55,7 @@
 #include "BIF_gl.h"
 
 #include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "UI_interface.h"
 

source/blender/editors/interface/interface_layout.c

@@ -43,7 +43,7 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
@@ -2808,7 +2808,7 @@ void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,in
 		empty= uiDefAutoButsRNA(layout, &ptr, check_prop, label_align) == 0;
 
 		if(empty && (flag & UI_LAYOUT_OP_SHOW_EMPTY)) {
-			uiItemL(layout, _("No Properties"), ICON_NONE);
+			uiItemL(layout, UI_translate_do_iface(N_("No Properties")), ICON_NONE);
 		}
 	}
 	

source/blender/editors/interface/interface_panel.c

@@ -53,8 +53,6 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#include "BLF_api.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 

source/blender/editors/interface/interface_regions.c

@@ -62,6 +62,7 @@
 #include "UI_view2d.h"
 
 #include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "ED_screen.h"
 

source/blender/editors/interface/interface_style.c

@@ -44,10 +44,10 @@
 #include "BLI_string.h"
 
 #include "BKE_global.h"
-#include "BKE_font.h"
 
 
 #include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "UI_interface.h"
 
@@ -324,7 +324,7 @@ void uiStyleInit(void)
 		if(font->uifont_id==UIFONT_DEFAULT) {
 #ifdef INTERNATIONAL
 			int unifont_size;
-			unsigned char *unifont_ttf= BKE_font_get_unifont(&unifont_size);
+			unsigned char *unifont_ttf= BLF_get_unifont(&unifont_size);
 
 			if(unifont_ttf)
 				font->blf_id= BLF_load_mem_unique("default", unifont_ttf, unifont_size);

source/blender/editors/interface/interface_templates.c

@@ -68,6 +68,7 @@
 #include "interface_intern.h"
 
 #include "BLF_api.h"
+#include "BLF_translation.h"
 
 void UI_template_fix_linking(void)
 {

source/blender/editors/interface/interface_utils.c

@@ -37,7 +37,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_context.h"
 

source/blender/editors/interface/interface_widgets.c

@@ -1018,6 +1018,7 @@ static void ui_text_label_rightclip(uiFontStyle *fstyle, uiBut *but, rcti *rect)
 
 static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *but, rcti *rect)
 {
+//	int transopts;
 	char *cpoin = NULL;
 	
 	/* for underline drawing */
@@ -1087,6 +1088,10 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 	if (fstyle->kerning == 1)
 		BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT);
 	
+	//	ui_rasterpos_safe(x, y, but->aspect);
+//	if(but->type==IDPOIN) transopts= 0;	// no translation, of course!
+//	else transopts= ui_translate_buttons();
+	
 	/* cut string in 2 parts - only for menu entries */
 	if((but->block->flag & UI_BLOCK_LOOP)) {
 		if(ELEM5(but->type, SLI, NUM, TEX, NUMSLI, NUMABS)==0) {

source/blender/editors/screen/area.c

@@ -43,7 +43,7 @@
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"

source/blender/editors/space_buttons/buttons_header.c

@@ -37,7 +37,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_context.h"
 

source/blender/editors/space_file/file_draw.c

@@ -50,6 +50,7 @@
 #include "BKE_main.h"
 
 #include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "IMB_imbuf_types.h"
  

source/blender/editors/space_file/file_panels.c

@@ -37,7 +37,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"

source/blender/editors/space_graph/graph_buttons.c

@@ -46,7 +46,7 @@
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"

source/blender/editors/space_info/space_info.c

@@ -41,7 +41,7 @@
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"

source/blender/editors/space_nla/nla_buttons.c

@@ -45,7 +45,7 @@
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_nla.h"
 #include "BKE_context.h"

source/blender/editors/space_node/node_header.c

@@ -44,7 +44,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"

source/blender/editors/space_view3d/view3d_header.c

@@ -47,7 +47,7 @@
 #include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"

source/blender/editors/space_view3d/view3d_toolbar.c

@@ -48,7 +48,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_context.h"
 #include "BKE_idprop.h"

source/blender/editors/transform/transform_orientations.c

@@ -50,7 +50,7 @@
 #include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 //#include "BIF_editmesh.h"
 //#include "BIF_interface.h"

source/blender/makesrna/RNA_access.h

@@ -587,9 +587,6 @@ extern StructRNA RNA_WorldTextureSlot;
 extern StructRNA RNA_XnorController;
 extern StructRNA RNA_XorController;
 
-/* make every name and description field surrounded by gettext */
-EnumPropertyItem* RNA_enum_items_gettexted(EnumPropertyItem *item);
-
 /* Pointer
  *
  * These functions will fill in RNA pointers, this can be done in three ways:

source/blender/makesrna/intern/rna_access.c

@@ -44,6 +44,7 @@
 #include "BLI_ghash.h"
 
 #include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_animsys.h"
 #include "BKE_context.h"

source/blender/makesrna/intern/rna_userdef.c

@@ -44,7 +44,7 @@
 #include "WM_types.h"
 
 #include "BLI_utildefines.h"
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_sound.h"
 

source/blender/python/generic/blf_py_api.c

@@ -31,6 +31,7 @@
 #include "blf_py_api.h"
 
 #include "../../blenfont/BLF_api.h"
+#include "../../blenfont/BLF_translation.h"
 
 #include "BLI_utildefines.h"
 

source/blender/windowmanager/intern/wm_files.c

@@ -59,7 +59,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_callbacks.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_ipo_types.h" // XXX old animation system

source/blender/windowmanager/intern/wm_init_exit.c

@@ -99,6 +99,7 @@
 
 #include "UI_interface.h"
 #include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "GPU_buffers.h"
 #include "GPU_extensions.h"
@@ -400,6 +401,7 @@ void WM_exit(bContext *C)
 	free_posebuf();
 
 	BLF_exit();
+	BLF_free_unifont();
 	
 	ANIM_keyingset_infos_exit();
 	

source/blender/windowmanager/intern/wm_operators.c

@@ -49,7 +49,7 @@
 #include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "PIL_time.h"
 

source/blender/windowmanager/intern/wm_window.c

@@ -48,7 +48,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "BKE_blender.h"
 #include "BKE_context.h"

source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

@@ -997,6 +997,7 @@ int main(int argc, char** argv)
 	// Cleanup
 	RNA_exit();
 	BLF_exit();
+	BLF_free_unifont();
 	IMB_exit();
 	free_nodesystem();