Django

Code

Ticket #5494: jscatalog.diff

File jscatalog.diff, 1.2 kB (added by msaelices, 1 year ago)

A patch that fixes bug

  • AUTHORS

    old new  
    256256    Brian Rosner <brosner@gmail.com> 
    257257    Oliver Rutherfurd <http://rutherfurd.net/> 
    258258    ryankanno 
     259    Manuel Saelices <msaelices@yaco.es> 
    259260    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/> 
    260261    Vinay Sajip <vinay_sajip@yahoo.co.uk> 
    261262    David Schein 

  • django/views/i18n.py

    old new  
    110110        packages = ['django.conf'] 
    111111    if type(packages) in (str, unicode): 
    112112        packages = packages.split('+') 
    113     packages = [p for p in packages if p == 'django.conf' or p in settings.INSTALLED_APPS] 
     113    projectname = None 
     114    if settings.SETTINGS_MODULE is not None: 
     115        parts = settings.SETTINGS_MODULE.split('.') 
     116        projectname = parts[0] 
     117    packages = [p for p in packages if p == 'django.conf' or p == projectname or \ 
     118                p in settings.INSTALLED_APPS] 
    114119    default_locale = to_locale(settings.LANGUAGE_CODE) 
    115120    locale = to_locale(get_language()) 
    116121    t = {}