diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2011-10-22 17:17:57 +0000 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2011-10-22 17:17:57 +0000 |
| commit | 67e6e0fcf35d93f88bfb1a4cbf5c6008d99dd923 (patch) | |
| tree | 990facba20e2f825f47fe763cc19ce42e5e37659 /docs/ref | |
| parent | 4f00a2d316d6a8ffb6ca4ab6c89aaf8fb8bd3e60 (diff) | |
Fixed #17087 -- Re-organized the i18n docs to reduce confusion between USE_I18N/USE_L10N and the concepts of internationalization/localisation. Re
moved some duplicate content.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/localflavor.txt | 2 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 16 | ||||
| -rw-r--r-- | docs/ref/utils.txt | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/docs/ref/contrib/localflavor.txt b/docs/ref/contrib/localflavor.txt index 0a39c31b7a..4671906fa1 100644 --- a/docs/ref/contrib/localflavor.txt +++ b/docs/ref/contrib/localflavor.txt @@ -146,7 +146,7 @@ Django's general catalog in ``django/conf/locale``. If you want localflavor's texts to be translated, like form fields error messages, you must include :mod:`django.contrib.localflavor` in the :setting:`INSTALLED_APPS` setting, so the internationalization system can find the catalog, as explained in -:ref:`using-translations-in-your-own-projects`. +:ref:`how-django-discovers-translations`. Adding flavors ============== diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index c3539192f3..999e2bad00 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1243,7 +1243,7 @@ LOCALE_PATHS Default: ``()`` (Empty tuple) A tuple of directories where Django looks for translation files. -See :ref:`using-translations-in-your-own-projects`. +See :ref:`how-django-discovers-translations`. Example:: @@ -2038,10 +2038,10 @@ USE_I18N Default: ``True`` -A boolean that specifies whether Django's internationalization system should be -enabled. This provides an easy way to turn it off, for performance. If this is -set to ``False``, Django will make some optimizations so as not to load the -internationalization machinery. +A boolean that specifies whether Django's translation system should be enabled. +This provides an easy way to turn it off, for performance. If this is set to +``False``, Django will make some optimizations so as not to load the +translation machinery. See also :setting:`USE_L10N` @@ -2054,9 +2054,9 @@ USE_L10N Default: ``False`` -A boolean that specifies if data will be localized by default or not. If this -is set to ``True``, e.g. Django will display numbers and dates using the -format of the current locale. +A boolean that specifies if localized formatting of data will be enabled by +default or not. If this is set to ``True``, e.g. Django will display numbers and +dates using the format of the current locale. See also :setting:`USE_I18N` and :setting:`LANGUAGE_CODE` diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index e4648bd1b9..bce2f59cd3 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -455,7 +455,7 @@ appropriate entities. :synopsis: Internationalization support. For a complete discussion on the usage of the following see the -:doc:`Internationalization documentation </topics/i18n/internationalization>`. +:doc:`translation documentation </topics/i18n/translation>`. .. function:: gettext(message) |