Tweaked python image output slightly

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 8f36b359d7beb3cb3d87265a1317c70529e6507f..1176aa6ab2c1d3c0273939cd3e9f156c3800dc69 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -307,15 +307,20 @@ static wxString GetFullSearchPath(const wxChar *lang)
     wxGetWorkingDirectory( cwd , sizeof( cwd ) ) ;
     searchPath << GetAllMsgCatalogSubdirs(cwd, lang);
     // generic search paths could be somewhere in the system folder preferences
     wxGetWorkingDirectory( cwd , sizeof( cwd ) ) ;
     searchPath << GetAllMsgCatalogSubdirs(cwd, lang);
     // generic search paths could be somewhere in the system folder preferences

-#else
+#else // !Mac

     searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
 
     searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
 

+#ifdef __UNIX__

     // and finally add some standard ones
     searchPath
     // and finally add some standard ones
     searchPath

+        << GetAllMsgCatalogSubdirs(wxString(wxGetInstallPrefix()) + wxT("/share/locale"), lang)

         << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang)
         << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang)
         << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);
         << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang)
         << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang)
         << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);

-#endif
+#endif // __UNIX__
+
+#endif // platform
+

     return searchPath;
 }
 
     return searchPath;
 }
 


@@ -678,7 +683,7 @@ bool wxLocale::Init(int language, int flags)
     const wxChar *retloc;
 
     // Set the locale:
     const wxChar *retloc;
 
     // Set the locale:

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC__)

     if (language == wxLANGUAGE_DEFAULT)
         locale = wxEmptyString;
     else
     if (language == wxLANGUAGE_DEFAULT)
         locale = wxEmptyString;
     else


@@ -789,7 +794,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
     size_t i = 0,
            count = ms_languagesDB->GetCount();
 
     size_t i = 0,
            count = ms_languagesDB->GetCount();
 

-#if defined(__UNIX__)
+#if defined(__UNIX__) && !defined(__WXMAC__)

     // first get the string identifying the language from the environment
     wxString langFull;
     if (!wxGetEnv(wxT("LC_ALL"), &langFull) &&
     // first get the string identifying the language from the environment
     wxString langFull;
     if (!wxGetEnv(wxT("LC_ALL"), &langFull) &&


@@ -912,7 +917,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
         }
     }
 #elif defined(__WXMAC__)
         }
     }
 #elif defined(__WXMAC__)

-    char* lc = NULL ;
+    const char* lc = NULL ;

     long lang = GetScriptVariable( smSystemScript, smScriptLang) ;
     switch( GetScriptManagerVariable( smRegionCode ) ) {
       case verUS :
     long lang = GetScriptVariable( smSystemScript, smScriptLang) ;
     switch( GetScriptManagerVariable( smRegionCode ) ) {
       case verUS :


@@ -1271,7 +1276,7 @@ wxString wxLocale::GetSystemEncodingName()
         }
         else
         {
         }
         else
         {

-            encname = wxConvLibc.cMB2WX(alang);
+            encname = wxString::FromAscii( alang );

         }
     }
     else
         }
     }
     else


@@ -1280,24 +1285,24 @@ wxString wxLocale::GetSystemEncodingName()
         // if we can't get at the character set directly, try to see if it's in
         // the environment variables (in most cases this won't work, but I was
         // out of ideas)
         // if we can't get at the character set directly, try to see if it's in
         // the environment variables (in most cases this won't work, but I was
         // out of ideas)

-        wxChar *lang = wxGetenv(wxT("LC_ALL"));
-        wxChar *dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL;
+        char *lang = getenv( "LC_ALL");
+        char *dot = lang ? strchr(lang, '.') : (char *)NULL;

         if (!dot)
         {
         if (!dot)
         {

-            lang = wxGetenv(wxT("LC_CTYPE"));
+            lang = getenv( "LC_CTYPE" );

             if ( lang )
             if ( lang )

-                dot = wxStrchr(lang, wxT('.'));
+                dot = strchr(lang, '.' );

         }
         if (!dot)
         {
         }
         if (!dot)
         {

-            lang = wxGetenv(wxT("LANG"));
+            lang = getenv( "LANG");

             if ( lang )
             if ( lang )

-                dot = wxStrchr(lang, wxT('.'));
+                dot = strchr(lang, '.');

         }
 
         if ( dot )
         {
         }
 
         if ( dot )
         {

-            encname = dot+1;
+            encname = wxString::FromAscii( dot+1 );

         }
     }
 #endif // Win32/Unix
         }
     }
 #endif // Win32/Unix


@@ -1425,12 +1430,14 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
 
             if ( szDomain != NULL )
             {
 
             if ( szDomain != NULL )
             {

-                wxLogDebug(_T("string '%s' not found in domain '%s' for locale '%s'."),
-                             szOrigString, szDomain, m_strLocale.c_str());
+                wxLogTrace(_T("i18n"),
+                           _T("string '%s' not found in domain '%s' for locale '%s'."),
+                           szOrigString, szDomain, m_strLocale.c_str());

             }
             else
             {
             }
             else
             {

-                wxLogDebug(_T("string '%s' not found in locale '%s'."),
+                wxLogTrace(_T("i18n"),
+                           _T("string '%s' not found in locale '%s'."),

                            szOrigString, m_strLocale.c_str());
             }
         }
                            szOrigString, m_strLocale.c_str());
             }
         }