From b224b05304f64a34fcb13262bbffc30c1337abc7 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Tue, 21 Dec 2010 14:57:57 +0000 Subject: [PATCH] Fixed #14910 -- Clarified the order of precedence of loading translation catalogues. Thanks, vanschelven. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14998 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/howto/i18n.txt | 10 +++++----- 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``.