MoinMoin: attachment:langbug.patch of MoinMoinBugs/1.6.0LanguageIgnoreBrowserConfigurationError

   1 diff -r 6decf2567879 MoinMoin/i18n/__init__.py
   2 --- a/MoinMoin/i18n/__init__.py Tue Dec 25 02:20:02 2007 +0100
   3 +++ b/MoinMoin/i18n/__init__.py Fri Jan 04 15:01:42 2008 +0200
   4 @@ -300,14 +300,15 @@ def requestLanguage(request):
   5  
   6      # Or try to return one of the user browser accepted languages, if it
   7      # is available on this wiki...
   8 -    return get_browser_language(request)
   9 -
  10 -    # Or return the wiki default language...
  11 -    if request.cfg.language_default in available:
  12 -        lang = request.cfg.language_default
  13 -    # If everything else fails, read the manual... or return 'en'
  14 -    else:
  15 -        lang = 'en'
  16 +    lang = get_browser_language(request)
  17 +    if not lang:
  18 +        available = wikiLanguages()
  19 +        # Or return the wiki default language...
  20 +        if request.cfg.language_default in available:
  21 +            lang = request.cfg.language_default
  22 +        # If everything else fails, read the manual... or return 'en'
  23 +        else:
  24 +            lang = 'en'
  25      return lang
  26  
  27  
  28 @@ -349,7 +350,8 @@ def get_browser_language(request):
  29  def get_browser_language(request):
  30      """
  31      Return the language that is supported by wiki and what user browser 
  32 -    would prefer to get. Return nothing if there is no such language.
  33 +    would prefer to get. Return empty string if there is no such language
  34 +    or language_ignore_browser is true.
  35  
  36      @param request: the request object
  37      @rtype: string
  38 @@ -360,3 +362,4 @@ def get_browser_language(request):
  39          for lang in browserLanguages(request):
  40              if lang in available:
  41                  return lang
  42 +    return ''
  43