Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.6.x] Typos introduced in 57c82f9.

  • Loading branch information...
commit 2a166623a63b27a2b6c5c9d0f46bd726ee4e82fb 1 parent 5f06198
@ramiro ramiro authored
Showing with 7 additions and 7 deletions.
  1. +4 −4 docs/ref/settings.txt
  2. +3 −3 docs/topics/i18n/translation.txt
View
8 docs/ref/settings.txt
@@ -1258,18 +1258,18 @@ LANGUAGE_CODE
Default: ``'en-us'``
A string representing the language code for this installation. This should be in
-standard :term:`language ID format <language code>`. For example, U.S. English
+standard :term:`language ID format <language code>`. For example, U.S. English
is ``"en-us"``. See also the `list of language identifiers`_ and
:doc:`/topics/i18n/index`.
-:setting:`USE_I18N` must be active to this setting to have any effect.
+:setting:`USE_I18N` must be active for this setting to have any effect.
-it serves two purposes:
+It serves two purposes:
* If the locale middleware isn't in use, it decides which translation is served
to all users.
* If the locale middleware is active, it provides the fallback translation when
- no translation exist for a given literal to the user preferred language.
+ no translation exist for a given literal to the user's preferred language.
See :ref:`how-django-discovers-language-preference` for more details.
View
6 docs/topics/i18n/translation.txt
@@ -1552,15 +1552,15 @@ should be used -- installation-wide, for a particular user, or both.
To set an installation-wide language preference, set :setting:`LANGUAGE_CODE`.
Django uses this language as the default translation -- the final attempt if no
-better matching translation is found by one of the methods employed by the
+better matching translation is found through one of the methods employed by the
locale middleware (see below).
-If all you want to do is run Django with your native language all you need to do
+If all you want is to run Django with your native language all you need to do
is set :setting:`LANGUAGE_CODE` and make sure the corresponding :term:`message
files <message file>` and their compiled versions (``.mo``) exist.
If you want to let each individual user specify which language he or she
-prefers, the you also need to use use the ``LocaleMiddleware``.
+prefers, then you also need to use use the ``LocaleMiddleware``.
``LocaleMiddleware`` enables language selection based on data from the request.
It customizes content for each user.
Please sign in to comment.
Something went wrong with that request. Please try again.