diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-12-21 15:14:52 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-12-21 15:14:52 +0000 |
| commit | af1c8b2cfaf04072dff481982b2b064e10f84488 (patch) | |
| tree | 87f9c6cd87d8fca8339ed1e86a3aa80c6d05a60d | |
| parent | 9184dba1f5628162a57c752f88cb1b90bd9f197e (diff) | |
[1.2.X] Fixed #14910 -- Clarified the order of precedence of loading translation catalogues. Thanks, vanschelven.
Backport from trunk (r14998).
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | docs/howto/i18n.txt | 10 | ||||
| -rw-r--r-- | docs/topics/i18n/deployment.txt | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/docs/howto/i18n.txt b/docs/howto/i18n.txt index 6bec531177..64b33d765f 100644 --- a/docs/howto/i18n.txt +++ b/docs/howto/i18n.txt @@ -6,11 +6,11 @@ Using internationalization in your own projects At runtime, Django looks for translations by following this algorithm: - * First, it looks for a ``locale`` directory in the application directory - of the view that's being called. If it finds a translation for the - selected language, the translation will be installed. - * Next, it looks for a ``locale`` directory in the project directory. If it - finds a translation, the translation will be installed. + * First, it looks for a ``locale`` directory in the directory containing + your settings file. + * Second, it looks for a ``locale`` directory in the project directory. + * Third, it looks for a ``locale`` directory in each of the installed apps. + It does this in the reverse order of INSTALLED_APPS * Finally, it checks the Django-provided base translation in ``django/conf/locale``. diff --git a/docs/topics/i18n/deployment.txt b/docs/topics/i18n/deployment.txt index f06227e0f6..4727841f14 100644 --- a/docs/topics/i18n/deployment.txt +++ b/docs/topics/i18n/deployment.txt @@ -178,11 +178,11 @@ How Django discovers translations As described in :ref:`using-translations-in-your-own-projects`, at runtime, Django looks for translations by following this algorithm: - * First, it looks for a ``locale`` directory in the application directory - of the view that's being called. If it finds a translation for the - selected language, the translation will be installed. - * Next, it looks for a ``locale`` directory in the project directory. If it - finds a translation, the translation will be installed. + * First, it looks for a ``locale`` directory in the directory containing + your settings file. + * Second, it looks for a ``locale`` directory in the project directory. + * Third, it looks for a ``locale`` directory in each of the installed apps. + It does this in the reverse order of INSTALLED_APPS * Finally, it checks the Django-provided base translation in ``django/conf/locale``. |