diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-04-22 04:21:04 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-04-22 04:21:04 +0000 |
| commit | 03b46fc8d0223bc884ff9f7728405367eae7e2fc (patch) | |
| tree | 1d8b064283751d6db072c41be350bb824c6885d2 /docs | |
| parent | 9470a6c5bb52ac1c55d438bb8a86b92760e4ed26 (diff) | |
unicode: Added FILE_CHARSET setting and use it to decode files read from disk.
Based on a patch from Ivan Sagalaev. Fixed #4021.
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/settings.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/settings.txt b/docs/settings.txt index 45bdfa573d..ade94c9a18 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -426,6 +426,14 @@ Subject-line prefix for e-mail messages sent with ``django.core.mail.mail_admins or ``django.core.mail.mail_managers``. You'll probably want to include the trailing space. +FILE_CHARSET +------------ + +Default: ``'utf-8'`` + +The character encoding used to decode any files read from disk. This includes +template files and initial SQL data files. + FIXTURE_DIRS ------------- |