From 1f699984e9d11d798b3e6db9a912b3c4a7ece70d Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 19 Nov 2013 22:01:11 +0000
Subject: [PATCH] One more Mac helper moved into CocoaHelpers.mm

---
 src/GUI/CocoaHelpers.mm | 13 +++++++++++++
 src/Main/locale.cxx     | 22 +---------------------
 src/Main/options.cxx    |  4 ++--
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/GUI/CocoaHelpers.mm b/src/GUI/CocoaHelpers.mm
index 8df796615..cc564a2b0 100644
--- a/src/GUI/CocoaHelpers.mm
+++ b/src/GUI/CocoaHelpers.mm
@@ -33,6 +33,7 @@
 // flightgear
 #include <GUI/MessageBox.hxx>
 #include <Main/options.hxx>
+#include <Main/locale.hxx>
 
 NSString* stdStringToCocoa(const std::string& s)
 {
@@ -138,3 +139,15 @@ std::string Options::platformDefaultRoot() const
 }
     
 } // of namespace flightgear
+
+string_list FGLocale::getUserLanguage()
+{
+    CocoaAutoreleasePool ap;
+    string_list result;
+    
+    for (NSString* lang in [NSLocale preferredLanguages]) {
+        result.push_back(stdStringFromCocoa(lang));
+    }
+    
+    return result;
+}
diff --git a/src/Main/locale.cxx b/src/Main/locale.cxx
index a2fa6e42d..783b3f247 100644
--- a/src/Main/locale.cxx
+++ b/src/Main/locale.cxx
@@ -90,27 +90,7 @@ FGLocale::getUserLanguage()
     return result;
 }
 #elif __APPLE__
-
-// determine locale / langauge on Mac
-#include <CoreFoundation/CoreFoundation.h>
-
-string_list
-FGLocale::getUserLanguage()
-{
-    string_list result;
-    CFArrayRef langs = CFLocaleCopyPreferredLanguages();
-    
-    char buffer[64];
-    for (int i=0; i<CFArrayGetCount(langs); ++i) {
-        CFStringRef s = (CFStringRef) CFArrayGetValueAtIndex(langs, i);
-        CFStringGetCString(s, buffer, 64, kCFStringEncodingASCII);
-        result.push_back(buffer);
-    }
-    
-    CFRelease(langs);
-    return result;
-}
-
+//  implemented in CocoaHelpers.mm
 #else
 /**
  * Determine locale/language settings on Linux/Unix.
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 691e7be24..e3e66c0dd 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -2346,12 +2346,12 @@ string Options::platformDefaultRoot() const
   return "../data";
 }
 
-#elif defined(_WIN32)
+#elif defined(SG_WINDOWS)
 string Options::platformDefaultRoot() const
 {
   return "..\\data";
 }
-#elif defined(__APPLE__)
+#elif defined(SG_MAC)
 // platformDefaultRoot defined in CocoaHelpers.mm
 #else
 string Options::platformDefaultRoot() const