Changeset 21841e84

Timestamp:

08/19/2012 09:11:28 PM (10 months ago)

Author:

Thomas Goyne <plorkyeran@…>

Branches:

master, stable

Children:

d132364

Parents:

f2035d7

git-author:

Thomas Goyne <plorkyeran@…> (08/18/2012 03:13:24 AM)

git-committer:

Thomas Goyne <plorkyeran@…> (08/19/2012 09:11:28 PM)

Message:

Get the locale name for OS X from CF rather than wx

Originally committed to SVN as r6954.

File:

• aegisub/src/dialog_version_check.cpp (modified) (2 diffs)

aegisub/src/dialog_version_check.cpp

@@ -82 +82 @@
 #include <libaegisub/exception.h>
 
+#ifdef __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
 /* *** Public API is implemented here *** */
 
@@ -306 +310 @@
         return res;
 }
+#elif __APPLE__
+static wxString GetSystemLanguage()
+{
+        CFLocaleRef locale = CFLocaleCopyCurrent();
+        CFStringRef localeName = (CFStringRef)CFLocaleGetValue(locale, kCFLocaleIdentifier);
+
+        char buf[128];
+        CFStringGetCString(localeName, buf, sizeof buf, kCFStringEncodingUTF8);
+        CFRelease(locale);
+
+        return wxString::FromUTF8(buf);
+
+}
 #else
 static wxString GetSystemLanguage()