Django

Code

Show
Ignore:
Timestamp:
04/07/08 15:29:36 (9 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7355-7403 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7353 to /django/trunk:1-7404

  • django/branches/gis/django/conf/global_settings.py

    r7354 r7405  
    7171    ('pl', gettext_noop('Polish')), 
    7272    ('pt', gettext_noop('Portugese')), 
    73     ('pt-br', gettext_noop('Brazilian')), 
     73    ('pt-br', gettext_noop('Brazilian Portuguese')), 
    7474    ('ro', gettext_noop('Romanian')), 
    7575    ('ru', gettext_noop('Russian')), 
    …… 
    115115 
    116116# Database connection info. 
    117 DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. 
     117DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. 
    118118DATABASE_NAME = ''             # Or path to database file if using sqlite3. 
    119119DATABASE_USER = ''             # Not used with sqlite3. 
    …… 
    288288SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether sessions expire when a user closes his browser. 
    289289SESSION_ENGINE = 'django.contrib.sessions.backends.db'  # The module to store session data 
    290 SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If set to None the backend will use a sensible default. 
     290SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If None, the backend will use a sensible default. 
    291291 
    292292#########