projects
/
matthijs
/
upstream
/
django-ldapdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
partially resync settings with django defaults
[matthijs/upstream/django-ldapdb.git]
/
settings.py
diff --git
a/settings.py
b/settings.py
index d8f7bb40f97a6171fe2da133da789cfd4430c34d..08efc338ffaec0c82fcf4fff1d4c4c0a6b806e63 100644
(file)
--- a/
settings.py
+++ b/
settings.py
@@
-19,6
+19,8
@@
DATABASE_PORT = '' # Set to empty string for default. Not used with
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'America/Chicago'
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'America/Chicago'
@@
-33,7
+35,11
@@
SITE_ID = 1
# to load the internationalization machinery.
USE_I18N = True
# to load the internationalization machinery.
USE_I18N = True
-# Absolute path to the directory that holds media.
+# If you set this to False, Django will not format dates, numbers and
+# calendars according to the current locale
+USE_L10N = True
+
+# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''