From 8089f857ad4d80bd12824f6fe4e753545be60745 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 22 Feb 2011 12:17:45 +0000 Subject: Too many ifdefs made me miss the fact variables were declared inside function... --- source/blender/blenfont/intern/blf_lang.c | 36 +++++++++++++++++-------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'source/blender/blenfont') diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c index c749aadade8..0914d0db349 100644 --- a/source/blender/blenfont/intern/blf_lang.c +++ b/source/blender/blenfont/intern/blf_lang.c @@ -77,30 +77,34 @@ void BLF_lang_init(void) /* XXX WARNING!!! IN osx somehow the previous function call jumps in this one??? (ton, ppc) */ void BLF_lang_set(const char *str) { - if(str==NULL) + if(str==NULL) { return; + } + else { #if defined (_WIN32) || defined(__APPLE__) - BLI_setenv("LANG", str); + BLI_setenv("LANG", str); #else - char *locreturn= setlocale(LC_ALL, str); - if (locreturn == NULL) { - char *lang= BLI_sprintfN("%s.UTF-8", str); - - locreturn= setlocale(LC_ALL, lang); + char *locreturn= setlocale(LC_ALL, str); if (locreturn == NULL) { - printf("could not change language to %s nor %s\n", str, lang); - } + char *lang= BLI_sprintfN("%s.UTF-8", str); - MEM_freeN(lang); - } + locreturn= setlocale(LC_ALL, lang); + if (locreturn == NULL) { + printf("could not change language to %s nor %s\n", str, lang); + } - setlocale(LC_NUMERIC, "C"); + MEM_freeN(lang); + } + + setlocale(LC_NUMERIC, "C"); #endif - textdomain(DOMAIN_NAME); - bindtextdomain(DOMAIN_NAME, global_messagepath); - /* bind_textdomain_codeset(DOMAIN_NAME, global_encoding_name); */ - BLI_strncpy(global_language, str, sizeof(global_language)); + textdomain(DOMAIN_NAME); + bindtextdomain(DOMAIN_NAME, global_messagepath); + /* bind_textdomain_codeset(DOMAIN_NAME, global_encoding_name); */ + BLI_strncpy(global_language, str, sizeof(global_language)); + + } } void BLF_lang_encoding(const char *str) -- cgit v1.2.3