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:
Diffstat (limited to 'source/blender/blenfont/intern/blf_lang.c')
-rw-r--r--source/blender/blenfont/intern/blf_lang.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
index e7f9d1746ad..6a3e5b1f2ef 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
@@ -89,6 +89,7 @@ void BLF_lang_set(const char *str)
#if defined (_WIN32) || defined(__APPLE__)
BLI_setenv("LANG", str);
+ BLI_strncpy(global_language, BLI_getenv("LANG"), sizeof(global_language));
#else
char *locreturn= setlocale(LC_ALL, str);
if (locreturn == NULL) {
@@ -101,14 +102,12 @@ void BLF_lang_set(const char *str)
MEM_freeN(lang);
}
-
+ BLI_strncpy(global_language, locreturn, sizeof(global_language));
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));
-
}
}
@@ -118,6 +117,11 @@ void BLF_lang_encoding(const char *str)
/* bind_textdomain_codeset(DOMAIN_NAME, encoding_name); */
}
+char* BLF_lang_get(void)
+{
+ return global_language;
+}
+
#else /* ! INTERNATIONAL */
void BLF_lang_init(void)
@@ -137,4 +141,9 @@ void BLF_lang_set(const char *str)
return;
}
+char* BLF_lang_get(void)
+{
+ return "";
+}
+
#endif /* INTERNATIONAL */