From 5547ba743cde37d043c411fd463bcd817dca4302 Mon Sep 17 00:00:00 2001 From: Ramiro Morales <cramm0@gmail.com> Date: Thu, 22 Aug 2013 12:14:56 -0300 Subject: [PATCH] [1.5.x] Typos introduced in 57c82f909b. --- docs/ref/settings.txt | 6 +++--- docs/topics/i18n/translation.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index fc3f33904c..1db9b4029b 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1232,14 +1232,14 @@ 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. diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 9c6d6a64c2..b8cd427e29 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -1515,15 +1515,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.