handle locales where AM/PM strings are empty

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/datetimefmt.cpp b/src/common/datetimefmt.cpp
index 98c70a6cd142aaf116e5ab76246fc29df9b9829c..57c23124659f1956e28f73af25166e5b5e7c637b 100644 (file)
--- a/src/common/datetimefmt.cpp
+++ b/src/common/datetimefmt.cpp
@@ -1329,6 +1329,13 @@ wxDateTime::ParseFormat(const wxString& date,
             case _T('p'):       // AM or PM string
                 {
                     wxString am, pm, token = GetAlphaToken(input);
             case _T('p'):       // AM or PM string
                 {
                     wxString am, pm, token = GetAlphaToken(input);

+                    
+                    // some locales have empty AM/PM tokens and thus when formatting
+                    // dates with the %p specifier mpthomg os gemerated; when trying to
+                    // parse them back, we get an empty token here... but that's not
+                    // an error.
+                    if (token.empty())
+                        break;

 
                     GetAmPmStrings(&am, &pm);
                     if (am.empty() && pm.empty())
 
                     GetAmPmStrings(&am, &pm);
                     if (am.empty() && pm.empty())