summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-02-16 12:50:47 +0000
committerJannis Leidel <jannis@leidel.info>2010-02-16 12:50:47 +0000
commita23edb643bdbfde6be1e0a63d1a8bd2a1be13710 (patch)
tree7b0e171424472c241fc5865d159cbdac3b50dc69 /docs/ref
parent4384b164ccdd2d45e38cc3116f9e49c50c4268fa (diff)
[1.1.X] Fixed #10260 - Refactored internationalization documentation. Thanks, Ramiro Morales.
Partial backport of r12440. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt14
1 files changed, 8 insertions, 6 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index ffc6d4b659..f7705949fd 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -610,8 +610,8 @@ LANGUAGE_CODE
Default: ``'en-us'``
A string representing the language code for this installation. This should be in
-standard language format. For example, U.S. English is ``"en-us"``. See
-:ref:`topics-i18n`.
+standard :term:`language format<language code>`. For example, U.S. English is
+``"en-us"``. See :ref:`topics-i18n`.
.. setting:: LANGUAGE_COOKIE_NAME
@@ -638,9 +638,11 @@ see the current list of translated languages by looking in
.. _online source: http://code.djangoproject.com/browser/django/trunk/django/conf/global_settings.py
-The list is a tuple of two-tuples in the format (language code, language
-name) -- for example, ``('ja', 'Japanese')``. This specifies which languages
-are available for language selection. See :ref:`topics-i18n`.
+The list is a tuple of two-tuples in the format ``(language code, language
+name)``, the ``language code`` part should be a
+:term:`language name<language code>` -- for example, ``('ja', 'Japanese')``.
+This specifies which languages are available for language selection. See
+:ref:`topics-i18n`.
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.
@@ -675,7 +677,7 @@ LOCALE_PATHS
Default: ``()`` (Empty tuple)
A tuple of directories where Django looks for translation files.
-See :ref:`translations-in-your-own-projects`.
+See :ref:`using-translations-in-your-own-projects`.
.. setting:: LOGIN_REDIRECT_URL