Django

Code

Changeset 1854

Show
Ignore:
Timestamp:
01/07/06 23:56:45 (3 years ago)
Author:
adrian
Message:

magic-removal: Merged to [1853]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/AUTHORS

    r1835 r1854  
    8282    Luke Plant <http://lukeplant.me.uk/> 
    8383    plisk 
     84    Brian Ray <http://brianray.chipy.org/> 
    8485    Oliver Rutherfurd <http://rutherfurd.net/> 
    8586    David Schein 

  • django/branches/magic-removal/django/conf/locale/ru/LC_MESSAGES/django.po

    r1794 r1854  
    409409#, python-format 
    410410msgid "You may add another %s below." 
    411 msgstr "�������� % ���" 
     411msgstr "�������� %s ���" 
    412412 
    413413#: contrib/admin/views/main.py:441 

  • django/branches/magic-removal/django/contrib/auth/handlers/modpython.py

    r1847 r1854  
    1414 
    1515    # check for PythonOptions 
    16     _str_to_bool = lambda s: s.lower() in '1', 'true', 'on', 'yes' 
     16    _str_to_bool = lambda s: s.lower() in ('1', 'true', 'on', 'yes') 
    1717 
    1818    options = req.get_options() 

  • django/branches/magic-removal/django/contrib/sessions/models.py

    r1836 r1854  
    1818        # Use person_id and SECRET_KEY as added salt. 
    1919        while 1: 
    20             session_key = md5.new(str(random.randint(0, sys.maxint - 1)) + SECRET_KEY).hexdigest() 
     20            session_key = md5.new(str(random.randint(0, sys.maxint - 1)) + str(random.randint(0, sys.maxint - 1)) + SECRET_KEY).hexdigest() 
    2121            try: 
    2222                self.get_object(session_key__exact=session_key) 

  • django/branches/magic-removal/docs/i18n.txt

    r1775 r1854  
    288288``conf/locale``. In the ``de`` example, the file will be 
    289289``conf/locale/de/LC_MESSAGES/django.po``. 
     290 
     291If run over your project source tree or your appliation source tree, it will 
     292do the same, but the location of the locale directory is ``locale/LANG/LC_MESSAGES`` 
     293(note the missing ``conf`` prefix). 
    290294 
    291295.. admonition:: No gettext?