From: Karsten Ballüder <ballueder@usa.net>
Date: Sun, 31 Jan 1999 19:38:40 +0000 (+0000)
Subject: Added (untested) support for sub-locales.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cfad3750c3ecc821ffae8b9b3de852551270846d

Added (untested) support for sub-locales.


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

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index 228b436b11..13ea6eeecf 100644
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -115,6 +115,15 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();
          if(wxDirExists(newfile))
             file = newfile;
+         else
+         {
+            newfile = WXEXTHELP_SEPARATOR;
+            const char *cptr = wxGetLocale()->GetName().c_str();
+            while(*cptr && *cptr != '_')
+               newfile << *(cptr++);
+            if(wxDirExists(newfile))
+               file = newfile;
+         }
       }
       
       if(! wxDirExists(file))