mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Code Issues Releases Wiki Activity

Edited i18n.txt changes from [9009]

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2008-09-11 03:28:49 +00:00
parent 868748e196
commit 8c6f5c6f05
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
docs/topics/i18n.txt
View File

@ -184,11 +184,13 @@ If you don't like the verbose name ``ugettext_lazy``, you can just alias it as
class MyThing(models.Model): class MyThing(models.Model):
name = models.CharField(help_text=_('This is the help text')) name = models.CharField(help_text=_('This is the help text'))
Always use lazy translations in :ref:`Django models <topics-db-models>`. Always use lazy translations in :ref:`Django models <topics-db-models>`.
Field names and table names should be marked for translation or else they Field names and table names should be marked for translation (otherwise, they
will not be translated in the admin interface. This means writing explicit won't be translated in the admin interface). This means writing explicit
``verbose_name`` and ``verbose_name_plural`` options in the ``Meta`` class, ``verbose_name`` and ``verbose_name_plural`` options in the ``Meta`` class,
though:: though, rather than relying on Django's default determination of
``verbose_name`` and ``verbose_name_plural`` by looking at the model's class
name::
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@ -278,7 +280,7 @@ Each ``RequestContext`` has access to three translation-specific variables:
* ``LANGUAGE_CODE`` is the current user's preferred language, as a string. * ``LANGUAGE_CODE`` is the current user's preferred language, as a string.
Example: ``en-us``. (See "How language preference is discovered", below.) Example: ``en-us``. (See "How language preference is discovered", below.)
* ``LANGUAGE_BIDI`` is the current locale's direction. If True, it's a * ``LANGUAGE_BIDI`` is the current locale's direction. If True, it's a
right-to-left language, e.g.: Hebrew, Arabic. If False it's a right-to-left language, e.g.: Hebrew, Arabic. If False it's a
left-to-right language, e.g.: English, French, German etc. left-to-right language, e.g.: English, French, German etc.
@ -592,21 +594,21 @@ following this algorithm:
* First, it looks for a ``django_language`` key in the current user's * First, it looks for a ``django_language`` key in the current user's
session. session.
* Failing that, it looks for a cookie. * Failing that, it looks for a cookie.
.. versionchanged:: 1.0 .. versionchanged:: 1.0
In Django version 0.96 and before, the cookie's name is hard-coded to In Django version 0.96 and before, the cookie's name is hard-coded to
``django_language``. In Django 1,0, The cookie name is set by the ``django_language``. In Django 1,0, The cookie name is set by the
``LANGUAGE_COOKIE_NAME`` setting. (The default name is ``LANGUAGE_COOKIE_NAME`` setting. (The default name is
``django_language``.) ``django_language``.)
* Failing that, it looks at the ``Accept-Language`` HTTP header. This * Failing that, it looks at the ``Accept-Language`` HTTP header. This
header is sent by your browser and tells the server which language(s) you header is sent by your browser and tells the server which language(s) you
prefer, in order by priority. Django tries each language in the header prefer, in order by priority. Django tries each language in the header
until it finds one with available translations. until it finds one with available translations.
* Failing that, it uses the global ``LANGUAGE_CODE`` setting. * Failing that, it uses the global ``LANGUAGE_CODE`` setting.
.. _locale-middleware-notes: .. _locale-middleware-notes:
@ -616,12 +618,12 @@ Notes:
* In each of these places, the language preference is expected to be in the * In each of these places, the language preference is expected to be in the
standard language format, as a string. For example, Brazilian Portuguese standard language format, as a string. For example, Brazilian Portuguese
is ``pt-br``. is ``pt-br``.
* If a base language is available but the sublanguage specified is not, * If a base language is available but the sublanguage specified is not,
Django uses the base language. For example, if a user specifies ``de-at`` Django uses the base language. For example, if a user specifies ``de-at``
(Austrian German) but Django only has ``de`` available, Django uses (Austrian German) but Django only has ``de`` available, Django uses
``de``. ``de``.
* Only languages listed in the :setting:`LANGUAGES` setting can be selected. * Only languages listed in the :setting:`LANGUAGES` setting can be selected.
If you want to restrict the language selection to a subset of provided If you want to restrict the language selection to a subset of provided
languages (because your application doesn't provide all those languages), languages (because your application doesn't provide all those languages),