From: Václav Slavík <vslavik@fastmail.fm>
Date: Fri, 25 Jul 2003 09:40:21 +0000 (+0000)
Subject: better attempts to try .utf-8 suffix
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2d34a3036ee7d4f1d2b6caf8a1e47f67930a430a

better attempts to try .utf-8 suffix


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

diff --git a/docs/toback24.txt b/docs/toback24.txt
index 8d975e9d7a..78cea68456 100644
--- a/docs/toback24.txt
+++ b/docs/toback24.txt
@@ -216,11 +216,15 @@ done
 24. Fix wxLocale::Init to try xx_YY.utf8 on systems where xx_YY fails
 (presumably RedHat; do it in Unicode mode only)
 
-See: Patch [ 766893 ]
+See: Patch [ 766893 ], [ 775994 ]
 Checking in intl.cpp;
 /pack/cvsroots/wxwindows/wxWindows/src/common/intl.cpp,v  <--  intl.cpp
 new revision: 1.97; previous revision: 1.96
 done
+Checking in intl.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/common/intl.cpp,v  <--  intl.cpp
+new revision: 1.100; previous revision: 1.99
+done
 Checking in changes.txt;
 /pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v  <--  changes.txt
 new revision: 1.297; previous revision: 1.296
diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index aef903c92b..85ae05c74b 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -683,11 +683,27 @@ bool wxLocale::Init(const wxChar *szName,
 static wxWCharBuffer wxSetlocaleTryUTF(int c, const wxChar *lc)
 {
     wxMB2WXbuf l = wxSetlocale(c, lc);
-    if ( lc && lc[0] != 0 && !l )
+    if ( !l && lc && lc[0] != 0 )
     {
     	wxString buf(lc);
-    	buf += wxT(".utf8");
-    	l = wxSetlocale(c, buf.c_str());
+        wxString buf2;
+    	buf2 = buf + wxT(".UTF-8");
+    	l = wxSetlocale(c, buf2.c_str());
+        if ( !l )
+        {
+            buf2 = buf + wxT(".utf-8");
+    	    l = wxSetlocale(c, buf2.c_str());
+        }
+        if ( !l )
+        {
+            buf2 = buf + wxT(".UTF8");
+    	    l = wxSetlocale(c, buf2.c_str());
+        }
+        if ( !l )
+        {
+            buf2 = buf + wxT(".utf8");
+    	    l = wxSetlocale(c, buf2.c_str());
+        }
     }
     return l;
 }