Django

Code

Show
Ignore:
Timestamp:
06/17/07 17:18:54 (2 years ago)
Author:
clong
Message:

per-object-permissions: Merged to trunk [5486] NOTE: Not fully tested, will be working on this over the next few weeks.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/per-object-permissions/django/conf/global_settings.py

    r4242 r5488  
    3939    ('ar', gettext_noop('Arabic')), 
    4040    ('bn', gettext_noop('Bengali')), 
     41    ('bg', gettext_noop('Bulgarian')), 
     42    ('ca', gettext_noop('Catalan')), 
    4143    ('cs', gettext_noop('Czech')), 
    4244    ('cy', gettext_noop('Welsh')), 
    …… 
    5557    ('it', gettext_noop('Italian')), 
    5658    ('ja', gettext_noop('Japanese')), 
     59    ('ko', gettext_noop('Korean')), 
     60    ('kn', gettext_noop('Kannada')), 
     61    ('lv', gettext_noop('Latvian')), 
     62    ('mk', gettext_noop('Macedonian')), 
    5763    ('nl', gettext_noop('Dutch')), 
    5864    ('no', gettext_noop('Norwegian')), 
    5965    ('pl', gettext_noop('Polish')), 
     66    ('pt', gettext_noop('Portugese')), 
    6067    ('pt-br', gettext_noop('Brazilian')), 
    6168    ('ro', gettext_noop('Romanian')), 
    …… 
    6673    ('sv', gettext_noop('Swedish')), 
    6774    ('ta', gettext_noop('Tamil')), 
     75    ('te', gettext_noop('Telugu')), 
    6876    ('tr', gettext_noop('Turkish')), 
    6977    ('uk', gettext_noop('Ukrainian')), 
    …… 
    96104 
    97105# Database connection info. 
    98 DATABASE_ENGINE = ''           # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. 
     106DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. 
    99107DATABASE_NAME = ''             # Or path to database file if using sqlite3. 
    100108DATABASE_USER = ''             # Not used with sqlite3. 
    …… 
    113121EMAIL_HOST_USER = '' 
    114122EMAIL_HOST_PASSWORD = '' 
     123EMAIL_USE_TLS = False 
    115124 
    116125# List of strings representing installed apps. 
    …… 
    136145    'django.core.context_processors.debug', 
    137146    'django.core.context_processors.i18n', 
     147    'django.core.context_processors.media', 
    138148#    'django.core.context_processors.request', 
    139149) 
    …… 
    232242# The User-Agent string to use when checking for URL validity through the 
    233243# isExistingURL validator. 
    234 URL_VALIDATOR_USER_AGENT = "Django/0.96pre (http://www.djangoproject.com)" 
     244from django import get_version 
     245URL_VALIDATOR_USER_AGENT = "Django/%s (http://www.djangoproject.com)" % get_version() 
    235246 
    236247############## 
    …… 
    306317AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) 
    307318 
     319LOGIN_URL = '/accounts/login/' 
     320 
     321LOGOUT_URL = '/accounts/logout/' 
     322 
     323LOGIN_REDIRECT_URL = '/accounts/profile/' 
     324 
    308325########### 
    309326# TESTING # 
    …… 
    316333# If None, a name of 'test_' + DATABASE_NAME will be assumed 
    317334TEST_DATABASE_NAME = None 
     335 
     336# Strings used to set the character set and collation order for the test 
     337# database. These values are passed literally to the server, so they are 
     338# backend-dependent. If None, no special settings are sent (system defaults are 
     339# used). 
     340TEST_DATABASE_CHARSET = None 
     341TEST_DATABASE_COLLATION = None 
     342 
     343############ 
     344# FIXTURES # 
     345############ 
     346 
     347# The list of directories to search for fixtures 
     348FIXTURE_DIRS = ()