All char, char *, and char arrays changed to use wxChar or wxString. 99% backward...

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 7b9eb1135c2f799018221a4e553436f98312a7af..4c49a6832638b4f228ac1729cb89af37351ea02a 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -678,8 +678,8 @@ bool wxLocale::Init(int language, int flags)
                 buffer[0] = wxT('\0');
                 GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, 256);
                 locale << buffer;
-                buffer[0] = wxT('\0');
-                GetLocaleInfo(lcid, LOCALE_SENGCOUNTRY, buffer, 256);
+                if (GetLocaleInfo(lcid, LOCALE_SENGCOUNTRY, buffer, 256) > 0)
+                    locale << wxT("_") << buffer;
             }
             if (locale.IsEmpty())
             {
@@ -721,7 +721,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
 }
 
 
-int wxLocale::GetSystemLanguage()
+int wxLocale::GetSystemLanguage() const
 {
     int wxlang = wxLANGUAGE_UNKNOWN;
     size_t i;
@@ -992,6 +992,7 @@ wxLocale *wxSetLocale(wxLocale *pLocale)
 // default languages table & initialization
 // ----------------------------------------------------------------------------
 
+
 // This table is generated by misc/languages/genlang.py
 // When making changes, please put them into misc/languages/langtabl.txt
 
@@ -1087,7 +1088,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_ESPERANTO,                  "eo"   , 0              , 0                                 , "Esperanto")
    LNG(wxLANGUAGE_ESTONIAN,                   "et_EE", LANG_ESTONIAN  , SUBLANG_DEFAULT                   , "Estonian")
    LNG(wxLANGUAGE_FAEROESE,                   "fo_FO", LANG_FAEROESE  , SUBLANG_DEFAULT                   , "Faeroese")
-   LNG(wxLANGUAGE_FARSI,                      ""     , LANG_FARSI     , SUBLANG_DEFAULT                   , "Farsi")
+   LNG(wxLANGUAGE_FARSI,                      "fa_IR", LANG_FARSI     , SUBLANG_DEFAULT                   , "Farsi")
    LNG(wxLANGUAGE_FIJI,                       "fj"   , 0              , 0                                 , "Fiji")
    LNG(wxLANGUAGE_FINNISH,                    "fi_FI", LANG_FINNISH   , SUBLANG_DEFAULT                   , "Finnish")
    LNG(wxLANGUAGE_FRENCH,                     "fr_FR", LANG_FRENCH    , SUBLANG_FRENCH                    , "French")
@@ -1161,7 +1162,6 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_ORIYA,                      "or"   , LANG_ORIYA     , SUBLANG_DEFAULT                   , "Oriya")
    LNG(wxLANGUAGE_OROMO,                      "om"   , 0              , 0                                 , "(Afan) Oromo")
    LNG(wxLANGUAGE_PASHTO,                     "ps"   , 0              , 0                                 , "Pashto, Pushto")
-   LNG(wxLANGUAGE_PERSIAN,                    "fa_IR", 0              , 0                                 , "Persian")
    LNG(wxLANGUAGE_POLISH,                     "pl_PL", LANG_POLISH    , SUBLANG_DEFAULT                   , "Polish")
    LNG(wxLANGUAGE_PORTUGUESE,                 "pt_PT", LANG_PORTUGUESE, SUBLANG_PORTUGUESE                , "Portuguese")
    LNG(wxLANGUAGE_PORTUGUESE_BRAZILIAN,       "pt_BR", LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN      , "Portuguese (Brazilian)")
@@ -1247,6 +1247,5 @@ void wxLocale::InitLanguagesDB()
 #undef LNG
 
 
-
 #endif // wxUSE_INTL