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

Replace wxLocaleIdent ctor from language with FromTag()

Browse Source 
This static function parses a subset of the language tags described in
BCP 47 (see https://www.rfc-editor.org/rfc/bcp/bcp47.txt).

Use the tag, as specified by this function, rather than the locale
identifiers components under MSW, where this should allow us to use even
locales that can't be described using just language-script-region.
This commit is contained in:
Vadim Zeitlin
2021-09-04 23:56:40 +02:00
parent a47a885718
commit 6b26deaddc
7 changed files with 178 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/intl/intltest.cpp
View File

@@ -260,23 +260,23 @@ static inline bool CheckSupported(const wxUILocale& loc, const char* desc)
TEST_CASE("wxUILocale::IsSupported", "[uilocale]")
{
CheckSupported(wxUILocale("en"), "English");
CheckSupported(wxUILocale(wxLocaleIdent("fr").Region("FR")), "French");
CHECK( !wxUILocale("bloordyblop").IsSupported() );
CheckSupported(wxUILocale(wxLocaleIdent::FromTag("en")), "English");
CheckSupported(wxUILocale(wxLocaleIdent().Language("fr").Region("FR")), "French");
CHECK( !wxUILocale(wxLocaleIdent::FromTag("bloordyblop")).IsSupported() );
}
TEST_CASE("wxUILocale::GetInfo", "[uilocale]")
{
CHECK( wxUILocale("en").GetInfo(wxLOCALE_DECIMAL_POINT) == "." );
CHECK( wxUILocale(wxLocaleIdent::FromTag("en")).GetInfo(wxLOCALE_DECIMAL_POINT) == "." );
const wxUILocale locDE("de");
const wxUILocale locDE(wxLocaleIdent::FromTag("de"));
if ( CheckSupported(locDE, "German") )
CHECK( locDE.GetInfo(wxLOCALE_DECIMAL_POINT) == "," );
// This one shows that "Swiss High German" locale (de_CH) correctly uses
// dot, and not comma, as decimal separator, even under macOS, where POSIX
// APIs use incorrect (identical to "German") definitions for this locale.
const wxUILocale locDE_CH(wxLocaleIdent("de").Region("CH"));
const wxUILocale locDE_CH(wxLocaleIdent().Language("de").Region("CH"));
if ( CheckSupported(locDE_CH, "Swiss German") )
CHECK( locDE_CH.GetInfo(wxLOCALE_DECIMAL_POINT) == "." );
}
@@ -288,7 +288,7 @@ TEST_CASE("wxUILocale::CompareStrings", "[uilocale]")
{
SECTION("English")
{
const wxUILocale l("en");
const wxUILocale l(wxLocaleIdent::FromTag("en"));
// This is not very interesting, but check that comparison works at all.
CHECK( l.CompareStrings("x", "x") == 0 );
@@ -319,7 +319,7 @@ TEST_CASE("wxUILocale::CompareStrings", "[uilocale]")
#if wxUSE_UNICODE
SECTION("German")
{
const wxUILocale l(wxLocaleIdent("de").Region("DE"));
const wxUILocale l(wxLocaleIdent().Language("de").Region("DE"));
if ( !CheckSupported(l, "German") )
return;
@@ -344,7 +344,7 @@ TEST_CASE("wxUILocale::CompareStrings", "[uilocale]")
if ( wxIsRunningUnderWine() )
return;
const wxUILocale l("sv");
const wxUILocale l(wxLocaleIdent::FromTag("sv"));
if ( !CheckSupported(l, "Swedish") )
return;