Fix for the fix: check for a viewer.

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

diff --git a/src/Main/locale.cxx b/src/Main/locale.cxx
index ae4cedf076e529932965cb4e82f4e4f815ab6792..783b3f24743c0d022fcdcf99205d93476a998e02 100644 (file)
--- a/src/Main/locale.cxx
+++ b/src/Main/locale.cxx
@@ -18,10 +18,17 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif
 
+#include <cstdio>
+#include <boost/foreach.hpp>
+
 #include <simgear/props/props_io.hxx>
 #include <simgear/structure/exception.hxx>
 
@@ -53,9 +60,10 @@ FGLocale::~FGLocale()
  *
  * This software comes with no warranty. Use at your own risk.
  */
-const char*
+string_list
 FGLocale::getUserLanguage()
 {
+    string_list result;
     static char locale[100] = {0};
 
     if (GetLocaleInfo(LOCALE_USER_DEFAULT,
@@ -68,23 +76,35 @@ FGLocale::getUserLanguage()
         if (GetLocaleInfo(LOCALE_USER_DEFAULT,
                           LOCALE_SISO3166CTRYNAME,
                           locale+i, (int)(sizeof(locale)-i)))
-            return locale;
-
+        {
+            result.push_back(locale);
+            return result;
+        }
+        
         locale[--i] = 0;
         SG_LOG(SG_GENERAL, SG_WARN, "Failed to detected locale's country setting.");
-        return locale;
+        result.push_back(locale);
+        return result;
     }
 
-    return NULL;
+    return result;
 }
+#elif __APPLE__
+//  implemented in CocoaHelpers.mm
 #else
 /**
- * Determine locale/language settings on Linux (and Mac?).
+ * Determine locale/language settings on Linux/Unix.
  */
-const char*
+string_list
 FGLocale::getUserLanguage()
 {
-    return ::getenv("LANG");
+    string_list result;
+    const char* langEnv = ::getenv("LANG");
+    if (langEnv) {
+        result.push_back(langEnv);
+    }
+    
+    return result;
 }
 #endif
 
@@ -138,21 +158,27 @@ FGLocale::findLocaleNode(const string& language)
 bool
 FGLocale::selectLanguage(const char *language)
 {
-    // Use system setting when no language is given.
-    if ((language == NULL)||(language[0]==0))
-    {
-        language = getUserLanguage();
-        SG_LOG(SG_GENERAL, SG_INFO, "System language: " << ((language) ? language : "<unavailable>"));
-    }
-
-    // Use plain C locale if nothing is available.
-    if ((language == NULL)||(language[0]==0))
-    {
+    string_list languages = getUserLanguage();
+    if (languages.empty()) {
+        // Use plain C locale if nothing is available.
         SG_LOG(SG_GENERAL, SG_WARN, "Unable to detect system language" );
-        language = "C";
+        languages.push_back("C");
+    }
+    
+    // if we were passed a language option, try it first
+    if ((language != NULL) && (strlen(language) > 0)) {
+        languages.insert(languages.begin(), string(language));
     }
 
-    SGPropertyNode *locale = findLocaleNode(language);
+    
+    SGPropertyNode *locale = NULL;
+    BOOST_FOREACH(string lang, languages) {
+        locale = findLocaleNode(lang);
+        if (locale) {
+            break;
+        }
+    }
+    
     if (!locale)
     {
        SG_LOG(SG_GENERAL, SG_ALERT,
@@ -161,6 +187,10 @@ FGLocale::selectLanguage(const char *language)
     }
 
     _currentLocale = locale;
+
+    // load resource for system messages (translations for fgfs internal messages)
+    loadResource("sys");
+
     return true;
 }
 
@@ -264,14 +294,14 @@ FGLocale::getLocalizedStrings(const char* id, const char* resource)
         if (_currentLocale)
         {
             simgear::PropertyList s = getLocalizedStrings(_currentLocale, id, resource);
-            if (s.size())
+            if (! s.empty())
                 return s;
         }
 
         if (_defaultLocale)
         {
             simgear::PropertyList s = getLocalizedStrings(_defaultLocale, id, resource);
-            if (s.size())
+            if (! s.empty())
                 return s;
         }
     }
@@ -299,6 +329,24 @@ FGLocale::getDefaultFont(const char* fallbackFont)
     return fallbackFont;
 }
 
+std::string FGLocale::localizedPrintf(const char* id, const char* resource, ... )
+{
+    va_list args;
+    va_start(args, resource);
+    string r = vlocalizedPrintf(id, resource, args);
+    va_end(args);
+    return r;
+}
+
+std::string FGLocale::vlocalizedPrintf(const char* id, const char* resource, va_list args)
+{
+    const char* format = getLocalizedString(id, resource);
+    int len = ::vsprintf(NULL, format, args);
+    char* buf = (char*) alloca(len);
+    ::vsprintf(buf, format, args);
+    return std::string(buf);
+}
+
 // Simple UTF8 to Latin1 encoder.
 void FGLocale::utf8toLatin1(string& s)
 {
@@ -348,3 +396,18 @@ void FGLocale::utf8toLatin1(string& s)
         pos++;
     }
 }
+
+const char* fgTrMsg(const char* key)
+{
+    return globals->get_locale()->getLocalizedString(key, "message");
+}
+
+std::string fgTrPrintfMsg(const char* key, ...)
+{
+    va_list args;
+    va_start(args, key);
+    string r = globals->get_locale()->vlocalizedPrintf(key, "message", args);
+    va_end(args);
+    return r;
+    
+}