Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/blenfont/intern/blf_lang.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
index af2f9df3c00..e46e6be399e 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
@@ -42,10 +42,6 @@
#include <locale.h>
-#if defined(_WIN32)
-#include <windows.h>
-#endif
-
#include "libintl.h"
#include "DNA_userdef_types.h"
@@ -182,8 +178,6 @@ void BLF_lang_set(const char *str)
#if defined(_WIN32) && !defined(FREE_WINDOWS)
{
- const char *long_locale = locales[2 * U.language];
-
if (short_locale) {
char *envStr;
@@ -196,11 +190,11 @@ void BLF_lang_set(const char *str)
MEM_freeN(envStr);
}
- locreturn = setlocale(LC_ALL, long_locale);
+ locreturn = setlocale(LC_ALL, short_locale);
if (locreturn == NULL) {
if (G.debug & G_DEBUG)
- printf("Could not change locale to %s\n", long_locale);
+ printf("Could not change locale to %s\n", short_locale);
ok = 0;
}