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/internals | |
| 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/internals')
| -rw-r--r-- | docs/internals/contributing/index.txt | 2 | ||||
| -rw-r--r-- | docs/internals/contributing/localizing.txt (renamed from docs/internals/contributing/translations.txt) | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/docs/internals/contributing/index.txt b/docs/internals/contributing/index.txt index 77af3d611c..7e6de0d491 100644 --- a/docs/internals/contributing/index.txt +++ b/docs/internals/contributing/index.txt @@ -56,7 +56,7 @@ Browse the following sections to find out how: triaging-tickets writing-code/index writing-documentation - translations + localizing committing-code .. _django-users: http://groups.google.com/group/django-users diff --git a/docs/internals/contributing/translations.txt b/docs/internals/contributing/localizing.txt index 343839540f..90a07c1e2d 100644 --- a/docs/internals/contributing/translations.txt +++ b/docs/internals/contributing/localizing.txt @@ -1,15 +1,15 @@ -======================================= -Submitting and maintaining translations -======================================= +================= +Localizing Django +================= Various parts of Django, such as the admin site and validation error messages, -are internationalized. This means they display different text depending on each -user's language setting. For this, Django uses the same internationalization and -localization infrastructure available to Django applications, described in the -:doc:`i18n documentation</topics/i18n/index>`. +are internationalized. This means they display differently depending on each +user's language or country. For this, Django uses the same internationalization +and localization infrastructure available to Django applications, described in +the :doc:`i18n documentation </topics/i18n/index>`. -Internationalization --------------------- +Translations +------------ Translations are contributed by Django users worldwide. The translation work is coordinated at `Transifex`_. @@ -45,8 +45,8 @@ do: For more information about how to use Transifex, read the `Transifex User Guide`_. -Localization ------------- +Formats +------- You can also review ``conf/locale/<locale>/formats.py``. This file describes the date, time and numbers formatting particularities of your locale. See |