#include "wx/hashset.h"
#include "wx/filesys.h"
-#if defined(__WXMAC__)
- #include "wx/mac/private.h" // includes mac headers
-#endif
-
-#if defined(__WXOSX__)
- #include "wx/mac/corefoundation/cfstring.h"
- #include "wx/mac/corefoundation/cfref.h"
+#if defined(__DARWIN__)
+ #include "wx/osx/core/cfref.h"
+ #include <CoreFoundation/CFLocale.h>
+ #include "wx/osx/core/cfstring.h"
#endif
// ----------------------------------------------------------------------------
const size_t32 MSGCATALOG_MAGIC = 0x950412de;
const size_t32 MSGCATALOG_MAGIC_SW = 0xde120495;
-// the constants describing the format of lang_LANG locale string
+// the constants describing the format of ll_CC locale string
static const size_t LEN_LANG = 2;
static const size_t LEN_SUBLANG = 2;
static const size_t LEN_FULL = LEN_LANG + 1 + LEN_SUBLANG; // 1 for '_'
-#define TRACE_I18N _T("i18n")
+#define TRACE_I18N wxS("i18n")
// ----------------------------------------------------------------------------
// global functions
static wxLocale *wxSetLocale(wxLocale *pLocale);
-// helper functions of GetSystemLanguage()
-#ifdef __UNIX__
+namespace
+{
// get just the language part
-static inline wxString ExtractLang(const wxString& langFull)
+inline wxString ExtractLang(const wxString& langFull)
{
return langFull.Left(LEN_LANG);
}
+// helper functions of GetSystemLanguage()
+#ifdef __UNIX__
+
// get everything else (including the leading '_')
-static inline wxString ExtractNotLang(const wxString& langFull)
+inline wxString ExtractNotLang(const wxString& langFull)
{
return langFull.Mid(LEN_LANG);
}
#endif // __UNIX__
+} // anonymous namespace
// ----------------------------------------------------------------------------
// Plural forms parser
bool wxPluralFormsScanner::nextToken()
{
wxPluralFormsToken::Type type = wxPluralFormsToken::T_ERROR;
- while (isspace(*m_s))
+ while (isspace((unsigned char) *m_s))
{
++m_s;
}
{
type = wxPluralFormsToken::T_EOF;
}
- else if (isdigit(*m_s))
+ else if (isdigit((unsigned char) *m_s))
{
wxPluralFormsToken::Number number = *m_s++ - '0';
- while (isdigit(*m_s))
+ while (isdigit((unsigned char) *m_s))
{
number = number * 10 + (*m_s++ - '0');
}
m_token.setNumber(number);
type = wxPluralFormsToken::T_NUMBER;
}
- else if (isalpha(*m_s))
+ else if (isalpha((unsigned char) *m_s))
{
const char* begin = m_s++;
- while (isalnum(*m_s))
+ while (isalnum((unsigned char) *m_s))
{
++m_s;
}
// facilitate doing pointer arithmetic with it
char *StringData() const
{
- return wx_static_cast(char *, m_data.GetData());
+ return static_cast<char *>(m_data.GetData());
}
const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 n) const
class wxMsgCatalog
{
public:
+#if !wxUSE_UNICODE
wxMsgCatalog() { m_conv = NULL; }
~wxMsgCatalog();
+#endif
// load the catalog from disk (szDirPrefix corresponds to language)
bool Load(const wxString& dirPrefix, const wxString& name,
wxMessagesHash m_messages; // all messages in the catalog
wxString m_name; // name of the domain
+#if !wxUSE_UNICODE
// the conversion corresponding to this catalog charset if we installed it
// as the global one
wxCSConv *m_conv;
+#endif
wxPluralFormsCalculatorPtr m_pluralFormsCalculator;
};
// implementation
// ============================================================================
+// ----------------------------------------------------------------------------
+// wxLanguageInfo
+// ----------------------------------------------------------------------------
+
+#ifdef __WXMSW__
+
+// helper used by wxLanguageInfo::GetLocaleName() and elsewhere to determine
+// whether the locale is Unicode-only (it is if this function returns empty
+// string)
+static wxString wxGetANSICodePageForLocale(LCID lcid)
+{
+ wxString cp;
+
+ wxChar buffer[16];
+ if ( ::GetLocaleInfo(lcid, LOCALE_IDEFAULTANSICODEPAGE,
+ buffer, WXSIZEOF(buffer)) > 0 )
+ {
+ if ( buffer[0] != _T('0') || buffer[1] != _T('\0') )
+ cp = buffer;
+ //else: this locale doesn't use ANSI code page
+ }
+
+ return cp;
+}
+
+wxUint32 wxLanguageInfo::GetLCID() const
+{
+ return MAKELCID(MAKELANGID(WinLang, WinSublang), SORT_DEFAULT);
+}
+
+wxString wxLanguageInfo::GetLocaleName() const
+{
+ wxString locale;
+
+ const LCID lcid = GetLCID();
+
+ wxChar buffer[256];
+ buffer[0] = _T('\0');
+ if ( !::GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, WXSIZEOF(buffer)) )
+ {
+ wxLogLastError(_T("GetLocaleInfo(LOCALE_SENGLANGUAGE)"));
+ return locale;
+ }
+
+ locale << buffer;
+ if ( ::GetLocaleInfo(lcid, LOCALE_SENGCOUNTRY,
+ buffer, WXSIZEOF(buffer)) > 0 )
+ {
+ locale << _T('_') << buffer;
+ }
+
+ const wxString cp = wxGetANSICodePageForLocale(lcid);
+ if ( !cp.empty() )
+ {
+ locale << _T('.') << cp;
+ }
+
+ return locale;
+}
+
+#endif // __WXMSW__
+
// ----------------------------------------------------------------------------
// wxMsgCatalogFile class
// ----------------------------------------------------------------------------
// 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
- wxString pathPrefix;
- pathPrefix << prefix << wxFILE_SEP_PATH << lang;
+ const wxString pathPrefix = wxFileName(prefix, lang).GetFullPath();
wxString searchPath;
searchPath.reserve(4*pathPrefix.length());
#ifdef __UNIX__
// LC_PATH is a standard env var containing the search path for the .mo
// files
- const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH"));
+ const char *pszLcPath = wxGetenv("LC_PATH");
if ( pszLcPath )
{
const wxString lcp = GetMsgCatalogSubdirs(pszLcPath, lang);
wxString wxp = wxGetInstallPrefix();
if ( !wxp.empty() )
{
- wxp = GetMsgCatalogSubdirs(wxp + _T("/share/locale"), lang);
+ wxp = GetMsgCatalogSubdirs(wxp + wxS("/share/locale"), lang);
if ( paths.Index(wxp) == wxNOT_FOUND )
paths.Add(wxp);
}
bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
{
+ wxCHECK_MSG( szDirPrefix.length() >= LEN_LANG, false,
+ "invalid language specification" );
+
wxString searchPath;
#if wxUSE_FONTMAP
if ( encSys != wxFONTENCODING_SYSTEM )
{
wxString fullname(szDirPrefix);
- fullname << _T('.') << wxFontMapperBase::GetEncodingName(encSys);
+ fullname << wxS('.') << wxFontMapperBase::GetEncodingName(encSys);
searchPath << GetFullSearchPath(fullname) << wxPATH_SEP;
}
#endif // wxUSE_FONTMAP
searchPath += GetFullSearchPath(szDirPrefix);
- size_t sublocaleIndex = szDirPrefix.find(wxT('_'));
- if ( sublocaleIndex != wxString::npos )
+ if ( szDirPrefix[LEN_LANG] == wxS('_') )
{
- // also add just base locale name: for things like "fr_BE" (belgium
- // french) we should use "fr" if no belgium specific message catalogs
- // exist
+ // also add just base locale name: for things like "fr_BE" (Belgium
+ // French) we should use fall back on plain "fr" if no Belgium-specific
+ // message catalogs exist
searchPath << wxPATH_SEP
- << GetFullSearchPath(szDirPrefix.Left(sublocaleIndex));
+ << GetFullSearchPath(ExtractLang(szDirPrefix));
}
// don't give translation errors here because the wxstd catalog might
NoTransErr noTransErr;
wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
szName, searchPath.c_str());
- wxLogTrace(TRACE_I18N, _T("Looking for \"%s.mo\" in \"%s\""),
+ wxLogTrace(TRACE_I18N, wxS("Looking for \"%s.mo\" in \"%s\""),
szName, searchPath.c_str());
wxFileName fn(szName);
- fn.SetExt(_T("mo"));
+ fn.SetExt(wxS("mo"));
wxString strFullName;
#if wxUSE_FILESYSTEM
#endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
{
wxLogVerbose(_("catalog file for domain '%s' not found."), szName);
- wxLogTrace(TRACE_I18N, _T("Catalog \"%s.mo\" not found"), szName);
+ wxLogTrace(TRACE_I18N, wxS("Catalog \"%s.mo\" not found"), szName);
return false;
}
// 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());
+ wxLogTrace(TRACE_I18N, wxS("Using catalog \"%s\"."), strFullName.c_str());
#if wxUSE_FILESYSTEM
wxFSFile * const fileMsg = fileSys.OpenFile(strFullName);
return false;
size_t nSize = wx_truncate_cast(size_t, lenFile);
- wxASSERT_MSG( nSize == lenFile + size_t(0), _T("message catalog bigger than 4GB?") );
+ wxASSERT_MSG( nSize == lenFile + size_t(0), wxS("message catalog bigger than 4GB?") );
// read the whole file in memory
if ( fileMsg.Read(m_data.GetWriteBuf(nSize), nSize) != lenFile )
return false;
+
+ m_data.UngetWriteBuf(nSize);
#endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
{
// Extract the charset:
wxString header = wxString::FromAscii(StringAtOfs(m_pTransTable, 0));
- int begin = header.Find(wxT("Content-Type: text/plain; charset="));
+ int begin = header.Find(wxS("Content-Type: text/plain; charset="));
if (begin != wxNOT_FOUND)
{
begin += 34; //strlen("Content-Type: text/plain; charset=")
if (end != size_t(-1))
{
m_charset.assign(header, begin, end - begin);
- if (m_charset == wxT("CHARSET"))
+ if (m_charset == wxS("CHARSET"))
{
// "CHARSET" is not valid charset, but lazy translator
m_charset.Clear();
// else: incorrectly filled Content-Type header
// Extract plural forms:
- begin = header.Find(wxT("Plural-Forms:"));
+ begin = header.Find(wxS("Plural-Forms:"));
if (begin != wxNOT_FOUND)
{
begin += 13;
#elif wxUSE_FONTMAP
wxASSERT_MSG( msgIdCharset.empty(),
- _T("non-ASCII msgid languages only supported if wxUSE_WCHAR_T=1") );
+ wxS("non-ASCII msgid languages only supported if wxUSE_WCHAR_T=1") );
wxEncodingConverter converter;
if ( convertEncoding )
// wxMsgCatalog class
// ----------------------------------------------------------------------------
+#if !wxUSE_UNICODE
wxMsgCatalog::~wxMsgCatalog()
{
if ( m_conv )
delete m_conv;
}
}
+#endif // !wxUSE_UNICODE
bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
const wxString& msgIdCharset, bool bConvertEncoding)
file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
+#if !wxUSE_UNICODE
// we should use a conversion compatible with the message catalog encoding
// in the GUI if we don't convert the strings to the current conversion but
// as the encoding is global, only change it once, otherwise we could get
wxConvUI =
m_conv = new wxCSConv(file.GetCharset());
}
+#endif // !wxUSE_UNICODE
return true;
}
bool bConvertEncoding)
{
wxASSERT_MSG( !m_initialized,
- _T("you can't call wxLocale::Init more than once") );
+ wxS("you can't call wxLocale::Init more than once") );
m_initialized = true;
m_strLocale = name;
szLocale = shortName;
wxCHECK_MSG( !szLocale.empty(), false,
- _T("no locale to set in wxLocale::Init()") );
- }
-
-#ifdef __WXWINCE__
- // FIXME: I'm guessing here
- wxChar localeName[256];
- int ret = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLANGUAGE, localeName,
- 256);
- if (ret != 0)
- {
- m_pszOldLocale = wxStrdup(wxConvLibc.cWC2MB(localeName));
+ wxS("no locale to set in wxLocale::Init()") );
}
- else
- m_pszOldLocale = NULL;
- // TODO: how to find languageId
- // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
-#else
const char *oldLocale = wxSetlocale(LC_ALL, szLocale);
if ( oldLocale )
m_pszOldLocale = wxStrdup(oldLocale);
else
m_pszOldLocale = NULL;
-#endif
if ( m_pszOldLocale == NULL )
wxLogError(_("locale '%s' can not be set."), szLocale);
bool bOk = true;
if ( bLoadDefault )
{
- bOk = AddCatalog(wxT("wxstd"));
+ bOk = AddCatalog(wxS("wxstd"));
// there may be a catalog with toolkit specific overrides, it is not
// an error if this does not exist
wxString port(wxPlatformInfo::Get().GetPortIdName());
if ( !port.empty() )
{
- AddCatalog(port.BeforeFirst(wxT('/')).MakeLower());
+ AddCatalog(port.BeforeFirst(wxS('/')).MakeLower());
}
}
}
{
wxString buf(lc);
wxString buf2;
- buf2 = buf + wxT(".UTF-8");
+ buf2 = buf + wxS(".UTF-8");
l = wxSetlocale(c, buf2);
if ( !l )
{
- buf2 = buf + wxT(".utf-8");
+ buf2 = buf + wxS(".utf-8");
l = wxSetlocale(c, buf2);
}
if ( !l )
{
- buf2 = buf + wxT(".UTF8");
+ buf2 = buf + wxS(".UTF8");
l = wxSetlocale(c, buf2);
}
if ( !l )
{
- buf2 = buf + wxT(".utf8");
+ buf2 = buf + wxS(".utf8");
l = wxSetlocale(c, buf2);
}
}
// Unknown language:
if (info == NULL)
{
- wxLogError(wxT("Unknown language %i."), lang);
+ wxLogError(wxS("Unknown language %i."), lang);
return false;
}
const char *retloc = wxSetlocaleTryUTF8(LC_ALL, locale);
- const wxString langOnly = locale.Left(2);
+ const wxString langOnly = ExtractLang(locale);
if ( !retloc )
{
// Some C libraries don't like xx_YY form and require xx only
wxFontMapperBase::GetAllEncodingNames(wxFONTENCODING_UTF8);
while ( *names )
{
- retloc = wxSetlocale(LC_ALL, locale + _T('.') + *names++);
+ retloc = wxSetlocale(LC_ALL, locale + wxS('.') + *names++);
if ( retloc )
break;
}
// Some C libraries (namely glibc) still use old ISO 639,
// so will translate the abbrev for them
wxString localeAlt;
- if ( langOnly == wxT("he") )
- localeAlt = wxT("iw") + locale.Mid(3);
- else if ( langOnly == wxT("id") )
- localeAlt = wxT("in") + locale.Mid(3);
- else if ( langOnly == wxT("yi") )
- localeAlt = wxT("ji") + locale.Mid(3);
- else if ( langOnly == wxT("nb") )
- localeAlt = wxT("no_NO");
- else if ( langOnly == wxT("nn") )
- localeAlt = wxT("no_NY");
+ if ( langOnly == wxS("he") )
+ localeAlt = wxS("iw") + ExtractNotLang(locale);
+ else if ( langOnly == wxS("id") )
+ localeAlt = wxS("in") + ExtractNotLang(locale);
+ else if ( langOnly == wxS("yi") )
+ localeAlt = wxS("ji") + ExtractNotLang(locale);
+ else if ( langOnly == wxS("nb") )
+ localeAlt = wxS("no_NO");
+ else if ( langOnly == wxS("nn") )
+ localeAlt = wxS("no_NY");
if ( !localeAlt.empty() )
{
retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt);
if ( !retloc )
- retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt.Left(2));
+ retloc = wxSetlocaleTryUTF8(LC_ALL, ExtractLang(localeAlt));
}
}
#endif // __AIX__
#elif defined(__WIN32__)
-
- #if wxUSE_UNICODE && (defined(__VISUALC__) || defined(__MINGW32__))
- // NB: setlocale() from msvcrt.dll (used by VC++ and Mingw)
- // can't set locale to language that can only be written using
- // Unicode. Therefore wxSetlocale call failed, but we don't want
- // to report it as an error -- so that at least message catalogs
- // can be used. Watch for code marked with
- // #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS bellow.
- #define SETLOCALE_FAILS_ON_UNICODE_LANGS
- #endif
-
const char *retloc = "C";
- if (language != wxLANGUAGE_DEFAULT)
+ if ( language != wxLANGUAGE_DEFAULT )
{
- if (info->WinLang == 0)
+ if ( info->WinLang == 0 )
{
- wxLogWarning(wxT("Locale '%s' not supported by OS."), name.c_str());
+ wxLogWarning(wxS("Locale '%s' not supported by OS."), name.c_str());
// retloc already set to "C"
}
- else
+ else // language supported by Windows
{
- int codepage
- #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
- = -1
- #endif
- ;
- wxUint32 lcid = MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
- SORT_DEFAULT);
- // FIXME
+ // Windows CE doesn't have SetThreadLocale() and there doesn't seem
+ // to be any equivalent
#ifndef __WXWINCE__
- SetThreadLocale(lcid);
-#endif
- // NB: we must translate LCID to CRT's setlocale string ourselves,
- // because SetThreadLocale does not modify change the
- // interpretation of setlocale(LC_ALL, "") call:
- wxChar buffer[256];
- buffer[0] = wxT('\0');
- GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, 256);
- locale << buffer;
- if (GetLocaleInfo(lcid, LOCALE_SENGCOUNTRY, buffer, 256) > 0)
- locale << wxT("_") << buffer;
- if (GetLocaleInfo(lcid, LOCALE_IDEFAULTANSICODEPAGE, buffer, 256) > 0)
- {
- codepage = wxAtoi(buffer);
- if (codepage != 0)
- locale << wxT(".") << buffer;
- }
- if (locale.empty())
+ const wxUint32 lcid = info->GetLCID();
+
+ // change locale used by Windows functions
+ ::SetThreadLocale(lcid);
+#endif
+
+ // and also call setlocale() to change locale used by the CRT
+ locale = info->GetLocaleName();
+ if ( locale.empty() )
{
- wxLogLastError(wxT("SetThreadLocale"));
ret = false;
}
- else
+ else // have a valid locale
{
- // FIXME
-#ifndef __WXWINCE__
retloc = wxSetlocale(LC_ALL, locale);
-#endif
-#ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
- if (codepage == 0 && retloc == NULL)
- {
- retloc = "C";
- }
-#endif
}
}
}
- else
+ else // language == wxLANGUAGE_DEFAULT
{
- // FIXME
-#ifndef __WXWINCE__
retloc = wxSetlocale(LC_ALL, wxEmptyString);
-#else
- retloc = NULL;
-#endif
-#ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
- if (retloc == NULL)
+ }
+
+#if wxUSE_UNICODE && (defined(__VISUALC__) || defined(__MINGW32__))
+ // VC++ setlocale() (also used by Mingw) can't set locale to languages that
+ // can only be written using Unicode, therefore wxSetlocale() call fails
+ // for such languages but we don't want to report it as an error -- so that
+ // at least message catalogs can be used.
+ if ( !retloc )
+ {
+ if ( wxGetANSICodePageForLocale(LOCALE_USER_DEFAULT).empty() )
{
- wxChar buffer[16];
- if (GetLocaleInfo(LOCALE_USER_DEFAULT,
- LOCALE_IDEFAULTANSICODEPAGE, buffer, 16) > 0 &&
- wxStrcmp(buffer, wxT("0")) == 0)
- {
- retloc = "C";
- }
+ // we set the locale to a Unicode-only language, don't treat the
+ // inability of CRT to use it as an error
+ retloc = "C";
}
-#endif
}
+#endif // CRT not handling Unicode-only languages
if ( !retloc )
ret = false;
if ( !retloc )
{
// Some C libraries don't like xx_YY form and require xx only
- retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
+ retloc = wxSetlocale(LC_ALL, ExtractLang(locale));
}
#else
wxUnusedVar(flags);
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;
- if (!wxGetEnv(wxT("LC_ALL"), &langFull) &&
- !wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
- !wxGetEnv(wxT("LANG"), &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(wxS("LC_ALL"), &langFull) &&
+ !wxGetEnv(wxS("LC_MESSAGES"), &langFull) &&
+ !wxGetEnv(wxS("LANG"), &langFull))
{
// no language specified, treat it as English
return wxLANGUAGE_ENGLISH_US;
}
- if ( langFull == _T("C") || langFull == _T("POSIX") )
+ if ( langFull == wxS("C") || langFull == wxS("POSIX") )
{
// default C locale is English too
return wxLANGUAGE_ENGLISH_US;
}
+#endif
// the language string has the following form
//
// for now we don't use the encoding, although we probably should (doing
// translations of the msg catalogs on the fly as required) (TODO)
//
- // we don't use the modifiers neither but we probably should translate
- // "euro" into iso885915
- size_t posEndLang = langFull.find_first_of(_T("@."));
+ // we need the modified for languages like Valencian: ca_ES@valencia
+ // though, remember it
+ wxString modifier;
+ size_t posModifier = langFull.find_first_of(wxS("@"));
+ if ( posModifier != wxString::npos )
+ modifier = langFull.Mid(posModifier);
+
+ size_t posEndLang = langFull.find_first_of(wxS("@."));
if ( posEndLang != wxString::npos )
{
langFull.Truncate(posEndLang);
// do we have just the language (or sublang too)?
bool justLang = langFull.length() == LEN_LANG;
if ( justLang ||
- (langFull.length() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )
+ (langFull.length() == LEN_FULL && langFull[LEN_LANG] == wxS('_')) )
{
// 0. Make sure the lang is according to latest ISO 639
// (this is necessary because glibc uses iw and in instead
wxString langOrig = ExtractLang(langFull);
wxString lang;
- if ( langOrig == wxT("iw"))
- lang = _T("he");
- else if (langOrig == wxT("in"))
- lang = wxT("id");
- else if (langOrig == wxT("ji"))
- lang = wxT("yi");
- else if (langOrig == wxT("no_NO"))
- lang = wxT("nb_NO");
- else if (langOrig == wxT("no_NY"))
- lang = wxT("nn_NO");
- else if (langOrig == wxT("no"))
- lang = wxT("nb_NO");
+ if ( langOrig == wxS("iw"))
+ lang = wxS("he");
+ else if (langOrig == wxS("in"))
+ lang = wxS("id");
+ else if (langOrig == wxS("ji"))
+ lang = wxS("yi");
+ else if (langOrig == wxS("no_NO"))
+ lang = wxS("nb_NO");
+ else if (langOrig == wxS("no_NY"))
+ lang = wxS("nn_NO");
+ else if (langOrig == wxS("no"))
+ lang = wxS("nb_NO");
else
lang = langOrig;
}
// 1. Try to find the language either as is:
- for ( i = 0; i < count; i++ )
+ // a) With modifier if set
+ if ( !modifier.empty() )
{
- if ( ms_languagesDB->Item(i).CanonicalName == langFull )
+ wxString langFullWithModifier = langFull + modifier;
+ for ( i = 0; i < count; i++ )
{
- break;
+ if ( ms_languagesDB->Item(i).CanonicalName == langFullWithModifier )
+ break;
+ }
+ }
+
+ // b) Without modifier
+ if ( modifier.empty() || i == count )
+ {
+ for ( i = 0; i < count; i++ )
+ {
+ if ( ms_languagesDB->Item(i).CanonicalName == langFull )
+ break;
}
}
}
}
}
-#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 )
#if defined(__WIN32__) && !defined(__WXMICROWIN__)
// FIXME: what is the error return value for GetACP()?
UINT codepage = ::GetACP();
- encname.Printf(_T("windows-%u"), codepage);
+ encname.Printf(wxS("windows-%u"), codepage);
#elif defined(__WXMAC__)
// default is just empty string, this resolves to the default system
// encoding later
return wxFONTENCODING_CP950;
}
#elif defined(__WXMAC__)
- TextEncoding encoding = 0 ;
-#if TARGET_CARBON
+ CFStringEncoding encoding = 0 ;
encoding = CFStringGetSystemEncoding() ;
-#else
- UpgradeScriptInfoToTextEncoding ( smSystemScript , kTextLanguageDontCare , kTextRegionDontCare , NULL , &encoding ) ;
-#endif
return wxMacGetFontEncFromSystemEnc( encoding ) ;
#elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
const wxString encname = GetSystemEncodingName();
break;
}
- if ( wxStricmp(locale, info->CanonicalName.BeforeFirst(_T('_'))) == 0 )
+ if ( wxStricmp(locale, info->CanonicalName.BeforeFirst(wxS('_'))) == 0 )
{
// a match -- but maybe we'll find an exact one later, so continue
// looking
wxString wxLocale::GetSysName() const
{
- // FIXME
-#ifndef __WXWINCE__
return wxSetlocale(LC_ALL, NULL);
-#else
- return wxEmptyString;
-#endif
}
// clean up
// restore old locale pointer
wxSetLocale(m_pOldLocale);
- // FIXME
-#ifndef __WXWINCE__
wxSetlocale(LC_ALL, m_pszOldLocale);
-#endif
free((wxChar *)m_pszOldLocale); // const_cast
}
NoTransErr noTransErr;
wxLogTrace(TRACE_I18N,
- _T("string \"%s\"[%ld] not found in %slocale '%s'."),
+ wxS("string \"%s\"[%ld] not found in %slocale '%s'."),
origString, (long)n,
- domain.empty()
- ? (const wxChar*)wxString::Format(_T("domain '%s' "), domain).c_str()
- : _T(""),
+ wxString::Format(wxS("domain '%s' "), domain).c_str(),
m_strLocale.c_str());
}
#endif // __WXDEBUG__
// Every header is separated by \n
- size_t endLine = trans->find(wxT('\n'), found);
+ size_t endLine = trans->find(wxS('\n'), found);
size_t len = (endLine == wxString::npos) ?
wxString::npos : (endLine - found);
bool wxLocale::IsAvailable(int lang)
{
const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
- wxCHECK_MSG( info, false, _T("invalid language") );
+ wxCHECK_MSG( info, false, wxS("invalid language") );
#if defined(__WIN32__)
if ( !info->WinLang )
return false;
- if ( !::IsValidLocale
- (
- MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
- SORT_DEFAULT),
- LCID_INSTALLED
- ) )
+ if ( !::IsValidLocale(info->GetLCID(), LCID_INSTALLED) )
return false;
#elif defined(__UNIX__)
if ( !tmp )
{
// Some C libraries don't like xx_YY form and require xx only
- tmp = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName.Left(2));
+ tmp = wxSetlocaleTryUTF8(LC_ALL, ExtractLang(info->CanonicalName));
if ( !tmp )
return false;
}
const wxString& msgIdCharset)
{
- wxMsgCatalog *pMsgCat = new wxMsgCatalog;
-
- if ( pMsgCat->Load(m_strShort, szDomain, msgIdCharset, m_bConvertEncoding) ) {
- // add it to the head of the list so that in GetString it will
- // be searched before the catalogs added earlier
- pMsgCat->m_pNext = m_pMsgCat;
- m_pMsgCat = pMsgCat;
+ wxCHECK_MSG( IsOk(), false, "must initialize catalog first" );
- return true;
- }
- else {
- // don't add it because it couldn't be loaded anyway
- delete pMsgCat;
// It is OK to not load catalog if the msgid language and m_language match,
// in which case we can directly display the texts embedded in program's
// source code:
- if (m_language == msgIdLanguage)
+ if ( msgIdLanguage == m_language )
return true;
+
+ wxMsgCatalog *pMsgCat = new wxMsgCatalog;
+
+ if ( pMsgCat->Load(m_strShort, szDomain, msgIdCharset, m_bConvertEncoding) )
+ {
+ // add it to the head of the list so that in GetString it will
+ // be searched before the catalogs added earlier
+ pMsgCat->m_pNext = m_pMsgCat;
+ m_pMsgCat = pMsgCat;
+
+ return true;
+ }
+
+ // don't add it because it couldn't be loaded anyway
+ delete pMsgCat;
+
+
// If there's no exact match, we may still get partial match where the
// (basic) language is same, but the country differs. For example, it's
// permitted to use en_US strings from sources even if m_language is en_GB:
const wxLanguageInfo *msgIdLangInfo = GetLanguageInfo(msgIdLanguage);
if ( msgIdLangInfo &&
- msgIdLangInfo->CanonicalName.Mid(0, 2) == m_strShort.Mid(0, 2) )
+ ExtractLang(msgIdLangInfo->CanonicalName) == ExtractLang(m_strShort) )
{
return true;
}
return false;
- }
}
// ----------------------------------------------------------------------------
/* static */
wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
{
+ wxUint32 lcid = LOCALE_USER_DEFAULT;
+
+ if (wxGetLocale())
+ {
+ const wxLanguageInfo *info = GetLanguageInfo(wxGetLocale()->GetLanguage());
+ if ( info )
+ lcid = info->GetLCID();
+ }
+
wxString str;
wxChar buffer[256];
size_t count;
- buffer[0] = wxT('\0');
+ buffer[0] = wxS('\0');
switch (index)
{
case wxLOCALE_DECIMAL_POINT:
- count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buffer, 256);
+ count = ::GetLocaleInfo(lcid, LOCALE_SDECIMAL, buffer, 256);
if (!count)
- str << wxT(".");
+ str << wxS(".");
else
str << buffer;
break;
#if 0
case wxSYS_LIST_SEPARATOR:
- count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLIST, buffer, 256);
+ count = ::GetLocaleInfo(lcid, LOCALE_SLIST, buffer, 256);
if (!count)
- str << wxT(",");
+ str << wxS(",");
else
str << buffer;
break;
case wxSYS_LEADING_ZERO: // 0 means no leading zero, 1 means leading zero
- count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILZERO, buffer, 256);
+ count = ::GetLocaleInfo(lcid, LOCALE_ILZERO, buffer, 256);
if (!count)
- str << wxT("0");
+ str << wxS("0");
else
str << buffer;
break;
#endif
default:
- wxFAIL_MSG(wxT("Unknown System String !"));
+ wxFAIL_MSG(wxS("Unknown System String !"));
}
return str;
}
-#elif defined(__WXOSX__)
+#elif defined(__DARWIN__)
/* static */
wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
{
- wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());
- CFTypeRef cfstr;
+ CFLocaleRef userLocaleRefRaw;
+ if ( wxGetLocale() )
+ {
+ userLocaleRefRaw = CFLocaleCreate
+ (
+ kCFAllocatorDefault,
+ wxCFStringRef(wxGetLocale()->GetCanonicalName())
+ );
+ }
+ else // no current locale, use the default one
+ {
+ userLocaleRefRaw = CFLocaleCopyCurrent();
+ }
+
+ wxCFRef<CFLocaleRef> userLocaleRef(userLocaleRefRaw);
+
+ CFStringRef cfstr = 0;
switch ( index )
{
case wxLOCALE_THOUSANDS_SEP:
- cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);
+ cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);
break;
case wxLOCALE_DECIMAL_POINT:
- cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);
+ cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);
break;
default:
wxFAIL_MSG( "Unknown locale info" );
+ cfstr = CFSTR("");
+ break;
}
- wxMacCFStringHolder
- str(CFStringCreateCopy(NULL, static_cast<CFStringRef>(cfstr)));
+ wxCFStringRef str(wxCFRetain(cfstr));
return str.AsString();
}
-#else // !__WXMSW__ && !__WXMAC__
+#else // !__WXMSW__ && !__DARWIN__
/* static */
wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
#ifndef LANG_RUSSIAN
#define LANG_RUSSIAN (0)
#endif
+#ifndef LANG_SAMI
+#define LANG_SAMI (0)
+#endif
#ifndef LANG_SANSKRIT
#define LANG_SANSKRIT (0)
#endif
#define LNG(wxlang, canonical, winlang, winsublang, layout, desc) \
info.Language = wxlang; \
- info.CanonicalName = wxT(canonical); \
+ info.CanonicalName = wxS(canonical); \
info.LayoutDirection = layout; \
- info.Description = wxT(desc); \
+ info.Description = wxS(desc); \
SETWINLANG(info, winlang, winsublang) \
AddLanguage(info);
LNG(wxLANGUAGE_FRENCH_SWISS, "fr_CH", LANG_FRENCH , SUBLANG_FRENCH_SWISS , wxLayout_LeftToRight, "French (Swiss)")
LNG(wxLANGUAGE_FRISIAN, "fy" , 0 , 0 , wxLayout_LeftToRight, "Frisian")
LNG(wxLANGUAGE_GALICIAN, "gl_ES", 0 , 0 , wxLayout_LeftToRight, "Galician")
- LNG(wxLANGUAGE_GEORGIAN, "ka" , LANG_GEORGIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Georgian")
+ LNG(wxLANGUAGE_GEORGIAN, "ka_GE", LANG_GEORGIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Georgian")
LNG(wxLANGUAGE_GERMAN, "de_DE", LANG_GERMAN , SUBLANG_GERMAN , wxLayout_LeftToRight, "German")
LNG(wxLANGUAGE_GERMAN_AUSTRIAN, "de_AT", LANG_GERMAN , SUBLANG_GERMAN_AUSTRIAN , wxLayout_LeftToRight, "German (Austrian)")
LNG(wxLANGUAGE_GERMAN_BELGIUM, "de_BE", 0 , 0 , wxLayout_LeftToRight, "German (Belgium)")
LNG(wxLANGUAGE_KIRUNDI, "rn" , 0 , 0 , wxLayout_LeftToRight, "Kirundi")
LNG(wxLANGUAGE_KONKANI, "" , LANG_KONKANI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Konkani")
LNG(wxLANGUAGE_KOREAN, "ko_KR", LANG_KOREAN , SUBLANG_KOREAN , wxLayout_LeftToRight, "Korean")
- LNG(wxLANGUAGE_KURDISH, "ku" , 0 , 0 , wxLayout_LeftToRight, "Kurdish")
+ LNG(wxLANGUAGE_KURDISH, "ku_TR", 0 , 0 , wxLayout_LeftToRight, "Kurdish")
LNG(wxLANGUAGE_LAOTHIAN, "lo" , 0 , 0 , wxLayout_LeftToRight, "Laothian")
LNG(wxLANGUAGE_LATIN, "la" , 0 , 0 , wxLayout_LeftToRight, "Latin")
LNG(wxLANGUAGE_LATVIAN, "lv_LV", LANG_LATVIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Latvian")
LNG(wxLANGUAGE_MOLDAVIAN, "mo" , 0 , 0 , wxLayout_LeftToRight, "Moldavian")
LNG(wxLANGUAGE_MONGOLIAN, "mn" , 0 , 0 , wxLayout_LeftToRight, "Mongolian")
LNG(wxLANGUAGE_NAURU, "na" , 0 , 0 , wxLayout_LeftToRight, "Nauru")
- LNG(wxLANGUAGE_NEPALI, "ne" , LANG_NEPALI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Nepali")
+ LNG(wxLANGUAGE_NEPALI, "ne_NP", LANG_NEPALI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Nepali")
LNG(wxLANGUAGE_NEPALI_INDIA, "ne_IN", LANG_NEPALI , SUBLANG_NEPALI_INDIA , wxLayout_LeftToRight, "Nepali (India)")
LNG(wxLANGUAGE_NORWEGIAN_BOKMAL, "nb_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL , wxLayout_LeftToRight, "Norwegian (Bokmal)")
LNG(wxLANGUAGE_NORWEGIAN_NYNORSK, "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK , wxLayout_LeftToRight, "Norwegian (Nynorsk)")
LNG(wxLANGUAGE_ROMANIAN, "ro_RO", LANG_ROMANIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Romanian")
LNG(wxLANGUAGE_RUSSIAN, "ru_RU", LANG_RUSSIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Russian")
LNG(wxLANGUAGE_RUSSIAN_UKRAINE, "ru_UA", 0 , 0 , wxLayout_LeftToRight, "Russian (Ukraine)")
+ LNG(wxLANGUAGE_SAMI, "se_NO", LANG_SAMI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Northern Sami")
LNG(wxLANGUAGE_SAMOAN, "sm" , 0 , 0 , wxLayout_LeftToRight, "Samoan")
LNG(wxLANGUAGE_SANGHO, "sg" , 0 , 0 , wxLayout_LeftToRight, "Sangho")
LNG(wxLANGUAGE_SANSKRIT, "sa" , LANG_SANSKRIT , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Sanskrit")
LNG(wxLANGUAGE_SCOTS_GAELIC, "gd" , 0 , 0 , wxLayout_LeftToRight, "Scots Gaelic")
+ LNG(wxLANGUAGE_SERBIAN, "sr_RS", LANG_SERBIAN , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Serbian")
+ LNG(wxLANGUAGE_SERBIAN_CYRILLIC, "sr_RS", LANG_SERBIAN , SUBLANG_SERBIAN_CYRILLIC , wxLayout_LeftToRight, "Serbian (Cyrillic)")
+ LNG(wxLANGUAGE_SERBIAN_LATIN, "sr_RS@latin", LANG_SERBIAN , SUBLANG_SERBIAN_LATIN , wxLayout_LeftToRight, "Serbian (Latin)")
LNG(wxLANGUAGE_SERBIAN_CYRILLIC, "sr_YU", LANG_SERBIAN , SUBLANG_SERBIAN_CYRILLIC , wxLayout_LeftToRight, "Serbian (Cyrillic)")
- LNG(wxLANGUAGE_SERBIAN_LATIN, "sr_YU", LANG_SERBIAN , SUBLANG_SERBIAN_LATIN , wxLayout_LeftToRight, "Serbian (Latin)")
+ LNG(wxLANGUAGE_SERBIAN_LATIN, "sr_YU@latin", LANG_SERBIAN , SUBLANG_SERBIAN_LATIN , wxLayout_LeftToRight, "Serbian (Latin)")
LNG(wxLANGUAGE_SERBO_CROATIAN, "sh" , 0 , 0 , wxLayout_LeftToRight, "Serbo-Croatian")
LNG(wxLANGUAGE_SESOTHO, "st" , 0 , 0 , wxLayout_LeftToRight, "Sesotho")
LNG(wxLANGUAGE_SETSWANA, "tn" , 0 , 0 , wxLayout_LeftToRight, "Setswana")
LNG(wxLANGUAGE_UZBEK, "uz" , LANG_UZBEK , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Uzbek")
LNG(wxLANGUAGE_UZBEK_CYRILLIC, "uz" , LANG_UZBEK , SUBLANG_UZBEK_CYRILLIC , wxLayout_LeftToRight, "Uzbek (Cyrillic)")
LNG(wxLANGUAGE_UZBEK_LATIN, "uz" , LANG_UZBEK , SUBLANG_UZBEK_LATIN , wxLayout_LeftToRight, "Uzbek (Latin)")
+ LNG(wxLANGUAGE_VALENCIAN, "ca_ES@valencia", 0 , 0 , wxLayout_LeftToRight, "Valencian (Souternhern Catalan)")
LNG(wxLANGUAGE_VIETNAMESE, "vi_VN", LANG_VIETNAMESE, SUBLANG_DEFAULT , wxLayout_LeftToRight, "Vietnamese")
LNG(wxLANGUAGE_VOLAPUK, "vo" , 0 , 0 , wxLayout_LeftToRight, "Volapuk")
LNG(wxLANGUAGE_WELSH, "cy" , 0 , 0 , wxLayout_LeftToRight, "Welsh")
projects / wxWidgets.git / blobdiff