A new comm radio and atis implementation

[flightgear.git] / src / Main / locale.cxx

diff --git a/src/Main/locale.cxx b/src/Main/locale.cxx
index 2544d0ba76077db2322610e69292f273fabb549d..7572f42e9de03e45bc26eec630d17131a5826f9e 100644 (file)
--- a/src/Main/locale.cxx
+++ b/src/Main/locale.cxx
@@ -26,7 +26,7 @@
 #include <windows.h>
 #endif
 
-#include <cstdarg> // for va_start/_end
+#include <cstdio>
 #include <boost/foreach.hpp>
 
 #include <simgear/props/props_io.hxx>
@@ -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.
@@ -211,6 +191,9 @@ FGLocale::selectLanguage(const char *language)
     // load resource for system messages (translations for fgfs internal messages)
     loadResource("sys");
 
+    // load resource for atc messages
+    loadResource("atc");
+
     return true;
 }