setlocale() argument corrected

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index f21ab6188762b0a7afe4eb58eda91cf63afc88d3..245ebe36bb6365a262bbb73a19e6f9b2cdafb5cb 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -475,7 +475,10 @@ bool wxLocale::Init(const wxChar *szName,
 
   // change current locale (default: same as long name)
   if ( szLocale == NULL )
 
   // change current locale (default: same as long name)
   if ( szLocale == NULL )

-    szLocale = szName;
+  {
+    // the argument to setlocale()
+    szLocale = szShort;
+  }

   m_pszOldLocale = wxSetlocale(LC_ALL, szLocale);
   if ( m_pszOldLocale == NULL )
     wxLogError(_("locale '%s' can not be set."), szLocale);
   m_pszOldLocale = wxSetlocale(LC_ALL, szLocale);
   if ( m_pszOldLocale == NULL )
     wxLogError(_("locale '%s' can not be set."), szLocale);