blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Bastien Montagne 2021-10-29 10:24:37 +02:00
parent 261bb766fb be0d5da341
commit fb688c8d5c
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/locale/boost_locale_wrapper.cpp
View File

@ -117,6 +117,13 @@ void bl_locale_set(const char *locale)
#undef LOCALE_INFO
}
// Extra catch on `std::runtime_error` is needed for macOS/Clang as it seems that exceptions
// like `boost::locale::conv::conversion_error` (which inherit from `std::runtime_error`) are
// not caught by their ancestor `std::exception`. See
// https://developer.blender.org/T88877#1177108 .
catch (std::runtime_error const &e) {
std::cout << "bl_locale_set(" << locale << "): " << e.what() << " \n";
}
catch (std::exception const &e) {
std::cout << "bl_locale_set(" << locale << "): " << e.what() << " \n";
}

12
intern/locale/osx_user_locale.mm
View File

@ -14,7 +14,17 @@ const char *osx_user_locale()
CFLocaleRef myCFLocale = CFLocaleCopyCurrent();
NSLocale *myNSLocale = (NSLocale *)myCFLocale;
[myNSLocale autorelease];
NSString *nsIdentifier = [myNSLocale localeIdentifier];
// This produces gettext-invalid locale in recent macOS versions (11.4),
// like `ko-Kore_KR` instead of `ko_KR`. See T88877.
// NSString *nsIdentifier = [myNSLocale localeIdentifier];
const NSString *nsIdentifier = [myNSLocale languageCode];
const NSString *const nsIdentifier_country = [myNSLocale countryCode];
if ([nsIdentifier length] != 0 && [nsIdentifier_country length] != 0) {
nsIdentifier = [NSString stringWithFormat:@"%@_%@", nsIdentifier, nsIdentifier_country];
}
user_locale = ::strdup([nsIdentifier UTF8String]);
[pool drain];