1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 14:09:06 +00:00

Merge branch 'experimental' of github.com:AquariaOSE/Aquaria into experimental

This commit is contained in:
fgenesis 2014-07-21 22:22:30 +02:00
commit 70e175c8d6

View file

@ -7,7 +7,6 @@
#endif #endif
#ifdef BBGE_BUILD_MACOSX #ifdef BBGE_BUILD_MACOSX
#include <Carbon/Carbon.h>
#include <CoreFoundation/CFLocale.h> #include <CoreFoundation/CFLocale.h>
#include <CoreFoundation/CFString.h> #include <CoreFoundation/CFString.h>
@ -112,13 +111,11 @@ std::string getSystemLocale()
if ((buf = (CFStringRef)CFLocaleGetValue(locale, kCFLocaleLanguageCode)) != NULL) if ((buf = (CFStringRef)CFLocaleGetValue(locale, kCFLocaleLanguageCode)) != NULL)
{ {
localeStr = _CFToStdString(buf); localeStr = _CFToStdString(buf);
CFRelease(buf);
if ((buf = (CFStringRef)CFLocaleGetValue(locale, kCFLocaleCountryCode)) != NULL) if ((buf = (CFStringRef)CFLocaleGetValue(locale, kCFLocaleCountryCode)) != NULL)
{ {
localeStr += "_"; localeStr += "_";
localeStr += _CFToStdString(buf); localeStr += _CFToStdString(buf);
CFRelease(buf);
} }
} }