Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Some minor cleanup/polish...

Browse Source
This commit is contained in:
Bastien Montagne
2013-05-01 17:49:19 +00:00
parent 34b5bd7283
commit 30556d4cd5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/locale/boost_locale_wrapper.cpp
View File

@@ -62,22 +62,20 @@ void bl_locale_set(const char *locale)
try { try {
if (locale && locale[0]) { if (locale && locale[0]) {
_locale = gen(locale); _locale = gen(locale);
std::locale::global(_locale);
} }
else { else {
#ifdef __APPLE__ #ifdef __APPLE__
extern const char *user_locale; // pulled from Ghost_SystemCocoa extern const char *user_locale; // pulled from Ghost_SystemCocoa
std::string locale_osx = user_locale + std::string(".UTF-8"); std::string locale_osx = user_locale + std::string(".UTF-8");
_locale = gen(locale_osx.c_str()); _locale = gen(locale_osx.c_str());
std::locale::global(_locale);
#else #else
_locale = gen(""); _locale = gen("");
std::locale::global(_locale);
#endif #endif
} }
std::locale::global(_locale);
// Note: boost always uses "C" LC_NUMERIC by default! // Note: boost always uses "C" LC_NUMERIC by default!
/* Generate the locale string (useful to know which locale we are actually using in case of "default" one). */ // Generate the locale string (useful to know which locale we are actually using in case of "default" one).
#define LOCALE_INFO std::use_facet<boost::locale::info>(_locale) #define LOCALE_INFO std::use_facet<boost::locale::info>(_locale)
locale_str = LOCALE_INFO.language(); locale_str = LOCALE_INFO.language();