Interim windows build fix

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

diff --git a/src/Main/locale.cxx b/src/Main/locale.cxx
index 783b3f24743c0d022fcdcf99205d93476a998e02..f4eac4b6bee63c4774e43377a77c480cb3981454 100644 (file)
--- a/src/Main/locale.cxx
+++ b/src/Main/locale.cxx
@@ -171,26 +171,29 @@ FGLocale::selectLanguage(const char *language)
     }
 
     
-    SGPropertyNode *locale = NULL;
+    _currentLocale = NULL;
     BOOST_FOREACH(string lang, languages) {
-        locale = findLocaleNode(lang);
-        if (locale) {
+        SG_LOG(SG_GENERAL, SG_DEBUG, "trying to find locale for " << lang );
+        _currentLocale = findLocaleNode(lang);
+        if (_currentLocale) {
+            SG_LOG(SG_GENERAL, SG_DEBUG, "found locale for " << lang << " at " << _currentLocale->getPath() );
             break;
         }
     }
     
-    if (!locale)
+    // load resource for system messages (translations for fgfs internal messages)
+    loadResource("sys");
+
+    // load resource for atc messages
+    loadResource("atc");
+
+    if (!_currentLocale)
     {
        SG_LOG(SG_GENERAL, SG_ALERT,
-              "No internationalization settings specified in preferences.xml" );
+              "System locale not found or no internationalization settings specified in preferences.xml. Using default (en)." );
        return false;
     }
 
-    _currentLocale = locale;
-
-    // load resource for system messages (translations for fgfs internal messages)
-    loadResource("sys");
-
     return true;
 }
 
@@ -207,7 +210,7 @@ FGLocale::loadResource(SGPropertyNode* localeNode, const char* resource)
     if (!path_str)
     {
         SG_LOG(SG_GENERAL, SG_WARN, "No path in " << stringNode->getPath() << "/" << resource << ".");
-        return NULL;
+        return false;
     }
 
     path.append(path_str);