From 9d1e1be46360ddf5b3e8d3379f273ac939cccc5a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Feb 2003 16:43:10 +0000 Subject: [PATCH] added wxLocale::FindLanguageInfo() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/locale.tex | 16 ++++++++++++++++ include/wx/intl.h | 7 +++++++ src/common/intl.cpp | 38 +++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/docs/latex/wx/locale.tex b/docs/latex/wx/locale.tex index fe59e6e09e..d6f8d46d2c 100644 --- a/docs/latex/wx/locale.tex +++ b/docs/latex/wx/locale.tex @@ -395,6 +395,22 @@ struct WXDLLEXPORT wxLanguageInfo \perlnote{In wxPerl Wx::LanguageInfo has only one method:\par Wx::LanguageInfo->new( language, canonicalName, WinLang, WinSubLang, Description )} +\membersection{wxLocale::FindLanguageInfo}{wxlocalefindlanguageinfo} + +\constfunc{static wxLanguageInfo *}{FindLanguageInfo}{\param{const wxString\& }{locale}} + +This function may be used to find the language description structure for the +given locale, specified either as a two letter ISO language code (for example, +"pt"), a language code followed by the country code ("pt\_BR") or a full, human +readable, language description ("Portuguese-Brazil"). + +Returns the information for the given language or {\tt NULL} if this language +is unknown. Note that even if the returned pointer is valid, the caller should +{\it not} delete it. + +\wxheading{See also} + +\helpref{GetLanguageInfo}{wxlocalegetlanguageinfo} \membersection{wxLocale::GetCanonicalName}\label{wxlocalegetcanonicalname} diff --git a/include/wx/intl.h b/include/wx/intl.h index 2f50345325..379ff977ba 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -455,6 +455,13 @@ public: // Returns NULL if no info found, pointer must *not* be deleted by caller static const wxLanguageInfo *GetLanguageInfo(int lang); + // Find the language for the given locale string which may be either a + // canonical ISO 2 letter language code ("xx"), a language code followed by + // the country code ("xx_XX") or a Windows full language name ("Xxxxx...") + // + // Returns NULL if no info found, pointer must *not* be deleted by caller + static const wxLanguageInfo *FindLanguageInfo(const wxString& locale); + // Add custom language to the list of known languages. // Notes: 1) wxLanguageInfo contains platform-specific data // 2) must be called before Init to have effect diff --git a/src/common/intl.cpp b/src/common/intl.cpp index e2a7299f7a..9fbde46e7c 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -1395,7 +1395,7 @@ const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang) { CreateLanguagesDB(); - size_t count = ms_languagesDB->GetCount(); + const size_t count = ms_languagesDB->GetCount(); for ( size_t i = 0; i < count; i++ ) { if ( ms_languagesDB->Item(i).Language == lang ) @@ -1407,6 +1407,42 @@ const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang) return NULL; } +/* static */ +const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale) +{ + CreateLanguagesDB(); + + const wxLanguageInfo *infoRet = NULL; + + const size_t count = ms_languagesDB->GetCount(); + for ( size_t i = 0; i < count; i++ ) + { + const wxLanguageInfo *info = &ms_languagesDB->Item(i); + + if ( wxStricmp(locale, info->CanonicalName) == 0 || + wxStricmp(locale, info->Description) == 0 ) + { + // exact match, stop searching + infoRet = info; + break; + } + + if ( wxStricmp(locale, info->CanonicalName.BeforeFirst(_T('_'))) == 0 ) + { + // a match -- but maybe we'll find an exact one later, so continue + // looking + // + // OTOH, maybe we had already found a language match and in this + // case don't overwrite it becauce the entry for the default + // country always appears first in ms_languagesDB + if ( !infoRet ) + infoRet = info; + } + } + + return infoRet; +} + wxString wxLocale::GetSysName() const { return wxSetlocale(LC_ALL, NULL); -- 2.47.2