Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[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
  • Loading branch information...
commit af1c8b2cfaf04072dff481982b2b064e10f84488 1 parent 9184dba
@jezdez jezdez authored
Showing with 10 additions and 10 deletions.
  1. +5 −5 docs/howto/i18n.txt
  2. +5 −5 docs/topics/i18n/deployment.txt
View
10 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``.
View
10 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``.
Please sign in to comment.
Something went wrong with that request. Please try again.