Commit 74fe3976 authored by Gabriel Hurley's avatar Gabriel Hurley
Browse files

[1.2.X] Fixed #14541 -- Corrected an outdated bit of wording in the LANGUAGES... 

[1.2.X] Fixed #14541 -- Corrected an outdated bit of wording in the LANGUAGES setting docs. Thanks to akelm for the report and suggested fix.

Backport of [14333] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f0416f69

docs/ref/settings.txt

+1 −1
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ Generally, the default value should suffice. Only set this setting if you want 
to restrict language selection to a subset of the Django-provided languages.



If you define a custom ``LANGUAGES`` setting, it's OK to mark the languages as

translation strings (as in the default value displayed above) -- but use a

translation strings (as in the default value referred to above) -- but use a

"dummy" ``gettext()`` function, not the one in ``django.utils.translation``.

You should *never* import ``django.utils.translation`` from within your

settings file, because that module in itself depends on the settings, and that