From 70426fba08782d2aaad398230458c96fcedd6f5e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 24 Aug 2001 18:19:54 +0000
Subject: [PATCH] fix for the short locale name construction

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/intl.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 5e03cbdc18..12beb715c7 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -615,7 +615,12 @@ bool wxLocale::Init(const wxChar *szName,
   if ( m_strShort.IsEmpty() ) {
     // FIXME I don't know how these 2 letter abbreviations are formed,
     //       this wild guess is surely wrong
-    m_strShort = tolower(szLocale[0]) + tolower(szLocale[1]);
+    if ( szLocale[0] )
+    {
+        m_strShort += (wxChar)wxTolower(szLocale[0]);
+        if ( szLocale[1] )
+            m_strShort += (wxChar)wxTolower(szLocale[1]);
+    }
   }
 
   // save the old locale to be able to restore it later
-- 
2.45.2