// headers
// ----------------------------------------------------------------------------
-#ifdef __EMX__
-// The following define is needed by Innotek's libc to
-// make the definition of struct localeconv available.
-#define __INTERNAL_DEFS
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#ifdef __EMX__
+// The following define is needed by Innotek's libc to
+// make the definition of struct localeconv available.
+#define __INTERNAL_DEFS
+#endif
+
#if wxUSE_INTL
#ifndef WX_PRECOMP
#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
// ----------------------------------------------------------------------------
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?
wxMsgCatalogFile::wxMsgCatalogFile()
{
- m_pData = NULL;
- m_nSize = 0;
}
wxMsgCatalogFile::~wxMsgCatalogFile()
{
- delete [] m_pData;
}
// return the directories to search for message catalogs under the given
static
wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang)
{
- wxString searchPath;
- searchPath << prefix << wxFILE_SEP_PATH << lang;
-
- // Under Unix, the message catalogs are supposed to go into LC_MESSAGES
- // subdirectory so look there too. Note that we do it 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:
+ // 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 searchPathOrig(searchPath);
- searchPath << wxFILE_SEP_PATH << wxT("LC_MESSAGES")
- << wxPATH_SEP << searchPathOrig;
+ const wxString pathPrefix = wxFileName(prefix, lang).GetFullPath();
+
+ 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;
}
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:
bool wxLocale::Init(int language, int flags)
{
+ bool ret = true;
+
int lang = language;
if (lang == wxLANGUAGE_DEFAULT)
{
}
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
//
// this contradicts IBM own docs but this is not of much help, so just work
// around it in the crudest possible manner
- char *p = wxStrchr(retloc, ' ');
+ char* p = const_cast<char*>(wxStrchr(retloc, ' '));
if ( p )
*p = '\0';
#endif // __AIX__
if (locale.empty())
{
wxLogLastError(wxT("SetThreadLocale"));
- wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
- return false;
+ ret = false;
}
else
{
}
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;
// 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
- bool ret = Init(name, canonical, retloc,
- (flags & wxLOCALE_LOAD_DEFAULT) != 0,
- (flags & wxLOCALE_CONV_ENCODING) != 0);
+ 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))
// 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();
// 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