From b9d2203419852060fea67cea68b59a23bdb53623 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 30 Mar 2009 21:14:09 +0000 Subject: [PATCH] only Linux/glibc seem to use periods as date separator in French locale git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/intl/intltest.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/intl/intltest.cpp b/tests/intl/intltest.cpp index d84cda86f7..b5c34d9b03 100644 --- a/tests/intl/intltest.cpp +++ b/tests/intl/intltest.cpp @@ -146,7 +146,15 @@ void IntlTestCase::DateTimeFmt() if ( !m_locale ) return; - CompareFormats( "%d.%m.%Y", m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) ); +#ifdef __GLIBC__ + // glibc also uses dots for French locale separator for some reason (the + // standard format uses slashes) + static const char *FRENCH_DATE_FMT = "%d.%m.%y"; +#else + static const char *FRENCH_DATE_FMT = "%d/%m/%y"; +#endif + + CompareFormats( FRENCH_DATE_FMT, m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) ); CompareFormats( "%a %d %b %Y", m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) ); CompareFormats( "%a %d %b %Y %H:%M:%S %Z", m_locale->GetInfo(wxLOCALE_DATE_TIME_FMT) ); -- 2.47.2