summaryrefslogtreecommitdiff
path: root/docs/ref/settings.txt
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-02-16 12:12:53 +0000
committerJannis Leidel <jannis@leidel.info>2010-02-16 12:12:53 +0000
commitf93f056c32f614c9a130ec66824d94ec20526cdf (patch)
tree0aa519f2d5f73d6a6453af0d2c9368ce3335cedb /docs/ref/settings.txt
parent9b630a08572031f657fda18dae33d9a7567d4f28 (diff)
Fixed #10260 - Refactored internationalization documentation. Thanks, Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/settings.txt')
-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 f411a8bad5..1137b354ff 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -883,8 +883,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
@@ -911,9 +911,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.
@@ -948,7 +950,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