Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied a patch to ignore the modifiers (things like @euro) in LC_XXX vars

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-07 15:58:23 +00:00
parent b96848d3aa
commit efd1393bcc
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/intl.cpp
View File

@@ -801,7 +801,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
return wxLANGUAGE_ENGLISH; return wxLANGUAGE_ENGLISH;
} }
if ( langFull == _T("C") ) if ( langFull == _T("C") || langFull == _T("POSIX") )
{ {
// default C locale // default C locale
return wxLANGUAGE_ENGLISH; return wxLANGUAGE_ENGLISH;
@@ -809,18 +809,31 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
// the language string has the following form // the language string has the following form
// //
// lang[_LANG[.encoding]] // lang[_LANG][.encoding][@modifier]
// //
// where lang is the primary language, LANG is a sublang // (see environ(5) in the Open Unix specification)
//
// where lang is the primary language, LANG is a sublang/territory,
// encoding is the charset to use and modifier "allows the user to select
// a specific instance of localization data within a single category"
// //
// for example, the following strings are valid: // for example, the following strings are valid:
// fr // fr
// fr_FR // fr_FR
// de_DE.iso88591 // de_DE.iso88591
// de_DE@euro
// de_DE.iso88591@euro
// for now we don't use the encoding, although we probably should (doing // for now we don't use the encoding, although we probably should (doing
// translations of the msg catalogs on the fly as required) (TODO) // translations of the msg catalogs on the fly as required) (TODO)
langFull = langFull.BeforeFirst(_T('.')); //
// we don't use the modifiers neither but we probably should translate
// "euro" into iso885915
size_t posEndLang = langFull.find_first_of(_T("@."));
if ( posEndLang != wxString::npos )
{
langFull.Truncate(posEndLang);
}
// in addition to the format above, we also can have full language names // in addition to the format above, we also can have full language names
// in LANG env var - for example, SuSE is known to use LANG="german" - so // in LANG env var - for example, SuSE is known to use LANG="german" - so