diff -r 6decf2567879 MoinMoin/i18n/__init__.py
--- a/MoinMoin/i18n/__init__.py Tue Dec 25 02:20:02 2007 +0100
+++ b/MoinMoin/i18n/__init__.py Fri Jan 04 15:01:42 2008 +0200
@@ -300,14 +300,15 @@ def requestLanguage(request):
 
     # Or try to return one of the user browser accepted languages, if it
     # is available on this wiki...
-    return get_browser_language(request)
-
-    # Or return the wiki default language...
-    if request.cfg.language_default in available:
-        lang = request.cfg.language_default
-    # If everything else fails, read the manual... or return 'en'
-    else:
-        lang = 'en'
+    lang = get_browser_language(request)
+    if not lang:
+        available = wikiLanguages()
+        # Or return the wiki default language...
+        if request.cfg.language_default in available:
+            lang = request.cfg.language_default
+        # If everything else fails, read the manual... or return 'en'
+        else:
+            lang = 'en'
     return lang
 
 
@@ -349,7 +350,8 @@ def get_browser_language(request):
 def get_browser_language(request):
     """
     Return the language that is supported by wiki and what user browser 
-    would prefer to get. Return nothing if there is no such language.
+    would prefer to get. Return empty string if there is no such language
+    or language_ignore_browser is true.
 
     @param request: the request object
     @rtype: string
@@ -360,3 +362,4 @@ def get_browser_language(request):
         for lang in browserLanguages(request):
             if lang in available:
                 return lang
+    return ''