[jToolkit-cvs] jToolkit localize.py,1.3,1.4

[<dav...@us...>]

Update of /cvsroot/jtoolkit/jToolkit
In directory sc8-pr-cvs1:/tmp/cvs-serv5470

Modified Files:
	localize.py 
Log Message:
added support for empty language list when choosing default language



Index: localize.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/localize.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** localize.py	25 Sep 2003 17:36:55 -0000	1.3
--- localize.py	29 Sep 2003 07:58:02 -0000	1.4
***************
*** 107,120 ****
    except ValueError:
      defaultlocale, defaultencoding = None, None
!   if currentlocale is not None:
!     if currentlocale in languagelist:
        return currentlocale
!     elif reducelocale(currentlocale) in languagelist:
!       return reducelocale(currentlocale)
!   if defaultlocale is not None:
!     if defaultlocale in languagelist:
        return defaultlocale
!     elif reducelocale(defaultlocale) in languagelist:
!       return reducelocale(defaultlocale)
!   return languagelist[0]
  
--- 107,128 ----
    except ValueError:
      defaultlocale, defaultencoding = None, None
!   if len(languagelist) > 0:
!     if currentlocale is not None:
!       if currentlocale in languagelist:
!         return currentlocale
!       elif reducelocale(currentlocale) in languagelist:
!         return reducelocale(currentlocale)
!     if defaultlocale is not None:
!       if defaultlocale in languagelist:
!         return defaultlocale
!       elif reducelocale(defaultlocale) in languagelist:
!         return reducelocale(defaultlocale)
!     return languagelist[0]
!   else:
!     # if our language list is empty, we'll just ignore it
!     if currentlocale is not None:
        return currentlocale
!     elif defaultlocale is not None:
        return defaultlocale
!     return None