[sword-cvs] sword/src/mgr localemgr.cpp,1.23,1.24

[sword at www.crosswire.org]

Committed by: joachim

Update of /cvs/core/sword/src/mgr
In directory www:/tmp/cvs-serv9557/src/mgr

Modified Files:
	localemgr.cpp 
Log Message:
localemgr fix

Index: localemgr.cpp
===================================================================
RCS file: /cvs/core/sword/src/mgr/localemgr.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- localemgr.cpp	29 May 2004 01:12:42 -0000	1.23
+++ localemgr.cpp	22 Jul 2004 18:47:44 -0000	1.24
@@ -146,10 +146,10 @@
 				if (locale->getName()) {					
 					bool supported = false;
 					if (StringMgr::hasUTF8Support()) {
-						supported = (locale->getEncoding() && (!strcmp(locale->getEncoding(), "UTF-8") /*|| !strcmp(locale->getEncoding(), "ISO8859-1")*/) );
+						supported = (locale->getEncoding() && (!strcmp(locale->getEncoding(), "UTF-8") || !strcmp(locale->getEncoding(), "ASCII")) );
 					}
 					else {
-						supported = !locale->getEncoding() || (locale->getEncoding() && strcmp(locale->getEncoding(), "UTF-8"));
+						supported = !locale->getEncoding() || (locale->getEncoding() && (strcmp(locale->getEncoding(), "UTF-8") != 0)); //exclude UTF-8 locales
 					}
 					
 					if (!supported) { //not supported