Mercurial > public > src > moin > 1.9
diff MoinMoin/user.py @ 709:e61665a6a46f
merge main
| author | Thomas Waldmann <tw AT waldmann-edv DOT de> |
|---|---|
| date | Tue, 23 May 2006 09:58:17 +0200 |
| parents | 09cd69e5de6d 15c55ecd7ccb |
| children | dd9743e40342 |
line wrap: on
line diff
--- a/MoinMoin/user.py Tue May 23 00:23:02 2006 +0200 +++ b/MoinMoin/user.py Tue May 23 09:58:17 2006 +0200 @@ -16,7 +16,7 @@ # Set pickle protocol, see http://docs.python.org/lib/node64.html PICKLE_PROTOCOL = pickle.HIGHEST_PROTOCOL -from MoinMoin import config, caching, wikiutil +from MoinMoin import config, caching, wikiutil, i18n from MoinMoin.util import filesys, timefuncs @@ -289,8 +289,7 @@ from security import Default self.may = Default(self) - from MoinMoin.i18n import languages - if self.language and not languages.has_key(self.language): + if self.language and not i18n.language_supported(self.language): self.language = 'en' def __repr__(self):