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

honour locale modifiers such a @valencia in system locale (patch 1896444)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-18 23:43:29 +00:00
parent 83135a2c28
commit 8cee59b521
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/intl.cpp
View File

@@ -1996,8 +1996,13 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
// 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)
// //
// we don't use the modifiers neither but we probably should translate // we need the modified for languages like Valencian: ca_ES@valencia
// "euro" into iso885915 // 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("@.")); size_t posEndLang = langFull.find_first_of(wxS("@."));
if ( posEndLang != wxString::npos ) if ( posEndLang != wxString::npos )
{ {
@@ -2043,11 +2048,24 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
} }
// 1. Try to find the language either as is: // 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;
} }
} }