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

Add try/catch around i18n locale setter code, just in case...

Browse Source
This commit is contained in:
Bastien Montagne
2012-12-31 12:12:50 +00:00
parent c9d16fd22c
commit c0a697807a
1 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/locale/boost_locale_wrapper.cpp
View File

@@ -57,11 +57,12 @@ void bl_locale_set(const char *locale)
gen.add_messages_domain(default_domain);
//gen.set_default_messages_domain(default_domain);
try {
if (locale && locale[0]) {
std::locale::global(gen(locale));
}
else {
#if defined (__APPLE__)
#ifdef __APPLE__
// workaround to get osx system locale from user defaults
FILE *fp;
std::string locale_osx = "";
@@ -91,6 +92,10 @@ void bl_locale_set(const char *locale)
}
// Note: boost always uses "C" LC_NUMERIC by default!
}
catch(std::exception const &e) {
std::cout << "bl_locale_set(" << locale << "): " << e.what() << " \n";
}
}
const char *bl_locale_pgettext(const char *msgctxt, const char *msgid)
{
@@ -107,7 +112,7 @@ const char* bl_locale_pgettext(const char *msgctxt, const char *msgid)
return msgid;
}
catch(std::exception const &e) {
// std::cout << "boost_locale_pgettext: " << e.what() << " \n";
// std::cout << "bl_locale_pgettext(" << msgctxt << ", " << msgid << "): " << e.what() << " \n";
return msgid;
}
}