Unicode correction

[wxWidgets.git] / samples / internat / internat.cpp

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index c7dbc1066f1d0a6b4bb31ec2ed17bac516dadca3..661a990669a8b909150b3568d665efe12bfe57ec 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -180,15 +180,21 @@ bool MyApp::OnInit()
     }
 
     if ( lng != -1 )
     }
 
     if ( lng != -1 )

-        m_locale.Init(langIds[lng]);
+    {
+        // don't use wxLOCALE_LOAD_DEFAULT flag so that Init() doesn't return
+        // false just because it failed to load wxstd catalog
+        if ( !m_locale.Init(langIds[lng], wxLOCALE_CONV_ENCODING) )
+        {
+            wxLogError(_T("This language is not supported by the system."));
+            return false;
+        }
+    }

 
     // normally this wouldn't be necessary as the catalog files would be found
 
     // normally this wouldn't be necessary as the catalog files would be found

-    // in the default locations, but under Windows then the program is not
-    // installed the catalogs are in the parent directory (because the binary
-    // is in a subdirectory of samples/internat) where we wouldn't find them by
+    // in the default locations, but when the program is not installed the
+    // catalogs are in the build directory where we wouldn't find them by

     // default
     wxLocale::AddCatalogLookupPathPrefix(wxT("."));
     // default
     wxLocale::AddCatalogLookupPathPrefix(wxT("."));

-    wxLocale::AddCatalogLookupPathPrefix(wxT(".."));

 
     // Initialize the catalogs we'll be using
     m_locale.AddCatalog(wxT("internat"));
 
     // Initialize the catalogs we'll be using
     m_locale.AddCatalog(wxT("internat"));