# HG changeset patch # User Radomir Dopieralski # Date 1266179399 -3600 # Node ID 01dbe5f901e45130ca8b1f4e30740a65f22d1f8c # Parent ac5dc19e0a0efc383efd40f65a0315cccaec4d02 make sure to use language_default when language_ignore_browser is set diff -r ac5dc19e0a0e -r 01dbe5f901e4 MoinMoin/wsgiapp.py --- a/MoinMoin/wsgiapp.py Sun Feb 14 01:01:33 2010 +0100 +++ b/MoinMoin/wsgiapp.py Sun Feb 14 21:29:59 2010 +0100 @@ -244,9 +244,10 @@ break else: logging.debug("moin does not support any language client accepts") - if cfg.language_default in i18n.languages: - lang = cfg.language_default - logging.debug("fall back to cfg.language_default (%r)" % lang) + if not lang: + if cfg.language_default in i18n.languages: + lang = cfg.language_default + logging.debug("fall back to cfg.language_default (%r)" % lang) if not lang: lang = 'en' logging.debug("emergency fallback to 'en'")