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:
authorBastien Montagne <montagne29@wanadoo.fr>2013-05-01 21:49:19 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2013-05-01 21:49:19 +0400
commit30556d4cd5650d1e06984d3549319a73f170b566 (patch)
tree4cce8607dcd681f551f14b67ef4024460ed66aba /intern/locale
parent34b5bd7283f6384606571a0803ad01368da23ae3 (diff)
Some minor cleanup/polish...
Diffstat (limited to 'intern/locale')
-rw-r--r--intern/locale/boost_locale_wrapper.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp
index bc902ac661e..1b75c74c57b 100644
--- a/intern/locale/boost_locale_wrapper.cpp
+++ b/intern/locale/boost_locale_wrapper.cpp
@@ -62,22 +62,20 @@ void bl_locale_set(const char *locale)
try {
if (locale && locale[0]) {
_locale = gen(locale);
- std::locale::global(_locale);
}
else {
#ifdef __APPLE__
extern const char *user_locale; // pulled from Ghost_SystemCocoa
std::string locale_osx = user_locale + std::string(".UTF-8");
_locale = gen(locale_osx.c_str());
- std::locale::global(_locale);
#else
_locale = gen("");
- std::locale::global(_locale);
#endif
}
+ std::locale::global(_locale);
// 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)
locale_str = LOCALE_INFO.language();