Ticket #5684: i18n.diff

docs/i18n.txt

@@ -555 +555 @@
     * Only languages listed in the `LANGUAGES setting`_ can be selected. If
       you want to restrict the language selection to a subset of provided
       languages (because your application doesn't provide all those languages),
-      set ``LANGUAGES`` to a list of languages. For example::
+      set ``LANGUAGES`` to a list of languages. 
+      
+      It's OK to mark the languages as translation strings, but use a "dummy"
+      ``ugettext()`` function, not the one in ``django.utils.translation``. 
+      You should *never* import ``django.utils.translation`` from within your 
+      settings file, because that module in itself depends on the settings, 
+      and that would cause a circular import.
 
-          LANGUAGES = (
-            ('de', _('German')),
-            ('en', _('English')),
-          )
-
-      This example restricts languages that are available for automatic
-      selection to German and English (and any sublanguage, like de-ch or
-      en-us).
-
-      .. _LANGUAGES setting: ../settings/#languages
-
-    * If you define a custom ``LANGUAGES`` setting, as explained in the
-      previous bullet, it's OK to mark the languages as translation strings
-      -- but use a "dummy" ``ugettext()`` function, not the one in
-      ``django.utils.translation``. You should *never* import
-      ``django.utils.translation`` from within your settings file, because that
-      module in itself depends on the settings, and that would cause a circular
-      import.
-
       The solution is to use a "dummy" ``ugettext()`` function. Here's a sample
       settings file::
 
@@ -586 +573 @@
               ('en', ugettext('English')),
           )
 
+      This example restricts languages that are available for automatic
+      selection to German and English (and any sublanguage, like de-ch or
+      en-us).
+
       With this arrangement, ``make-messages.py`` will still find and mark
       these strings for translation, but the translation won't happen at
-      runtime -- so you'll have to remember to wrap the languages in the *real*
+      runtime -- you'll have to wrap the languages in the *real*
       ``ugettext()`` in any code that uses ``LANGUAGES`` at runtime.
 
+      .. _LANGUAGES setting: ../settings/#languages
+
     * The ``LocaleMiddleware`` can only select languages for which there is a
       Django-provided base translation. If you want to provide translations
       for your application that aren't already in the set of translations