no changes, just a typo fix

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 0dcec7965268914baa6e5bb50b6317d28bd7eecc..0a027c9971795319ac8095aa902605fa48a1bd5a 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -69,6 +69,7 @@
 #include "wx/ptr_scpd.h"
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"
 #include "wx/ptr_scpd.h"
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"

+#include "wx/hashset.h"

 
 #if defined(__WXMAC__)
     #include  "wx/mac/private.h"  // includes mac headers
 
 #if defined(__WXMAC__)
     #include  "wx/mac/private.h"  // includes mac headers


@@ -872,7 +873,7 @@ public:
    ~wxMsgCatalogFile();
 
     // load the catalog from disk (szDirPrefix corresponds to language)
    ~wxMsgCatalogFile();
 
     // load the catalog from disk (szDirPrefix corresponds to language)

-    bool Load(const wxChar *szDirPrefix, const wxChar *szName,
+    bool Load(const wxString& szDirPrefix, const wxString& szName,

               wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
 
     // fills the hash with string-translation pairs
               wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
 
     // fills the hash with string-translation pairs


@@ -1014,7 +1015,7 @@ wxMsgCatalogFile::~wxMsgCatalogFile()
 // return the directories to search for message catalogs under the given
 // prefix, separated by wxPATH_SEP
 static
 // return the directories to search for message catalogs under the given
 // prefix, separated by wxPATH_SEP
 static

-wxString GetMsgCatalogSubdirs(const wxChar *prefix, const wxChar *lang)
+wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang)

 {
     wxString searchPath;
     searchPath << prefix << wxFILE_SEP_PATH << lang;
 {
     wxString searchPath;
     searchPath << prefix << wxFILE_SEP_PATH << lang;


@@ -1036,7 +1037,7 @@ wxString GetMsgCatalogSubdirs(const wxChar *prefix, const wxChar *lang)
 }
 
 // construct the search path for the given language
 }
 
 // construct the search path for the given language

-static wxString GetFullSearchPath(const wxChar *lang)
+static wxString GetFullSearchPath(const wxString& lang)

 {
     // first take the entries explicitly added by the program
     wxArrayString paths;
 {
     // first take the entries explicitly added by the program
     wxArrayString paths;


@@ -1096,7 +1097,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
 }
 
 // open disk file and read in it's contents
 }
 
 // open disk file and read in it's contents

-bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
+bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,

                             wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
 {
   wxString searchPath;
                             wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
 {
   wxString searchPath;


@@ -1117,15 +1118,14 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
 
 
   searchPath += GetFullSearchPath(szDirPrefix);
 
 
   searchPath += GetFullSearchPath(szDirPrefix);

-  const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
-  if ( sublocale )
+  size_t sublocaleIndex = szDirPrefix.find(wxT('_'));
+  if ( sublocaleIndex != wxString::npos )

   {
       // also add just base locale name: for things like "fr_BE" (belgium
       // french) we should use "fr" if no belgium specific message catalogs
       // exist
       searchPath << wxPATH_SEP
   {
       // also add just base locale name: for things like "fr_BE" (belgium
       // french) we should use "fr" if no belgium specific message catalogs
       // exist
       searchPath << wxPATH_SEP

-                 << GetFullSearchPath(wxString(szDirPrefix).
-                                      Left((size_t)(sublocale - szDirPrefix)));
+                 << GetFullSearchPath(szDirPrefix.Left(sublocaleIndex));

   }
 
   // don't give translation errors here because the wxstd catalog might
   }
 
   // don't give translation errors here because the wxstd catalog might


@@ -1534,7 +1534,8 @@ bool wxLocale::Init(const wxString& name,
     // the argument to setlocale()
     szLocale = shortName;
 
     // the argument to setlocale()
     szLocale = shortName;
 

-    wxCHECK_MSG( szLocale, false, _T("no locale to set in wxLocale::Init()") );
+    wxCHECK_MSG( !szLocale.empty(), false,
+                 _T("no locale to set in wxLocale::Init()") );

   }
 
 #ifdef __WXWINCE__
   }
 
 #ifdef __WXWINCE__


@@ -1544,7 +1545,7 @@ bool wxLocale::Init(const wxString& name,
       256);
   if (ret != 0)
   {
       256);
   if (ret != 0)
   {

-    m_pszOldLocale = wxStrdup(localeName);
+    m_pszOldLocale = wxStrdup(wxConvLibc.cWC2MB(localeName));

   }
   else
     m_pszOldLocale = NULL;
   }
   else
     m_pszOldLocale = NULL;


@@ -1552,7 +1553,7 @@ bool wxLocale::Init(const wxString& name,
   // TODO: how to find languageId
   // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
 #else
   // TODO: how to find languageId
   // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
 #else

-  wxMB2WXbuf oldLocale = wxSetlocale(LC_ALL, szLocale);
+  const char *oldLocale = wxSetlocale(LC_ALL, szLocale);

   if ( oldLocale )
       m_pszOldLocale = wxStrdup(oldLocale);
   else
   if ( oldLocale )
       m_pszOldLocale = wxStrdup(oldLocale);
   else


@@ -1599,35 +1600,44 @@ bool wxLocale::Init(const wxString& name,
 
 
 #if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__)
 
 
 #if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__)

-static wxWCharBuffer wxSetlocaleTryUTF(int c, const wxChar *lc)
+static const char *wxSetlocaleTryUTF8(int c, const wxString& lc)

 {
 {

-    wxMB2WXbuf l = wxSetlocale(c, lc);
-    if ( !l && lc && lc[0] != 0 )
+    const char *l = NULL;
+
+    // NB: We prefer to set UTF-8 locale if it's possible and only fall back to
+    //     non-UTF-8 locale if it fails
+
+    if ( !lc.empty() )

     {
         wxString buf(lc);
         wxString buf2;
         buf2 = buf + wxT(".UTF-8");
     {
         wxString buf(lc);
         wxString buf2;
         buf2 = buf + wxT(".UTF-8");

-        l = wxSetlocale(c, buf2.c_str());
+        l = wxSetlocale(c, buf2);

         if ( !l )
         {
             buf2 = buf + wxT(".utf-8");
         if ( !l )
         {
             buf2 = buf + wxT(".utf-8");

-            l = wxSetlocale(c, buf2.c_str());
+            l = wxSetlocale(c, buf2);

         }
         if ( !l )
         {
             buf2 = buf + wxT(".UTF8");
         }
         if ( !l )
         {
             buf2 = buf + wxT(".UTF8");

-            l = wxSetlocale(c, buf2.c_str());
+            l = wxSetlocale(c, buf2);

         }
         if ( !l )
         {
             buf2 = buf + wxT(".utf8");
         }
         if ( !l )
         {
             buf2 = buf + wxT(".utf8");

-            l = wxSetlocale(c, buf2.c_str());
+            l = wxSetlocale(c, buf2);

         }
     }
         }
     }

+
+    // if we can't set UTF-8 locale, try non-UTF-8 one:
+    if ( !l )
+        l = wxSetlocale(c, lc);
+

     return l;
 }
 #else
     return l;
 }
 #else

-#define wxSetlocaleTryUTF(c, lc)  wxSetlocale(c, lc)
+#define wxSetlocaleTryUTF8(c, lc)  wxSetlocale(c, lc)

 #endif
 
 bool wxLocale::Init(int language, int flags)
 #endif
 
 bool wxLocale::Init(int language, int flags)


@@ -1660,18 +1670,18 @@ bool wxLocale::Init(int language, int flags)
 
     // Set the locale:
 #if defined(__OS2__)
 
     // Set the locale:
 #if defined(__OS2__)

-    wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
+    const char *retloc = wxSetlocale(LC_ALL , wxEmptyString);

 #elif defined(__UNIX__) && !defined(__WXMAC__)
     if (language != wxLANGUAGE_DEFAULT)
         locale = info->CanonicalName;
 
 #elif defined(__UNIX__) && !defined(__WXMAC__)
     if (language != wxLANGUAGE_DEFAULT)
         locale = info->CanonicalName;
 

-    wxMB2WXbuf retloc = wxSetlocaleTryUTF(LC_ALL, locale);
+    const char *retloc = wxSetlocaleTryUTF8(LC_ALL, locale);

 
     const wxString langOnly = locale.Left(2);
     if ( !retloc )
     {
         // Some C libraries don't like xx_YY form and require xx only
 
     const wxString langOnly = locale.Left(2);
     if ( !retloc )
     {
         // Some C libraries don't like xx_YY form and require xx only

-        retloc = wxSetlocaleTryUTF(LC_ALL, langOnly);
+        retloc = wxSetlocaleTryUTF8(LC_ALL, langOnly);

     }
 
 #if wxUSE_FONTMAP
     }
 
 #if wxUSE_FONTMAP


@@ -1712,9 +1722,9 @@ bool wxLocale::Init(int language, int flags)
 
         if ( !localeAlt.empty() )
         {
 
         if ( !localeAlt.empty() )
         {

-            retloc = wxSetlocaleTryUTF(LC_ALL, localeAlt);
+            retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt);

             if ( !retloc )
             if ( !retloc )

-                retloc = wxSetlocaleTryUTF(LC_ALL, localeAlt.Left(2));
+                retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt.Left(2));

         }
     }
 
         }
     }
 


@@ -1732,9 +1742,9 @@ bool wxLocale::Init(int language, int flags)
     //
     // this contradicts IBM own docs but this is not of much help, so just work
     // around it in the crudest possible manner
     //
     // this contradicts IBM own docs but this is not of much help, so just work
     // around it in the crudest possible manner

-    wxChar *p = wxStrchr((wxChar *)retloc, _T(' '));
+    char *p = wxStrchr(retloc, ' ');

     if ( p )
     if ( p )

-        *p = _T('\0');
+        *p = '\0';

 #endif // __AIX__
 
 #elif defined(__WIN32__)
 #endif // __AIX__
 
 #elif defined(__WIN32__)


@@ -1749,10 +1759,7 @@ bool wxLocale::Init(int language, int flags)
         #define SETLOCALE_FAILS_ON_UNICODE_LANGS
     #endif
 
         #define SETLOCALE_FAILS_ON_UNICODE_LANGS
     #endif
 

-#if !wxUSE_UNICODE
-    const
-#endif
-    wxMB2WXbuf retloc = wxT("C");
+    const char *retloc = "C";

     if (language != wxLANGUAGE_DEFAULT)
     {
         if (info->WinLang == 0)
     if (language != wxLANGUAGE_DEFAULT)
     {
         if (info->WinLang == 0)


@@ -1801,9 +1808,9 @@ bool wxLocale::Init(int language, int flags)
                 retloc = wxSetlocale(LC_ALL, locale);
 #endif
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
                 retloc = wxSetlocale(LC_ALL, locale);
 #endif
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS

-                if (codepage == 0 && (const wxChar*)retloc == NULL)
+                if (codepage == 0 && retloc == NULL)

                 {
                 {

-                    retloc = wxT("C");
+                    retloc = "C";

                 }
 #endif
             }
                 }
 #endif
             }


@@ -1818,14 +1825,14 @@ bool wxLocale::Init(int language, int flags)
         retloc = NULL;
 #endif
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
         retloc = NULL;
 #endif
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS

-        if ((const wxChar*)retloc == NULL)
+        if (retloc == NULL)

         {
             wxChar buffer[16];
             if (GetLocaleInfo(LOCALE_USER_DEFAULT,
                               LOCALE_IDEFAULTANSICODEPAGE, buffer, 16) > 0 &&
                  wxStrcmp(buffer, wxT("0")) == 0)
             {
         {
             wxChar buffer[16];
             if (GetLocaleInfo(LOCALE_USER_DEFAULT,
                               LOCALE_IDEFAULTANSICODEPAGE, buffer, 16) > 0 &&
                  wxStrcmp(buffer, wxT("0")) == 0)
             {

-                retloc = wxT("C");
+                retloc = "C";

             }
         }
 #endif
             }
         }
 #endif


@@ -1842,7 +1849,7 @@ bool wxLocale::Init(int language, int flags)
     else
         locale = info->CanonicalName;
 
     else
         locale = info->CanonicalName;
 

-    wxMB2WXbuf retloc = wxSetlocale(LC_ALL, locale);
+    const char *retloc = wxSetlocale(LC_ALL, locale);

 
     if ( !retloc )
     {
 
     if ( !retloc )
     {


@@ -2550,7 +2557,7 @@ const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale)
             // looking
             //
             // OTOH, maybe we had already found a language match and in this
             // looking
             //
             // OTOH, maybe we had already found a language match and in this

-            // case don't overwrite it becauce the entry for the default
+            // case don't overwrite it because the entry for the default

             // country always appears first in ms_languagesDB
             if ( !infoRet )
                 infoRet = info;
             // country always appears first in ms_languagesDB
             if ( !infoRet )
                 infoRet = info;


@@ -2604,7 +2611,7 @@ const wxString& wxLocale::GetString(const wxString& origString,
                                     const wxString& domain) const
 {
     if ( origString.empty() )
                                     const wxString& domain) const
 {
     if ( origString.empty() )

-        return origString;
+        return GetUntranslatedString(origString);

 
     const wxString *trans = NULL;
     wxMsgCatalog *pMsgCat;
 
     const wxString *trans = NULL;
     wxMsgCatalog *pMsgCat;


@@ -2646,14 +2653,29 @@ const wxString& wxLocale::GetString(const wxString& origString,
 #endif // __WXDEBUG__
 
         if (n == size_t(-1))
 #endif // __WXDEBUG__
 
         if (n == size_t(-1))

-            return origString;
+            return GetUntranslatedString(origString);

         else
         else

-            return n == 1 ? origString : origString2;
+            return GetUntranslatedString(n == 1 ? origString : origString2);

     }
 
     return *trans;
 }
 
     }
 
     return *trans;
 }
 

+WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual,
+                    wxLocaleUntranslatedStrings);
+
+/* static */
+const wxString& wxLocale::GetUntranslatedString(const wxString& str)
+{
+    static wxLocaleUntranslatedStrings s_strings;
+
+    wxLocaleUntranslatedStrings::iterator i = s_strings.find(str);
+    if ( i == s_strings.end() )
+        return *s_strings.insert(str).first;
+
+    return *i;
+}
+

 wxString wxLocale::GetHeaderValue(const wxString& header,
                                   const wxString& domain) const
 {
 wxString wxLocale::GetHeaderValue(const wxString& header,
                                   const wxString& domain) const
 {


@@ -2737,20 +2759,20 @@ bool wxLocale::IsAvailable(int lang)
         return false;
 
 #elif defined(__UNIX__)
         return false;
 
 #elif defined(__UNIX__)

-    
-    // Test if setting the locale works, then set it back. 
-    wxMB2WXbuf oldLocale = wxSetlocale(LC_ALL, wxEmptyString);
-    wxMB2WXbuf tmp = wxSetlocaleTryUTF(LC_ALL, info->CanonicalName);
+
+    // Test if setting the locale works, then set it back.
+    const char *oldLocale = wxSetlocale(LC_ALL, "");
+    const char *tmp = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName);

     if ( !tmp )
     {
         // Some C libraries don't like xx_YY form and require xx only
     if ( !tmp )
     {
         // Some C libraries don't like xx_YY form and require xx only

-        tmp = wxSetlocaleTryUTF(LC_ALL, info->CanonicalName.Left(2));
+        tmp = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName.Left(2));

         if ( !tmp )
             return false;
     }
     // restore the original locale
         if ( !tmp )
             return false;
     }
     // restore the original locale

-    wxSetlocale(LC_ALL, oldLocale);    
-#endif 
+    wxSetlocale(LC_ALL, oldLocale);
+#endif

 
     return true;
 }
 
     return true;
 }