// headers
// ----------------------------------------------------------------------------
-#if defined(__BORLAND__) && !defined(__WXDEBUG__)
- // There's a bug in Borland's compiler that breaks wxLocale with -O2,
- // so make sure that flag is not used for this file:
- #pragma option -O1
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
#endif
#ifdef __EMX__
#define __INTERNAL_DEFS
#endif
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
#if wxUSE_INTL
#ifndef WX_PRECOMP
#include "wx/ptr_scpd.h"
#include "wx/apptrait.h"
#include "wx/stdpaths.h"
+#include "wx/hashset.h"
+#include "wx/filesys.h"
#if defined(__WXMAC__)
- #include "wx/mac/private.h" // includes mac headers
+ #include "wx/mac/private.h" // includes mac headers
+#endif
+
+#if defined(__DARWIN__)
+ #include "wx/mac/corefoundation/cfref.h"
+ #include <CoreFoundation/CFLocale.h>
+ #include "wx/mac/corefoundation/cfstring.h"
#endif
// ----------------------------------------------------------------------------
~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
ofsHashTable; // +18: offset of hash table start
};
- // all data is stored here, NULL if no data loaded
- size_t8 *m_pData;
-
- // amount of memory pointed to by m_pData.
- size_t32 m_nSize;
+ // all data is stored here
+ wxMemoryBuffer m_data;
// data description
size_t32 m_numStrings; // number of strings in this domain
: ui;
}
+ // just return the pointer to the start of the data as "char *" to
+ // facilitate doing pointer arithmetic with it
+ char *StringData() const
+ {
+ return wx_static_cast(char *, m_data.GetData());
+ }
+
const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 n) const
{
const wxMsgTableEntry * const ent = pTable + n;
// this check could fail for a corrupt message catalog
size_t32 ofsString = Swap(ent->ofsString);
- if ( ofsString + Swap(ent->nLen) > m_nSize)
+ if ( ofsString + Swap(ent->nLen) > m_data.GetDataLen())
{
return NULL;
}
- return (const char *)(m_pData + ofsString);
+ return StringData() + ofsString;
}
bool m_bSwapped; // wrong endianness?
~wxMsgCatalog();
// load the catalog from disk (szDirPrefix corresponds to language)
- bool Load(const wxChar *szDirPrefix, const wxChar *szName,
- const wxChar *msgIdCharset = NULL, bool bConvertEncoding = false);
+ bool Load(const wxString& dirPrefix, const wxString& name,
+ const wxString& msgIdCharset, bool bConvertEncoding = false);
// get name of the catalog
wxString GetName() const { return m_name; }
// get the translated string: returns NULL if not found
- const wxChar *GetString(const wxChar *sz, size_t n = size_t(-1)) const;
+ const wxString *GetString(const wxString& sz, size_t n = size_t(-1)) const;
// public variable pointing to the next element in a linked list (or NULL)
wxMsgCatalog *m_pNext;
wxMsgCatalogFile::wxMsgCatalogFile()
{
- m_pData = NULL;
- m_nSize = 0;
}
wxMsgCatalogFile::~wxMsgCatalogFile()
{
- delete [] m_pData;
}
-// return the directory to search for message catalogs under the given prefix
+// return the directories to search for message catalogs under the given
+// prefix, separated by wxPATH_SEP
static
-wxString GetMsgCatalogSubdir(const wxChar *prefix, const wxChar *lang)
+wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang)
{
- wxString searchPath;
- searchPath << prefix << wxFILE_SEP_PATH << lang;
+ // Search first in Unix-standard prefix/lang/LC_MESSAGES, then in
+ // prefix/lang and finally in just prefix.
+ //
+ // Note that we use LC_MESSAGES on all platforms and not just Unix, because
+ // it doesn't cost much to look into one more directory and doing it this
+ // way has two important benefits:
+ // a) we don't break compatibility with wx-2.6 and older by stopping to
+ // look in a directory where the catalogs used to be and thus silently
+ // breaking apps after they are recompiled against the latest wx
+ // b) it makes it possible to package app's support files in the same
+ // way on all target platforms
+ const wxString pathPrefix = wxFileName(prefix, lang).GetFullPath();
- // under Unix, the message catalogs are supposed to go into LC_MESSAGES
- // subdirectory so look there too
-#ifdef __UNIX__
- const wxString searchPathOrig(searchPath);
- searchPath << wxFILE_SEP_PATH << wxT("LC_MESSAGES")
- << wxPATH_SEP << searchPathOrig;
-#endif // __UNIX__
+ wxString searchPath;
+ searchPath.reserve(4*pathPrefix.length());
+ searchPath << pathPrefix << wxFILE_SEP_PATH << "LC_MESSAGES" << wxPATH_SEP
+ << prefix << wxFILE_SEP_PATH << wxPATH_SEP
+ << pathPrefix;
return searchPath;
}
// 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;
count = gs_searchPrefixes.size();
for ( n = 0; n < count; n++ )
{
- paths.Add(GetMsgCatalogSubdir(gs_searchPrefixes[n], lang));
+ paths.Add(GetMsgCatalogSubdirs(gs_searchPrefixes[n], lang));
}
const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH"));
if ( pszLcPath )
{
- const wxString lcp = GetMsgCatalogSubdir(pszLcPath, lang);
+ const wxString lcp = GetMsgCatalogSubdirs(pszLcPath, lang);
if ( paths.Index(lcp) == wxNOT_FOUND )
paths.Add(lcp);
}
wxString wxp = wxGetInstallPrefix();
if ( !wxp.empty() )
{
- wxp = GetMsgCatalogSubdir(wxp + _T("/share/locale"), lang);
+ wxp = GetMsgCatalogSubdirs(wxp + _T("/share/locale"), lang);
if ( paths.Index(wxp) == wxNOT_FOUND )
paths.Add(wxp);
}
}
// 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;
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
- << GetFullSearchPath(wxString(szDirPrefix).
- Left((size_t)(sublocale - szDirPrefix)));
+ << GetFullSearchPath(szDirPrefix.Left(sublocaleIndex));
}
// don't give translation errors here because the wxstd catalog might
wxFileName fn(szName);
fn.SetExt(_T("mo"));
+
wxString strFullName;
- if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) ) {
+#if wxUSE_FILESYSTEM
+ wxFileSystem fileSys;
+ if ( !fileSys.FindFileInPath(&strFullName, searchPath, fn.GetFullPath()) )
+#else // !wxUSE_FILESYSTEM
+ if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) )
+#endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
+ {
wxLogVerbose(_("catalog file for domain '%s' not found."), szName);
wxLogTrace(TRACE_I18N, _T("Catalog \"%s.mo\" not found"), szName);
return false;
}
- // open file
+ // open file and read its data
wxLogVerbose(_("using catalog '%s' from '%s'."), szName, strFullName.c_str());
wxLogTrace(TRACE_I18N, _T("Using catalog \"%s\"."), strFullName.c_str());
+#if wxUSE_FILESYSTEM
+ wxFSFile * const fileMsg = fileSys.OpenFile(strFullName);
+ if ( !fileMsg )
+ return false;
+
+ wxInputStream *fileStream = fileMsg->GetStream();
+ m_data.SetDataLen(0);
+
+ static const size_t chunkSize = 4096;
+ while ( !fileStream->Eof() ) {
+ fileStream->Read(m_data.GetAppendBuf(chunkSize), chunkSize);
+ m_data.UngetAppendBuf(fileStream->LastRead());
+ }
+
+ delete fileMsg;
+#else // !wxUSE_FILESYSTEM
wxFile fileMsg(strFullName);
if ( !fileMsg.IsOpened() )
return false;
wxASSERT_MSG( nSize == lenFile + size_t(0), _T("message catalog bigger than 4GB?") );
// read the whole file in memory
- m_pData = new size_t8[nSize];
- if ( fileMsg.Read(m_pData, nSize) != lenFile ) {
- wxDELETEA(m_pData);
+ if ( fileMsg.Read(m_data.GetWriteBuf(nSize), nSize) != lenFile )
return false;
- }
+#endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
+
// examine header
- bool bValid = nSize + (size_t)0 > sizeof(wxMsgCatalogHeader);
+ bool bValid = m_data.GetDataLen() > sizeof(wxMsgCatalogHeader);
- wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)m_pData;
+ const wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)m_data.GetData();
if ( bValid ) {
// we'll have to swap all the integers if it's true
m_bSwapped = pHeader->magic == MSGCATALOG_MAGIC_SW;
// it's either too short or has incorrect magic number
wxLogWarning(_("'%s' is not a valid message catalog."), strFullName.c_str());
- wxDELETEA(m_pData);
return false;
}
// initialize
m_numStrings = Swap(pHeader->numStrings);
- m_pOrigTable = (wxMsgTableEntry *)(m_pData +
+ m_pOrigTable = (wxMsgTableEntry *)(StringData() +
Swap(pHeader->ofsOrigTable));
- m_pTransTable = (wxMsgTableEntry *)(m_pData +
+ m_pTransTable = (wxMsgTableEntry *)(StringData() +
Swap(pHeader->ofsTransTable));
- m_nSize = (size_t32)nSize;
// now parse catalog's header and try to extract catalog charset and
// plural forms formula from it:
: new wxCSConv(msgIdCharset);
#elif wxUSE_FONTMAP
- wxASSERT_MSG( msgIdCharset == NULL,
+ wxASSERT_MSG( msgIdCharset.empty(),
_T("non-ASCII msgid languages only supported if wxUSE_WCHAR_T=1") );
wxEncodingConverter converter;
msgstr = str;
#else // !wxUSE_WCHAR_T
#if wxUSE_FONTMAP
- if ( convertEncoding )
+ if ( bConvertEncoding )
msgstr = wxString(converter.Convert(str));
else
#endif
}
}
-bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
- const wxChar *msgIdCharset, bool bConvertEncoding)
+bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
+ const wxString& msgIdCharset, bool bConvertEncoding)
{
wxMsgCatalogFile file;
- m_name = szName;
+ m_name = name;
- if ( !file.Load(szDirPrefix, szName, m_pluralFormsCalculator) )
+ if ( !file.Load(dirPrefix, name, m_pluralFormsCalculator) )
return false;
file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
return true;
}
-const wxChar *wxMsgCatalog::GetString(const wxChar *sz, size_t n) const
+const wxString *wxMsgCatalog::GetString(const wxString& str, size_t n) const
{
int index = 0;
if (n != size_t(-1))
wxMessagesHash::const_iterator i;
if (index != 0)
{
- i = m_messages.find(wxString(sz) + wxChar(index)); // plural
+ i = m_messages.find(wxString(str) + wxChar(index)); // plural
}
else
{
- i = m_messages.find(sz);
+ i = m_messages.find(str);
}
if ( i != m_messages.end() )
{
- return i->second.c_str();
+ return &i->second;
}
else
return NULL;
}
// NB: this function has (desired) side effect of changing current locale
-bool wxLocale::Init(const wxChar *szName,
- const wxChar *szShort,
- const wxChar *szLocale,
- bool bLoadDefault,
- bool bConvertEncoding)
+bool wxLocale::Init(const wxString& name,
+ const wxString& shortName,
+ const wxString& locale,
+ bool bLoadDefault,
+ bool bConvertEncoding)
{
wxASSERT_MSG( !m_initialized,
_T("you can't call wxLocale::Init more than once") );
m_initialized = true;
- m_strLocale = szName;
- m_strShort = szShort;
+ m_strLocale = name;
+ m_strShort = shortName;
m_bConvertEncoding = bConvertEncoding;
m_language = wxLANGUAGE_UNKNOWN;
// change current locale (default: same as long name)
- if ( szLocale == NULL )
+ wxString szLocale(locale);
+ if ( szLocale.empty() )
{
// the argument to setlocale()
- szLocale = szShort;
+ 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__
256);
if (ret != 0)
{
- m_pszOldLocale = wxStrdup(localeName);
+ m_pszOldLocale = wxStrdup(wxConvLibc.cWC2MB(localeName));
}
else
m_pszOldLocale = NULL;
// 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 ( m_strShort.empty() ) {
// FIXME I don't know how these 2 letter abbreviations are formed,
// this wild guess is surely wrong
- if ( szLocale && szLocale[0] )
+ if ( !szLocale.empty() )
{
m_strShort += (wxChar)wxTolower(szLocale[0]);
- if ( szLocale[1] )
+ if ( szLocale.length() > 1 )
m_strShort += (wxChar)wxTolower(szLocale[1]);
}
}
// an error if this does not exist
if ( bOk )
{
- wxString port(wxPlatformInfo().GetPortIdName());
+ wxString port(wxPlatformInfo::Get().GetPortIdName());
if ( !port.empty() )
{
AddCatalog(port.BeforeFirst(wxT('/')).MakeLower());
#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");
- l = wxSetlocale(c, buf2.c_str());
+ l = wxSetlocale(c, buf2);
if ( !l )
{
buf2 = buf + wxT(".utf-8");
- l = wxSetlocale(c, buf2.c_str());
+ l = wxSetlocale(c, buf2);
}
if ( !l )
{
buf2 = buf + wxT(".UTF8");
- l = wxSetlocale(c, buf2.c_str());
+ l = wxSetlocale(c, buf2);
}
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
-#define wxSetlocaleTryUTF(c, lc) wxSetlocale(c, lc)
+#define wxSetlocaleTryUTF8(c, lc) wxSetlocale(c, lc)
#endif
bool wxLocale::Init(int language, int flags)
{
+ bool ret = true;
+
int lang = language;
if (lang == wxLANGUAGE_DEFAULT)
{
// 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;
- 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
- retloc = wxSetlocaleTryUTF(LC_ALL, langOnly);
+ retloc = wxSetlocaleTryUTF8(LC_ALL, langOnly);
}
#if wxUSE_FONTMAP
if ( !localeAlt.empty() )
{
- retloc = wxSetlocaleTryUTF(LC_ALL, localeAlt);
+ retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt);
if ( !retloc )
- retloc = wxSetlocaleTryUTF(LC_ALL, locale.Left(2));
+ retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt.Left(2));
}
}
if ( !retloc )
- {
- wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
- return false;
- }
+ ret = false;
#ifdef __AIX__
- // at least in AIX 5.2 libc is buggy and the string returned from setlocale(LC_ALL)
- // can't be passed back to it because it returns 6 strings (one for each locale
- // category), i.e. for C locale we get back "C C C C C C"
+ // at least in AIX 5.2 libc is buggy and the string returned from
+ // setlocale(LC_ALL) can't be passed back to it because it returns 6
+ // strings (one for each locale category), i.e. for C locale we get back
+ // "C C C C C C"
//
- // 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(' '));
+ // this contradicts IBM own docs but this is not of much help, so just work
+ // around it in the crudest possible manner
+ char* p = const_cast<char*>(wxStrchr(retloc, ' '));
if ( p )
- *p = _T('\0');
+ *p = '\0';
#endif // __AIX__
#elif defined(__WIN32__)
#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 (locale.empty())
{
wxLogLastError(wxT("SetThreadLocale"));
- wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
- return false;
+ ret = false;
}
else
{
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
}
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)
{
- retloc = wxT("C");
+ retloc = "C";
}
}
#endif
}
if ( !retloc )
- {
- wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
- return false;
- }
+ ret = false;
#elif defined(__WXMAC__)
if (lang == wxLANGUAGE_DEFAULT)
locale = wxEmptyString;
else
locale = info->CanonicalName;
- wxMB2WXbuf retloc = wxSetlocale(LC_ALL, locale);
+ const char *retloc = wxSetlocale(LC_ALL, locale);
if ( !retloc )
{
// Some C libraries don't like xx_YY form and require xx only
retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
}
- if ( !retloc )
- {
- wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
- return false;
- }
#else
wxUnusedVar(flags);
return false;
#endif
#ifndef WX_NO_LOCALE_SUPPORT
- wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
- bool ret = Init(name, canonical, szLocale,
- (flags & wxLOCALE_LOAD_DEFAULT) != 0,
- (flags & wxLOCALE_CONV_ENCODING) != 0);
- free(szLocale);
+ if ( !ret )
+ {
+ wxLogWarning(_("Cannot set locale to language \"%s\"."), name.c_str());
+
+ // continue nevertheless and try to load at least the translations for
+ // this language
+ }
+
+ if ( !Init(name, canonical, retloc,
+ (flags & wxLOCALE_LOAD_DEFAULT) != 0,
+ (flags & wxLOCALE_CONV_ENCODING) != 0) )
+ {
+ ret = false;
+ }
if (IsOk()) // setlocale() succeeded
m_language = lang;
size_t i = 0,
count = ms_languagesDB->GetCount();
-#if defined(__UNIX__) && !defined(__WXMAC__)
+#if defined(__UNIX__)
// first get the string identifying the language from the environment
wxString langFull;
+#ifdef __WXMAC__
+ wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());
+
+ // because the locale identifier (kCFLocaleIdentifier) is formatted a little bit differently, eg
+ // az_Cyrl_AZ@calendar=buddhist;currency=JPY we just recreate the base info as expected by wx here
+
+ wxCFStringRef str(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleLanguageCode)));
+ langFull = str.AsString()+"_";
+ str.reset(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleCountryCode)));
+ langFull += str.AsString();
+#else
if (!wxGetEnv(wxT("LC_ALL"), &langFull) &&
!wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
!wxGetEnv(wxT("LANG"), &langFull))
{
- // no language specified, threat it as English
- return wxLANGUAGE_ENGLISH;
+ // no language specified, treat it as English
+ return wxLANGUAGE_ENGLISH_US;
}
if ( langFull == _T("C") || langFull == _T("POSIX") )
{
- // default C locale
- return wxLANGUAGE_ENGLISH;
+ // default C locale is English too
+ return wxLANGUAGE_ENGLISH_US;
}
+#endif
// the language string has the following form
//
}
}
}
-#elif defined(__WXMAC__)
- const wxChar * lc = NULL ;
- long lang = GetScriptVariable( smSystemScript, smScriptLang) ;
- switch( GetScriptManagerVariable( smRegionCode ) ) {
- case verUS :
- lc = wxT("en_US") ;
- break ;
- case verFrance :
- lc = wxT("fr_FR") ;
- break ;
- case verBritain :
- lc = wxT("en_GB") ;
- break ;
- case verGermany :
- lc = wxT("de_DE") ;
- break ;
- case verItaly :
- lc = wxT("it_IT") ;
- break ;
- case verNetherlands :
- lc = wxT("nl_NL") ;
- break ;
- case verFlemish :
- lc = wxT("nl_BE") ;
- break ;
- case verSweden :
- lc = wxT("sv_SE" );
- break ;
- case verSpain :
- lc = wxT("es_ES" );
- break ;
- case verDenmark :
- lc = wxT("da_DK") ;
- break ;
- case verPortugal :
- lc = wxT("pt_PT") ;
- break ;
- case verFrCanada:
- lc = wxT("fr_CA") ;
- break ;
- case verNorway:
- lc = wxT("nb_NO") ;
- break ;
- case verIsrael:
- lc = wxT("iw_IL") ;
- break ;
- case verJapan:
- lc = wxT("ja_JP") ;
- break ;
- case verAustralia:
- lc = wxT("en_AU") ;
- break ;
- case verArabic:
- lc = wxT("ar") ;
- break ;
- case verFinland:
- lc = wxT("fi_FI") ;
- break ;
- case verFrSwiss:
- lc = wxT("fr_CH") ;
- break ;
- case verGrSwiss:
- lc = wxT("de_CH") ;
- break ;
- case verGreece:
- lc = wxT("el_GR") ;
- break ;
- case verIceland:
- lc = wxT("is_IS") ;
- break ;
- case verMalta:
- lc = wxT("mt_MT") ;
- break ;
- case verCyprus:
- // _CY is not part of wx, so we have to translate according to the system language
- if ( lang == langGreek ) {
- lc = wxT("el_GR") ;
- }
- else if ( lang == langTurkish ) {
- lc = wxT("tr_TR") ;
- }
- break ;
- case verTurkey:
- lc = wxT("tr_TR") ;
- break ;
- case verYugoCroatian:
- lc = wxT("hr_HR") ;
- break ;
- case verIndiaHindi:
- lc = wxT("hi_IN") ;
- break ;
- case verPakistanUrdu:
- lc = wxT("ur_PK") ;
- break ;
- case verTurkishModified:
- lc = wxT("tr_TR") ;
- break ;
- case verItalianSwiss:
- lc = wxT("it_CH") ;
- break ;
- case verInternational:
- lc = wxT("en") ;
- break ;
- case verRomania:
- lc = wxT("ro_RO") ;
- break ;
- case verGreecePoly:
- lc = wxT("el_GR") ;
- break ;
- case verLithuania:
- lc = wxT("lt_LT") ;
- break ;
- case verPoland:
- lc = wxT("pl_PL") ;
- break ;
- case verMagyar :
- case verHungary:
- lc = wxT("hu_HU") ;
- break ;
- case verEstonia:
- lc = wxT("et_EE") ;
- break ;
- case verLatvia:
- lc = wxT("lv_LV") ;
- break ;
- case verSami:
- // not known
- break ;
- case verFaroeIsl:
- lc = wxT("fo_FO") ;
- break ;
- case verIran:
- lc = wxT("fa_IR") ;
- break ;
- case verRussia:
- lc = wxT("ru_RU") ;
- break ;
- case verIreland:
- lc = wxT("ga_IE") ;
- break ;
- case verKorea:
- lc = wxT("ko_KR") ;
- break ;
- case verChina:
- lc = wxT("zh_CN") ;
- break ;
- case verTaiwan:
- lc = wxT("zh_TW") ;
- break ;
- case verThailand:
- lc = wxT("th_TH") ;
- break ;
- case verCzech:
- lc = wxT("cs_CZ") ;
- break ;
- case verSlovak:
- lc = wxT("sk_SK") ;
- break ;
- case verBengali:
- lc = wxT("bn") ;
- break ;
- case verByeloRussian:
- lc = wxT("be_BY") ;
- break ;
- case verUkraine:
- lc = wxT("uk_UA") ;
- break ;
- case verGreeceAlt:
- lc = wxT("el_GR") ;
- break ;
- case verSerbian:
- lc = wxT("sr_YU") ;
- break ;
- case verSlovenian:
- lc = wxT("sl_SI") ;
- break ;
- case verMacedonian:
- lc = wxT("mk_MK") ;
- break ;
- case verCroatia:
- lc = wxT("hr_HR") ;
- break ;
- case verBrazil:
- lc = wxT("pt_BR ") ;
- break ;
- case verBulgaria:
- lc = wxT("bg_BG") ;
- break ;
- case verCatalonia:
- lc = wxT("ca_ES") ;
- break ;
- case verScottishGaelic:
- lc = wxT("gd") ;
- break ;
- case verManxGaelic:
- lc = wxT("gv") ;
- break ;
- case verBreton:
- lc = wxT("br") ;
- break ;
- case verNunavut:
- lc = wxT("iu_CA") ;
- break ;
- case verWelsh:
- lc = wxT("cy") ;
- break ;
- case verIrishGaelicScript:
- lc = wxT("ga_IE") ;
- break ;
- case verEngCanada:
- lc = wxT("en_CA") ;
- break ;
- case verBhutan:
- lc = wxT("dz_BT") ;
- break ;
- case verArmenian:
- lc = wxT("hy_AM") ;
- break ;
- case verGeorgian:
- lc = wxT("ka_GE") ;
- break ;
- case verSpLatinAmerica:
- lc = wxT("es_AR") ;
- break ;
- case verTonga:
- lc = wxT("to_TO" );
- break ;
- case verFrenchUniversal:
- lc = wxT("fr_FR") ;
- break ;
- case verAustria:
- lc = wxT("de_AT") ;
- break ;
- case verGujarati:
- lc = wxT("gu_IN") ;
- break ;
- case verPunjabi:
- lc = wxT("pa") ;
- break ;
- case verIndiaUrdu:
- lc = wxT("ur_IN") ;
- break ;
- case verVietnam:
- lc = wxT("vi_VN") ;
- break ;
- case verFrBelgium:
- lc = wxT("fr_BE") ;
- break ;
- case verUzbek:
- lc = wxT("uz_UZ") ;
- break ;
- case verSingapore:
- lc = wxT("zh_SG") ;
- break ;
- case verNynorsk:
- lc = wxT("nn_NO") ;
- break ;
- case verAfrikaans:
- lc = wxT("af_ZA") ;
- break ;
- case verEsperanto:
- lc = wxT("eo") ;
- break ;
- case verMarathi:
- lc = wxT("mr_IN") ;
- break ;
- case verTibetan:
- lc = wxT("bo") ;
- break ;
- case verNepal:
- lc = wxT("ne_NP") ;
- break ;
- case verGreenland:
- lc = wxT("kl_GL") ;
- break ;
- default :
- break ;
- }
- for ( i = 0; i < count; i++ )
- {
- if ( ms_languagesDB->Item(i).CanonicalName == lc )
- {
- break;
- }
- }
-
#elif defined(__WIN32__)
LCID lcid = GetUserDefaultLCID();
if ( lcid != 0 )
}
#elif defined(__WXMAC__)
TextEncoding encoding = 0 ;
-#if TARGET_CARBON
encoding = CFStringGetSystemEncoding() ;
-#else
- UpgradeScriptInfoToTextEncoding ( smSystemScript , kTextLanguageDontCare , kTextRegionDontCare , NULL , &encoding ) ;
-#endif
return wxMacGetFontEncFromSystemEnc( encoding ) ;
#elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
const wxString encname = GetSystemEncodingName();
// (a.k.a. US-ASCII) which is arguably a bug but keep it like this for
// backwards compatibility and just take care to not return
// wxFONTENCODING_DEFAULT from here as this surely doesn't make sense
- if ( enc != wxFONTENCODING_MAX && enc != wxFONTENCODING_DEFAULT )
+ if ( enc == wxFONTENCODING_DEFAULT )
+ {
+ // we don't have wxFONTENCODING_ASCII, so use the closest one
+ return wxFONTENCODING_ISO8859_1;
+ }
+
+ if ( enc != wxFONTENCODING_MAX )
{
return enc;
}
{
if ( ms_languagesDB->Item(i).Language == lang )
{
- return &ms_languagesDB->Item(i);
+ // We need to create a temporary here in order to make this work with BCC in final build mode
+ wxLanguageInfo *ptr = &ms_languagesDB->Item(i);
+ return ptr;
}
}
// 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;
}
// get the translation of given string in current locale
-const wxChar *wxLocale::GetString(const wxChar *szOrigString,
- const wxChar *szDomain) const
+const wxString& wxLocale::GetString(const wxString& origString,
+ const wxString& domain) const
{
- return GetString(szOrigString, szOrigString, size_t(-1), szDomain);
+ return GetString(origString, origString, size_t(-1), domain);
}
-const wxChar *wxLocale::GetString(const wxChar *szOrigString,
- const wxChar *szOrigString2,
- size_t n,
- const wxChar *szDomain) const
+const wxString& wxLocale::GetString(const wxString& origString,
+ const wxString& origString2,
+ size_t n,
+ const wxString& domain) const
{
- if ( wxIsEmpty(szOrigString) )
- return wxEmptyString;
+ if ( origString.empty() )
+ return GetUntranslatedString(origString);
- const wxChar *pszTrans = NULL;
+ const wxString *trans = NULL;
wxMsgCatalog *pMsgCat;
- if ( szDomain != NULL )
+ if ( !domain.empty() )
{
- pMsgCat = FindCatalog(szDomain);
+ pMsgCat = FindCatalog(domain);
// does the catalog exist?
if ( pMsgCat != NULL )
- pszTrans = pMsgCat->GetString(szOrigString, n);
+ trans = pMsgCat->GetString(origString, n);
}
else
{
// search in all domains
for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
{
- pszTrans = pMsgCat->GetString(szOrigString, n);
- if ( pszTrans != NULL ) // take the first found
+ trans = pMsgCat->GetString(origString, n);
+ if ( trans != NULL ) // take the first found
break;
}
}
- if ( pszTrans == NULL )
+ if ( trans == NULL )
{
#ifdef __WXDEBUG__
if ( !NoTransErr::Suppress() )
wxLogTrace(TRACE_I18N,
_T("string \"%s\"[%ld] not found in %slocale '%s'."),
- szOrigString, (long)n,
- szDomain ? wxString::Format(_T("domain '%s' "), szDomain).c_str()
- : _T(""),
+ origString, (long)n,
+ domain.empty()
+ ? (const wxChar*)wxString::Format(_T("domain '%s' "), domain).c_str()
+ : _T(""),
m_strLocale.c_str());
}
#endif // __WXDEBUG__
if (n == size_t(-1))
- return szOrigString;
+ return GetUntranslatedString(origString);
else
- return n == 1 ? szOrigString : szOrigString2;
+ return GetUntranslatedString(n == 1 ? origString : origString2);
}
- return pszTrans;
+ 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 wxChar* szHeader,
- const wxChar* szDomain ) const
+wxString wxLocale::GetHeaderValue(const wxString& header,
+ const wxString& domain) const
{
- if ( wxIsEmpty(szHeader) )
+ if ( header.empty() )
return wxEmptyString;
- wxChar const * pszTrans = NULL;
+ const wxString *trans = NULL;
wxMsgCatalog *pMsgCat;
- if ( szDomain != NULL )
+ if ( !domain.empty() )
{
- pMsgCat = FindCatalog(szDomain);
+ pMsgCat = FindCatalog(domain);
// does the catalog exist?
if ( pMsgCat == NULL )
return wxEmptyString;
- pszTrans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
+ trans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
}
else
{
// search in all domains
for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
{
- pszTrans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
- if ( pszTrans != NULL ) // take the first found
+ trans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
+ if ( trans != NULL ) // take the first found
break;
}
}
- if ( wxIsEmpty(pszTrans) )
+ if ( !trans || trans->empty() )
return wxEmptyString;
- wxChar const * pszFound = wxStrstr(pszTrans, szHeader);
- if ( pszFound == NULL )
+ size_t found = trans->find(header);
+ if ( found == wxString::npos )
return wxEmptyString;
- pszFound += wxStrlen(szHeader) + 2 /* ': ' */;
+ found += header.length() + 2 /* ': ' */;
// Every header is separated by \n
- wxChar const * pszEndLine = wxStrchr(pszFound, wxT('\n'));
- if ( pszEndLine == NULL ) pszEndLine = pszFound + wxStrlen(pszFound);
+ size_t endLine = trans->find(wxT('\n'), found);
+ size_t len = (endLine == wxString::npos) ?
+ wxString::npos : (endLine - found);
-
- // wxString( wxChar*, length);
- wxString retVal( pszFound, pszEndLine - pszFound );
-
- return retVal;
+ return trans->substr(found, len);
}
// find catalog by name in a linked list, return NULL if !found
-wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const
+wxMsgCatalog *wxLocale::FindCatalog(const wxString& domain) const
{
// linear search in the linked list
wxMsgCatalog *pMsgCat;
for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
{
- if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 )
+ if ( pMsgCat->GetName() == domain )
return pMsgCat;
}
const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
wxCHECK_MSG( info, false, _T("invalid language") );
-#ifdef __WIN32__
+#if defined(__WIN32__)
if ( !info->WinLang )
return false;
SORT_DEFAULT),
LCID_INSTALLED
) )
- return false;
-#else // !__WIN32__
- // TODO: test if setlocale(info->CanonicalName) works under other OS?
-#endif // __WIN32__/!__WIN32__
+ return false;
+
+#elif defined(__UNIX__)
+
+ // 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
+ tmp = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName.Left(2));
+ if ( !tmp )
+ return false;
+ }
+ // restore the original locale
+ wxSetlocale(LC_ALL, oldLocale);
+#endif
return true;
}
// check if the given catalog is loaded
-bool wxLocale::IsLoaded(const wxChar *szDomain) const
+bool wxLocale::IsLoaded(const wxString& szDomain) const
{
return FindCatalog(szDomain) != NULL;
}
// add a catalog to our linked list
-bool wxLocale::AddCatalog(const wxChar *szDomain)
+bool wxLocale::AddCatalog(const wxString& szDomain)
{
- return AddCatalog(szDomain, wxLANGUAGE_ENGLISH, NULL);
+ return AddCatalog(szDomain, wxLANGUAGE_ENGLISH_US, wxEmptyString);
}
// add a catalog to our linked list
-bool wxLocale::AddCatalog(const wxChar *szDomain,
- wxLanguage msgIdLanguage,
- const wxChar *msgIdCharset)
+bool wxLocale::AddCatalog(const wxString& szDomain,
+ wxLanguage msgIdLanguage,
+ const wxString& msgIdCharset)
{
wxMsgCatalog *pMsgCat = new wxMsgCatalog;
// accessors for locale-dependent data
// ----------------------------------------------------------------------------
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
/* static */
wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
return str;
}
-#else // !__WXMSW__
+#elif defined(__DARWIN__)
+
+/* static */
+wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
+{
+ wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());
+ CFTypeRef cfstr;
+ switch ( index )
+ {
+ case wxLOCALE_THOUSANDS_SEP:
+ cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);
+ break;
+
+ case wxLOCALE_DECIMAL_POINT:
+ cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);
+ break;
+
+ default:
+ wxFAIL_MSG( "Unknown locale info" );
+ }
+
+ wxCFStringRef
+ str(CFStringCreateCopy(NULL, static_cast<CFStringRef>(cfstr)));
+ return str.AsString();
+}
+
+#else // !__WXMSW__ && !__DARWIN__
/* static */
wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
}
}
-#endif // __WXMSW__/!__WXMSW__
+#endif // platform
// ----------------------------------------------------------------------------
// global functions and variables
projects / wxWidgets.git / blobdiff